From 80b389e422c3815ed885df9e36d1bccfe929ec5d Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 17 Feb 2019 17:05:08 +0100 Subject: media-sound/clementine: Removed old. Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Lars Wendler --- media-sound/clementine/Manifest | 2 - .../clementine/clementine-1.3.1_p20180416.ebuild | 181 -------------------- .../clementine/clementine-1.3.1_p20181201.ebuild | 182 --------------------- .../files/clementine-1.3.1_p20181201-cmake.patch | 165 ------------------- .../files/clementine-fts3-tokenizer.patch | 36 ---- 5 files changed, 566 deletions(-) delete mode 100644 media-sound/clementine/clementine-1.3.1_p20180416.ebuild delete mode 100644 media-sound/clementine/clementine-1.3.1_p20181201.ebuild delete mode 100644 media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch delete mode 100644 media-sound/clementine/files/clementine-fts3-tokenizer.patch diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 6e52851f4d7b..2ef425142c80 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,3 +1 @@ -DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62 -DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15 diff --git a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild deleted file mode 100644 index 2af2d69f7b7e..000000000000 --- a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" - -MY_P="${P/_}" -if [[ ${PV} == *9999* ]]; then - EGIT_BRANCH="qt5" - EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - GIT_ECLASS="git-r3" -else - COMMIT=bd096dcbc3cfa8965ee96245b95c4027278b42a6 - SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi -inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} -unset GIT_ECLASS - -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" - -LICENSE="GPL-3" -SLOT="0" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" - -REQUIRED_USE=" - udisks? ( dbus ) - wiimote? ( dbus ) -" - -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= - dev-libs/crypto++[asm] - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - media-libs/chromaprint:= - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.9[qt5(+)] - media-libs/taglib - sys-libs/zlib - virtual/glu - virtual/opengl - x11-libs/libX11 - cdda? ( dev-libs/libcdio:= ) - dbus? ( dev-qt/qtdbus:5 ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) - moodbar? ( sci-libs/fftw:3.0 ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - projectm? ( - media-libs/glew:= - >=media-libs/libprojectm-1.2.0 - ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# Still possibly essential but not applied yet patches are: -# 06-fix-numeric-locale.patch -# 08-stdlib.h-for-rand.patch -RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 - mms? ( media-plugins/gst-plugins-libmms:1.0 ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-cpp/gtest-1.8.0 - dev-libs/boost - dev-qt/linguist-tools:5 - dev-qt/qtopengl:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - sys-devel/gettext - virtual/pkgconfig - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - pulseaudio? ( media-sound/pulseaudio ) - seafile? ( dev-cpp/sparsehash ) - skydrive? ( dev-cpp/sparsehash ) - test? ( - dev-qt/qttest:5 - gnome-base/gsettings-desktop-schemas - ) -" - -RESTRICT="test" - -S="${WORKDIR}/${PN^}-${COMMIT}" - -DOCS=( Changelog README.md ) - -PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) - -src_prepare() { - l10n_find_plocales_changes "src/translations" "" ".po" - - cmake-utils_src_prepare - # some tests fail or hang - sed -i \ - -e '/add_test_file(translations_test.cpp/d' \ - tests/CMakeLists.txt || die - - if ! use test; then - sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die - cmake_comment_add_subdirectory tests - fi -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="cryptopp" - -DCRYPTOPP_FOUND=ON - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF - -DENABLE_GIO=ON - -DENABLE_SPOTIFY_BLOB=OFF - -DUSE_BUILTIN_TAGLIB=OFF - -DUSE_SYSTEM_GMOCK=ON - -DUSE_SYSTEM_PROJECTM=ON - -DBUNDLE_PROJECTM_PRESETS=OFF - -DLINGUAS="$(l10n_get_locales)" - -DENABLE_BOX="$(usex box)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_SEAFILE="$(usex seafile)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update - - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild b/media-sound/clementine/clementine-1.3.1_p20181201.ebuild deleted file mode 100644 index 3d3061880f8c..000000000000 --- a/media-sound/clementine/clementine-1.3.1_p20181201.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" - -MY_P="${P/_}" -if [[ ${PV} == *9999* ]]; then - EGIT_BRANCH="qt5" - EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - GIT_ECLASS="git-r3" -else - COMMIT=d87307fbc718a57ca38b5354f196db05b560036c - SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} -unset GIT_ECLASS - -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" - -LICENSE="GPL-3" -SLOT="0" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" - -REQUIRED_USE=" - udisks? ( dbus ) - wiimote? ( dbus ) -" - -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= - dev-libs/crypto++[asm] - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - media-libs/chromaprint:= - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.9[qt5(+)] - >=media-libs/taglib-1.11.1_p20181028 - sys-libs/zlib - virtual/glu - x11-libs/libX11 - cdda? ( dev-libs/libcdio:= ) - dbus? ( dev-qt/qtdbus:5 ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) - moodbar? ( sci-libs/fftw:3.0 ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - projectm? ( - media-libs/glew:= - >=media-libs/libprojectm-1.2.0 - virtual/opengl - ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches: -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# Still possibly essential but not applied yet patches are: -# 06-fix-numeric-locale.patch -# 08-stdlib.h-for-rand.patch -RDEPEND="${COMMON_DEPEND} - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 - mms? ( media-plugins/gst-plugins-libmms:1.0 ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-cpp/gtest-1.8.0 - dev-libs/boost - dev-qt/linguist-tools:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - sys-devel/gettext - virtual/pkgconfig - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - projectm? ( dev-qt/qtopengl:5 ) - pulseaudio? ( media-sound/pulseaudio ) - seafile? ( dev-cpp/sparsehash ) - skydrive? ( dev-cpp/sparsehash ) - test? ( - dev-qt/qttest:5 - gnome-base/gsettings-desktop-schemas - ) -" - -RESTRICT="test" - -S="${WORKDIR}/${PN^}-${COMMIT}" - -DOCS=( Changelog README.md ) - -PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) - -src_prepare() { - l10n_find_plocales_changes "src/translations" "" ".po" - - cmake-utils_src_prepare - # some tests fail or hang - sed -i \ - -e '/add_test_file(translations_test.cpp/d' \ - tests/CMakeLists.txt || die - - if ! use test; then - sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die - cmake_comment_add_subdirectory tests - fi - - rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="cryptopp" - -DCRYPTOPP_FOUND=ON - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF - -DENABLE_GIO=ON - -DENABLE_SPOTIFY_BLOB=OFF - -DUSE_SYSTEM_GMOCK=ON - -DUSE_SYSTEM_PROJECTM=ON - -DBUNDLE_PROJECTM_PRESETS=OFF - -DLINGUAS="$(l10n_get_locales)" - -DENABLE_BOX="$(usex box)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus) - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_SEAFILE="$(usex seafile)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update - - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch b/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch deleted file mode 100644 index 633bf39be9d1..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1_p20181201-cmake.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 940fcb260b345d2598d04fd07c6718566b3adda1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 1 Dec 2018 23:29:43 +0100 -Subject: [PATCH 1/3] Qt5::Test is not required in the global QT_LIBRARIES - definition - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e660a376a..e18e008c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,7 +110,7 @@ if(WIN32) - find_package(Qt5 REQUIRED COMPONENTS WinExtras) - endif() - --set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL Qt5::Test) -+set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) - - if(DBUS_FOUND) - set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) --- -2.19.2 - - -From 4e11613088d24f248046d449f63bfd245f1e82cc Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 1 Dec 2018 23:44:35 +0100 -Subject: [PATCH 2/3] Qt5::DBus had already been optional, drop bogus pkgconfig - search - -This partially reverts commit 4321ecf7d26c5eed577a97d230786bb9f56ea37f. ---- - CMakeLists.txt | 17 +++++++---------- - 1 file changed, 7 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e18e008c0..0d1403e04 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,6 @@ find_package(PkgConfig REQUIRED) - find_package(Protobuf REQUIRED) - find_package(FFTW3) - find_package(ALSA) --pkg_check_modules(DBUS dbus-1) - if (NOT APPLE) - find_package(X11) - endif() -@@ -96,13 +95,10 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) - # QT - set(QT_MIN_VERSION 5.6.0) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) -+find_package(Qt5DBus ${QT_MIN_VERSION}) - if(X11_FOUND) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) - endif() --if(DBUS_FOUND) -- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) -- get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) --endif() - if(APPLE) - find_package(Qt5 REQUIRED COMPONENTS MacExtras) - endif() -@@ -112,8 +108,9 @@ endif() - - set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Sql Qt5::Xml Qt5::OpenGL) - --if(DBUS_FOUND) -+if(Qt5DBus_FOUND) - set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) -+ get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) - endif() - if(X11_FOUND) - set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) -@@ -286,19 +283,19 @@ optional_component(LIBLASTFM ON "Last.fm support" - ) - - optional_component(DBUS ON "D-Bus support" -- DEPENDS "D-Bus" DBUS_FOUND -+ DEPENDS "Qt5DBus" Qt5DBus_FOUND - ) - - optional_component(WIIMOTEDEV ON "Wiimote support" -- DEPENDS "D-Bus support" DBUS_FOUND -+ DEPENDS "D-Bus support" Qt5DBus_FOUND - ) - - optional_component(DEVICEKIT ON "Devices: DeviceKit backend" -- DEPENDS "D-Bus support" DBUS_FOUND -+ DEPENDS "D-Bus support" Qt5DBus_FOUND - ) - - optional_component(UDISKS2 ON "Devices: UDisks2 backend" -- DEPENDS "D-Bus support" DBUS_FOUND -+ DEPENDS "D-Bus support" Qt5DBus_FOUND - ) - - if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB) --- -2.19.2 - - -From 21e9f8be5b986581ab04869d28c335f949423ef5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 2 Dec 2018 00:21:17 +0100 -Subject: [PATCH 3/3] Find X11 only once, in root CMakeLists.txt - -Since we have HAVE_X11, use HAVE_X11 in cmake. ---- - 3rdparty/qxt/CMakeLists.txt | 1 - - CMakeLists.txt | 4 ++-- - src/CMakeLists.txt | 1 - - 3 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt -index 8fd9220ae..73c67a9fa 100644 ---- a/3rdparty/qxt/CMakeLists.txt -+++ b/3rdparty/qxt/CMakeLists.txt -@@ -10,7 +10,6 @@ set(QXT-MOC-HEADERS - qxtglobalshortcut.h - ) - --find_package(X11) - include_directories(${X11_INCLUDE_DIR}) - include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d1403e04..bd191b59e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -96,7 +96,7 @@ find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable) - set(QT_MIN_VERSION 5.6.0) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql Xml OpenGL Test) - find_package(Qt5DBus ${QT_MIN_VERSION}) --if(X11_FOUND) -+if(HAVE_X11) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) - endif() - if(APPLE) -@@ -112,7 +112,7 @@ if(Qt5DBus_FOUND) - set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::DBus) - get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION) - endif() --if(X11_FOUND) -+if(HAVE_X11) - set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::X11Extras) - endif() - if(APPLE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0eb14e28c..4a612d5bd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1364,7 +1364,6 @@ if (UNIX AND NOT APPLE) - # command but they're actually used by libraries that appear after them, so - # they end up getting ignored. This appends them to the very end of the link - # line, ensuring they're always used. -- find_package(X11) - if (FREEBSD) - target_link_libraries(clementine_lib ${X11_X11_LIB}) - else () --- -2.19.2 - diff --git a/media-sound/clementine/files/clementine-fts3-tokenizer.patch b/media-sound/clementine/files/clementine-fts3-tokenizer.patch deleted file mode 100644 index 41a5cd76c992..000000000000 --- a/media-sound/clementine/files/clementine-fts3-tokenizer.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 77b6d72a3e8d841977a3e30ea435cd9e9289fc96 Mon Sep 17 00:00:00 2001 -From: Alexander Golubev -Date: Thu, 16 Mar 2017 14:54:55 +0300 -Subject: [PATCH] core/database: configure fts3 tokenizer support - -Original patch by Arfrever -This fixes https://github.com/clementine-player/Clementine/issues/5297 ---- - src/core/database.cpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/core/database.cpp b/src/core/database.cpp -index 86e8a1052..36113d8c1 100644 ---- a/src/core/database.cpp -+++ b/src/core/database.cpp -@@ -265,6 +265,20 @@ QSqlDatabase Database::Connect() { - StaticInit(); - - { -+ -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER (generally a good idea -+ // due to security reasons) the fts3 support should be enabled explicitly. -+ // see https://github.com/clementine-player/Clementine/issues/5297 -+ 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(db); - set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)"); - set_fts_tokenizer.bindValue(":name", "unicode"); -- cgit v1.2.3-65-gdbad