From ca84c4953210f9fef57e6d4f094bce1e55136425 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 6 Jul 2018 21:31:28 +0200 Subject: [PATCH] tomahawk: remove qt4 version --- common/shlibs | 6 -- srcpkgs/tomahawk-qt5 | 1 + srcpkgs/tomahawk-qt5-devel | 2 +- srcpkgs/tomahawk-qt5/template | 50 --------------- .../patches/liblastfm.patch | 0 .../patches/musl.patch | 0 srcpkgs/tomahawk/template | 61 ++++++++++++------- 7 files changed, 40 insertions(+), 80 deletions(-) create mode 120000 srcpkgs/tomahawk-qt5 delete mode 100644 srcpkgs/tomahawk-qt5/template rename srcpkgs/{tomahawk-qt5 => tomahawk}/patches/liblastfm.patch (100%) rename srcpkgs/{tomahawk-qt5 => tomahawk}/patches/musl.patch (100%) diff --git a/common/shlibs b/common/shlibs index eeae36f8b2b..4093ef9fa54 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1962,9 +1962,6 @@ libqtkeychain.so.0 qtkeychain-0.4.0_1 libjreen.so.1 jreen-1.2.1_1 libtelepathy-qt4.so.2 telepathy-qt-0.9.5_1 libtelepathy-qt4-farstream.so.2 telepathy-qt-farstream-0.9.5_1 -libtomahawk.so.0.8.4 tomahawk-0.8.4_1 -libtomahawk-playdarapi.so.0.8.4 tomahawk-0.8.4_1 -libtomahawk-widgets.so.0.8.4 tomahawk-0.8.4_1 libuecc.so.0 libuecc-5_1 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1 @@ -2046,9 +2043,6 @@ liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1 liblastfm5.so.1 liblastfm-qt5-1.0.9_1 libquazip5.so.1 quazip-0.7.3_2 libjreen-qt5.so.1 jreen-qt5-1.2.0_1 -libtomahawk.so.0.8.99 tomahawk-qt5-0.8.4_13 -libtomahawk-playdarapi.so.0.8.99 tomahawk-qt5-0.8.4_13 -libtomahawk-widgets.so.0.8.99 tomahawk-qt5-0.8.4_13 libzen.so.0 libzen-0.4.31_1 libmediainfo.so.0 libmediainfo-0.7.75_1 libnghttp2.so.14 nghttp2-1.0.2_1 diff --git a/srcpkgs/tomahawk-qt5 b/srcpkgs/tomahawk-qt5 new file mode 120000 index 00000000000..4b39eaa821c --- /dev/null +++ b/srcpkgs/tomahawk-qt5 @@ -0,0 +1 @@ +tomahawk \ No newline at end of file diff --git a/srcpkgs/tomahawk-qt5-devel b/srcpkgs/tomahawk-qt5-devel index 9bb91079021..4b39eaa821c 120000 --- a/srcpkgs/tomahawk-qt5-devel +++ b/srcpkgs/tomahawk-qt5-devel @@ -1 +1 @@ -tomahawk-qt5 \ No newline at end of file +tomahawk \ No newline at end of file diff --git a/srcpkgs/tomahawk-qt5/template b/srcpkgs/tomahawk-qt5/template deleted file mode 100644 index df4f95ce5f6..00000000000 --- a/srcpkgs/tomahawk-qt5/template +++ /dev/null @@ -1,50 +0,0 @@ -# Template file for 'tomahawk-qt5' -pkgname=tomahawk-qt5 -version=0.8.4 -revision=15 -wrksrc="${pkgname%-*}-${_commit}" -_commit=00f602e10203b76fc28b4615868c567e6bd4ced4 -build_style=cmake -build_options="upower hatchet kde xmpp" -desc_option_hatchet="Enable support for http://hatchet.is" -desc_option_kde="Enable support for KDE" -desc_option_xmpp="Enable support for XMPP" -build_options_default="$build_options" -configure_args="-Wno-dev -DBUILD_RELEASE=ON \ - $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \ - -DBUILD_WITH_QT4=OFF \ - -DWITH_CRASHREPORTER=OFF \ - -DTAGLIB_MIN_VERSION=1.10 \ - $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \ - $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')" -hostmakedepends="pkg-config extra-cmake-modules" -makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel - libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel - qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel - quazip-qt5-devel sparsehash taglib-devel vlc-devel $(vopt_if hatchet websocketpp) - $(vopt_if xmpp jreen-qt5-devel) $(vopt_if kde telepathy-qt5-devel)" -depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)" -short_desc="Multi-source social music player" -maintainer="Duncaen " -license="GPL-3.0-or-later" -homepage="https://tomahawk-player.org/" -distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz" -checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79 - -provides="tomahawk-${version}_${revision}" -replaces="tomahawk>=0" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake" -fi - -tomahawk-qt5-devel_package() { - depends="tomahawk-qt5>=${version}_${revision}" - short_desc+=" - development files" - provides="tomahawk-devel-${version}_${revision}" - replaces="tomahawk-devel>=0" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - } -} diff --git a/srcpkgs/tomahawk-qt5/patches/liblastfm.patch b/srcpkgs/tomahawk/patches/liblastfm.patch similarity index 100% rename from srcpkgs/tomahawk-qt5/patches/liblastfm.patch rename to srcpkgs/tomahawk/patches/liblastfm.patch diff --git a/srcpkgs/tomahawk-qt5/patches/musl.patch b/srcpkgs/tomahawk/patches/musl.patch similarity index 100% rename from srcpkgs/tomahawk-qt5/patches/musl.patch rename to srcpkgs/tomahawk/patches/musl.patch diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index ee136149357..afd4050cb4f 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -1,36 +1,39 @@ # Template file for 'tomahawk' pkgname=tomahawk version=0.8.4 -revision=12 +revision=16 +wrksrc=${pkgname}-${_commit} +_commit=00f602e10203b76fc28b4615868c567e6bd4ced4 build_style=cmake -build_options="upower hatchet xmpp" +build_options="upower hatchet kde xmpp" desc_option_hatchet="Enable support for http://hatchet.is" +desc_option_kde="Enable support for KDE" desc_option_xmpp="Enable support for XMPP" -build_options_default=${build_options} -configure_args="-DBUILD_RELEASE=ON \ - -DTAGLIB_MIN_VERSION=1.10 \ +build_options_default="xmpp hatcher upower" +configure_args="-Wno-dev -DBUILD_RELEASE=ON \ $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \ - -DBUILD_WITH_QT4=ON \ - -DWITH_CRASHREPORTER=OFF + -DBUILD_WITH_QT4=OFF \ + -DWITH_CRASHREPORTER=OFF \ + -DTAGLIB_MIN_VERSION=1.10 \ + $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \ $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')" -hostmakedepends="pkg-config akonadi-devel" -makedepends="boost-devel qt-devel qt-webkit-devel qjson-devel taglib-devel - sparsehash gnutls-devel qca-devel Lucene++-devel attica-devel quazip-devel - qtkeychain-devel phonon-devel liblastfm-devel libechonest-devel libressl-devel - $(vopt_if hatchet websocketpp) $(vopt_if xmpp jreen-devel)" -depends="virtual?phonon-backend qt-plugin-sqlite $(vopt_if xmpp qca-ossl)" +hostmakedepends="pkg-config extra-cmake-modules" +makedepends="Lucene++-devel attica-qt5-devel boost-devel gnutls-devel + libechonest-qt5-devel liblastfm-qt5-devel phonon-qt5-devel qca-qt5-devel + qt5-svg-devel qt5-tools-devel qt5-webkit-devel qtkeychain-qt5-devel + quazip-devel sparsehash taglib-devel vlc-devel $(vopt_if hatchet websocketpp) + $(vopt_if xmpp jreen-qt5-devel) $(vopt_if kde telepathy-qt5-devel)" +depends="virtual?phonon-qt5-backend qt5-plugin-sqlite $(vopt_if xmpp qca-qt5-ossl)" short_desc="Multi-source social music player" -maintainer="Duncan Overbruck " -license="GPL-3" -homepage="http://tomahawk-player.org/" -distfiles="http://download.tomahawk-player.org/${pkgname}-${version}.tar.bz2" -checksum=0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 -nocross=yes +maintainer="Duncaen " +license="GPL-3.0-or-later" +homepage="https://tomahawk-player.org/" +distfiles="https://github.com/tomahawk-player/tomahawk/archive/${_commit}.tar.gz" +checksum=f93d36b246944657dcef98ff71410db8630c53b5565dc283fb15f57e5b301f79 -post_extract() { - # fix musl build - sed -i '41a#include ' src/libtomahawk/accounts/ResolverAccount.cpp -} +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-qmake" +fi tomahawk-devel_package() { depends="tomahawk>=${version}_${revision}" @@ -40,3 +43,15 @@ tomahawk-devel_package() { vmove usr/lib/cmake } } + +tomahawk-qt5_package() { + build_style=meta + short_desc+=" (transitional dummy package)" + depends="tomahawk>=${version}_${revision}" +} + +tomahawk-qt5-devel_package() { + build_style=meta + short_desc+=" (transitional dummy package)" + depends="tomahawk-devel>=${version}_${revision}" +}