From 96b1a3e84ac818e1a1ff5bcd79b81561dae48fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 4 Aug 2020 21:54:18 +0700 Subject: [PATCH 1/5] clementine: build with qt5 --- srcpkgs/clementine/patches/QPainterPath.patch | 36 +++++++++++++++++++ srcpkgs/clementine/template | 24 ++++++------- 2 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/clementine/patches/QPainterPath.patch diff --git a/srcpkgs/clementine/patches/QPainterPath.patch b/srcpkgs/clementine/patches/QPainterPath.patch new file mode 100644 index 00000000000..271b8c1d724 --- /dev/null +++ b/srcpkgs/clementine/patches/QPainterPath.patch @@ -0,0 +1,36 @@ +diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp +index 3067f72..c9789d3 100644 +--- a/src/widgets/freespacebar.cpp ++++ b/src/widgets/freespacebar.cpp +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + const int FreeSpaceBar::kBarHeight = 20; + const int FreeSpaceBar::kBarBorderRadius = 8; +diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp +index 9d95716..30cef7d 100644 +--- a/src/widgets/osdpretty.cpp ++++ b/src/widgets/osdpretty.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp +index 581a0de..27b81f7 100644 +--- a/src/widgets/sliderwidget.cpp ++++ b/src/widgets/sliderwidget.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 1ad02f3dee1..2465b8f4605 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,19 +1,19 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=25 +revision=26 _commit=75f18dab23f0842713a4200a7e362efd51b12e31 wrksrc="Clementine-${_commit}" build_style=cmake configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF" hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf" -makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel +makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel - taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libechonest-devel + taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel) libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc - qt5-tools-devel" + qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel" depends="desktop-file-utils" short_desc="Modern music player and library organizer" maintainer="Andrea Brancaleoni " @@ -21,7 +21,6 @@ license="GPL-3.0-or-later" homepage="https://www.clementine-player.org/" distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz" checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a - patch_args="-Np1" build_options="spotify" @@ -29,25 +28,22 @@ case "$XBPS_TARGET_MACHINE" in x86_64 | i686 | armv7l) build_options_default="spotify";; *) - build_options_default="";; + if [ "$build_option_spotify" ]; then + broken="no spotify blob" + fi + ;; esac subpackages="$(vopt_if spotify clementine-spotify)" -pre_configure() { - sed -i 's|-Wno-unused-private-field||g' src/CMakeLists.txt ext/clementine-spotifyblob/CMakeLists.txt - sed -i 's|-Wno-unknown-warning-option||g' src/CMakeLists.txt ext/clementine-spotifyblob/CMakeLists.txt - sed -i 's|AMAZON_CLOUD_DRIVE OFF|AMAZON_CLOUD_DRIVE ON|g' CMakeLists.txt - sed -i 's;if (fs == NULL);if (!fs);' 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp -} - post_install() { - $(vopt_if spotify rm\ -r\ $DESTDIR/builddir) + rm -rf $DESTDIR/builddir } clementine-spotify_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - spotify extension" + license="Apache-2.0" repository="nonfree" pkg_install() { vmove usr/bin/clementine-spotifyblob From f5135f61a8073244f28a3efa3494893166e9de56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 5 Aug 2020 08:51:22 +0700 Subject: [PATCH 2/5] liblastfm: drop package --- common/shlibs | 2 -- srcpkgs/liblastfm-devel | 1 - srcpkgs/liblastfm/template | 25 ------------------------- 3 files changed, 28 deletions(-) delete mode 120000 srcpkgs/liblastfm-devel delete mode 100644 srcpkgs/liblastfm/template diff --git a/common/shlibs b/common/shlibs index b10eae70847..632cf52897a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2142,8 +2142,6 @@ libfcitx-qt.so.0 libfcitx-qt-4.2.8_1 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1 -liblastfm.so.1 liblastfm-1.0.9_1 -liblastfm_fingerprint.so.1 liblastfm-1.0.9_1 libdruntime-ldc-debug-shared.so.92 ldc-runtime-1.22.0_1 libdruntime-ldc-shared.so.92 ldc-runtime-1.22.0_1 libphobos2-ldc-shared.so.92 ldc-runtime-1.22.0_1 diff --git a/srcpkgs/liblastfm-devel b/srcpkgs/liblastfm-devel deleted file mode 120000 index 78808ea0a12..00000000000 --- a/srcpkgs/liblastfm-devel +++ /dev/null @@ -1 +0,0 @@ -liblastfm \ No newline at end of file diff --git a/srcpkgs/liblastfm/template b/srcpkgs/liblastfm/template deleted file mode 100644 index d387b3fed76..00000000000 --- a/srcpkgs/liblastfm/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'liblastfm' -pkgname=liblastfm -version=1.0.9 -revision=2 -build_style=cmake -makedepends="qt-devel libsamplerate-devel fftw-devel" -short_desc="A Qt4 C++ library for the Last.fm webservices" -maintainer="Logen K " -license="GPL-3.0-or-later" -homepage="https://github.com/lastfm/liblastfm" -distfiles="https://github.com/lastfm/${pkgname}/archive/${version}.tar.gz" -checksum=5276b5fe00932479ce6fe370ba3213f3ab842d70a7d55e4bead6e26738425f7b - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi - -liblastfm-devel_package() { - depends="liblastfm>=${version}_${revision} $makedepends" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - } -} From 733fe267315eae5d75726f04504612fac41ffcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 5 Aug 2020 22:18:42 +0700 Subject: [PATCH 3/5] qca: drop package All dependents have been moved to qca-qt5 --- common/shlibs | 1 - srcpkgs/qca-devel | 1 - srcpkgs/qca-ossl | 1 - srcpkgs/qca/template | 37 ------------------------------------- 4 files changed, 40 deletions(-) delete mode 120000 srcpkgs/qca-devel delete mode 120000 srcpkgs/qca-ossl delete mode 100644 srcpkgs/qca/template diff --git a/common/shlibs b/common/shlibs index 632cf52897a..e3121488b27 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1392,7 +1392,6 @@ libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1 libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-12.10.2_1 libGrantlee_Templates.so.5 grantlee5-5.0.0_1 libGrantlee_TextDocument.so.5 grantlee5-5.0.0_1 -libqca.so.2 qca-2.0.3_1 librasqal.so.3 librasqal-0.9.30_1 librdf.so.0 librdf-1.0.16_1 libclucene-core.so.1 clucene-2.3.3.4_1 diff --git a/srcpkgs/qca-devel b/srcpkgs/qca-devel deleted file mode 120000 index 28e094dfc3b..00000000000 --- a/srcpkgs/qca-devel +++ /dev/null @@ -1 +0,0 @@ -qca \ No newline at end of file diff --git a/srcpkgs/qca-ossl b/srcpkgs/qca-ossl deleted file mode 120000 index 28e094dfc3b..00000000000 --- a/srcpkgs/qca-ossl +++ /dev/null @@ -1 +0,0 @@ -qca \ No newline at end of file diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template deleted file mode 100644 index a93ef3c8352..00000000000 --- a/srcpkgs/qca/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'qca' -pkgname=qca -version=2.1.3 -revision=6 -build_style=cmake -configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt - -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" -hostmakedepends="pkg-config ca-certificates" -makedepends="nss-devel libgcrypt-devel qt-devel libressl-devel" -depends="ca-certificates" -short_desc="Qt Cryptographic Architecture" -maintainer="Orphaned " -license="LGPL-2.1" -homepage="http://delta.affinix.com/qca/" -distfiles="https://download.kde.org/stable/$pkgname/$version/src/${pkgname}-${version}.tar.xz" -checksum=003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi - -qca-ossl_package() { - depends="${sourcepkg}-${version}_${revision}" - short_desc+=" - QCA OSSL plugin" - pkg_install() { - vmove usr/lib/qca/crypto/libqca-ossl.so - } -} -qca-devel_package() { - depends="qt-devel ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/cmake - vmove usr/share/qca/mkspecs - } -} From fa6a422b6317760c0570c6ac90e769155df0795f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 5 Aug 2020 22:27:41 +0700 Subject: [PATCH 4/5] libechonest: drop package --- common/shlibs | 1 - srcpkgs/libechonest-devel | 1 - srcpkgs/libechonest/template | 27 --------------------------- 3 files changed, 29 deletions(-) delete mode 120000 srcpkgs/libechonest-devel delete mode 100644 srcpkgs/libechonest/template diff --git a/common/shlibs b/common/shlibs index e3121488b27..682339b36a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2155,7 +2155,6 @@ libgdict-1.0.so.10 gnome-dictionary-3.18.1_1 libasignify.so.1 asignify-1.0_1 libvte2_90.so.9 vte290-0.36.3_1 libd0_blind_id.so.0 xonotic-0.8.0_1 -libechonest.so.2.3 libechonest-2.3.1_1 libuecc.so.0 libuecc-5_1 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1 diff --git a/srcpkgs/libechonest-devel b/srcpkgs/libechonest-devel deleted file mode 120000 index f80906acde0..00000000000 --- a/srcpkgs/libechonest-devel +++ /dev/null @@ -1 +0,0 @@ -libechonest \ No newline at end of file diff --git a/srcpkgs/libechonest/template b/srcpkgs/libechonest/template deleted file mode 100644 index 9405c0e452e..00000000000 --- a/srcpkgs/libechonest/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'libechonest' -pkgname=libechonest -version=2.3.1 -revision=3 -build_style=cmake -hostmakedepends="qt-qmake" -makedepends="qjson-devel boost-devel" -short_desc="A C++/Qt wrapper around the wonderful echo nest api" -maintainer="Duncan Overbruck " -license="GPL-2" -homepage="https://projects.kde.org/projects/playground/libs/libechonest" -distfiles="https://github.com/lfranchi/libechonest/archive/${version}.tar.gz" -checksum=ab961ab952df30c5234b548031594d7e281e7c9f2a9d1ce91fe5421ddde85e7c - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools" -fi - -libechonest-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/pkgconfig - } -} From 7cedf758a42cba71474809da6ac7cdd10a71d3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 5 Aug 2020 22:31:28 +0700 Subject: [PATCH 5/5] qjson: drop package Nothing else depends on qjson, Qt5 has native support for JSON. --- srcpkgs/qjson-devel | 1 - srcpkgs/qjson/template | 27 --------------------------- srcpkgs/qjson/update | 2 -- 3 files changed, 30 deletions(-) delete mode 120000 srcpkgs/qjson-devel delete mode 100644 srcpkgs/qjson/template delete mode 100644 srcpkgs/qjson/update diff --git a/srcpkgs/qjson-devel b/srcpkgs/qjson-devel deleted file mode 120000 index c1f5318a6d1..00000000000 --- a/srcpkgs/qjson-devel +++ /dev/null @@ -1 +0,0 @@ -qjson \ No newline at end of file diff --git a/srcpkgs/qjson/template b/srcpkgs/qjson/template deleted file mode 100644 index d07b30eba25..00000000000 --- a/srcpkgs/qjson/template +++ /dev/null @@ -1,27 +0,0 @@ -# Template file for 'qjson' -pkgname=qjson -version=0.9.0 -revision=2 -build_style=cmake -makedepends="qt-devel" -short_desc="A QT-based library that maps JSON data to QVariant objects" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://qjson.sourceforge.net" -distfiles="https://github.com/flavio/qjson/archive/$version.tar.gz" -checksum=e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi - -qjson-devel_package() { - depends="qt-devel ${sourcepkg}>=${version}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/qjson/update b/srcpkgs/qjson/update deleted file mode 100644 index 6525c819eb5..00000000000 --- a/srcpkgs/qjson/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://github.com/flavio/qjson/tags" -pattern='/archive/\K[\d\.]+(?=\.tar\.gz")'