diff --git a/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch new file mode 100644 index 0000000000..b840e91dc7 --- /dev/null +++ b/srcpkgs/clementine/patches/clementine-sqlite-3.12.patch @@ -0,0 +1,19 @@ +--- a/src/core/database.cpp ++++ b/src/core/database.cpp +@@ -265,6 +265,16 @@ + StaticInit(); + + { ++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER ++ QVariant v = db.driver()->handle(); ++ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { ++ sqlite3* handle = *static_cast(v.data()); ++ if (handle) { ++ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); ++ } ++ } ++#endif ++ + QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db); + set_fts_tokenizer.bindValue(":name", "unicode"); + set_fts_tokenizer.bindValue( diff --git a/srcpkgs/clementine/patches/ec580cb815c16ec1ab43a469d5af7d51d8d03082.patch b/srcpkgs/clementine/patches/ec580cb815c16ec1ab43a469d5af7d51d8d03082.patch deleted file mode 100644 index 2240debd0e..0000000000 --- a/srcpkgs/clementine/patches/ec580cb815c16ec1ab43a469d5af7d51d8d03082.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001 -From: Chocobozzz -Date: Wed, 16 Jul 2014 15:57:25 +0200 -Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401 - ---- - src/CMakeLists.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 650fa74..775b0a5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp) - if(HAVE_DBUS) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) - -- # Hack to get it to generate interfaces without namespaces - required -- # because otherwise org::freedesktop::UDisks and -- # org::freedesktop::UDisks::Device conflict. -- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N) -- - # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES - dbus/org.freedesktop.MediaPlayer.player.xml -@@ -964,6 +959,10 @@ if(HAVE_DBUS) - - # DeviceKit DBUS interfaces - if(HAVE_DEVICEKIT) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml -+ PROPERTIES NO_NAMESPACE dbus/udisks) -+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml -+ PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES - dbus/org.freedesktop.UDisks.xml - dbus/udisks) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index f9f673138d..9aef491769 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,14 +1,13 @@ # Template file for 'clementine' pkgname=clementine -reverts=1.3_1 -version=1.2.3 -revision=6 +version=1.3.1 +revision=1 build_style=cmake hostmakedepends="git cmake sparsehash pkg-config" -makedepends="chromaprint-devel boost-devel gst-plugins-base-devel liblastfm-devel +makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel qt-devel glew-devel qjson-devel sqlite-devel protobuf-devel libplist-devel libusbmuxd-devel libmtp-devel libcdio-devel qca-devel pulseaudio-devel glu-devel - taglib-devel" + taglib-devel crypto++-devel libspotify-devel libechonest-devel" depends="desktop-file-utils" short_desc="A modern music player and library organizer" maintainer="Andrea Brancaleoni " @@ -16,6 +15,14 @@ license="GPL-3" homepage="https://www.clementine-player.org/" wrksrc="Clementine-$version" distfiles="https://github.com/clementine-player/Clementine/archive/$version.tar.gz" -checksum=7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf +checksum=f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c patch_args="-p1" nopie=yes + +pre_configure() { + sed -i 's|AMAZON_CLOUD_DRIVE OFF|AMAZON_CLOUD_DRIVE ON|g' CMakeLists.txt +} + +post_install() { + rm -r $DESTDIR/builddir +}