From 9d65facbeb6a012339756b6fd51c48df31c3c06e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:43:35 -0400 Subject: [PATCH 1/8] quazip: update to 1.4, add qt6 support. closes #49782 --- common/shlibs | 3 ++- srcpkgs/quazip-qt6 | 1 + srcpkgs/quazip-qt6-devel | 1 + srcpkgs/quazip/template | 55 +++++++++++++++++++++++++++++++++------- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/quazip-qt6 create mode 120000 srcpkgs/quazip-qt6-devel diff --git a/common/shlibs b/common/shlibs index d561e05a5d17a7..a1794b6896312b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2359,7 +2359,8 @@ libtelepathy-qt5-farstream.so.0 telepathy-qt5-farstream-0.9.5_1 libKF5Attica.so.5 attica-5.6.0_1 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 +libquazip1-qt5.so.1.4.0 quazip-1.4_1 +libquazip1-qt6.so.1.4.0 quazip-qt6-1.4_1 libjreen-qt5.so.1 jreen-1.3.0_1 libzen.so.0 libzen-0.4.31_1 libmediainfo.so.0 libmediainfo-0.7.75_1 diff --git a/srcpkgs/quazip-qt6 b/srcpkgs/quazip-qt6 new file mode 120000 index 00000000000000..25332fc361d378 --- /dev/null +++ b/srcpkgs/quazip-qt6 @@ -0,0 +1 @@ +quazip \ No newline at end of file diff --git a/srcpkgs/quazip-qt6-devel b/srcpkgs/quazip-qt6-devel new file mode 120000 index 00000000000000..25332fc361d378 --- /dev/null +++ b/srcpkgs/quazip-qt6-devel @@ -0,0 +1 @@ +quazip \ No newline at end of file diff --git a/srcpkgs/quazip/template b/srcpkgs/quazip/template index b9faea57e49bf3..ccf5df3d0ff35f 100644 --- a/srcpkgs/quazip/template +++ b/srcpkgs/quazip/template @@ -1,28 +1,47 @@ # Template file for 'quazip' pkgname=quazip -version=0.8.1 +version=1.4 revision=1 build_style=cmake -makedepends="qt5-devel zlib-devel" +configure_args="-DQUAZIP_QT_MAJOR_VERSION=5" +hostmakedepends="qt5-host-tools qt5-devel qt6-tools qt6-base" +makedepends="qt5-devel qt6-base-devel qt6-qt5compat-devel zlib-devel" short_desc="Qt5/C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" maintainer="Duncaen " license="LGPL-2.1-only" homepage="https://github.com/stachenov/quazip" distfiles="https://github.com/stachenov/quazip/archive/v${version}.tar.gz" -checksum=4fda4d4248e08015b5090d0369ef9e68bdc4475aa12494f7c0f6d79e43270d14 +checksum=79633fd3a18e2d11a7d5c40c4c79c1786ba0c74b59ad752e8429746fe1781dd6 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-devel" +if [ "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DQUAZIP_ENABLE_TESTS=ON" fi +post_configure() { + configure_args="${configure_args/=5/=6}" + cmake_builddir="build-qt6" do_configure +} + +post_build() { + cmake_builddir="build-qt6" do_build +} + +post_check() { + cmake_builddir="build-qt6" do_check +} + +post_install() { + cmake_builddir="build-qt6" do_install +} + quazip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove usr/share - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove "usr/include/*Qt5*" + vmove "usr/lib/cmake/*Qt5*" + vmove "usr/lib/pkgconfig/*qt5*" + vmove "usr/lib/*qt5.so" } } @@ -37,3 +56,21 @@ quazip-qt5-devel_package() { short_desc+=" (transitional dummy package)" depends="quazip-devel>=${version}_${revision}" } + +quazip-qt6_package() { + short_desc="${short_desc/Qt5/Qt6}" + pkg_install() { + vmove "usr/lib/*qt6.so.*" + } +} + +quazip-qt6-devel_package() { + depends="${sourcepkg}-qt6>=${version}_${revision}" + short_desc="${short_desc/Qt5/Qt6} - development files" + pkg_install() { + vmove "usr/include/*Qt6*" + vmove "usr/lib/cmake/*Qt6*" + vmove "usr/lib/pkgconfig/*qt6*" + vmove "usr/lib/*qt6.so" + } +} From e9e99688f3c674d4eca189cd260d71ebbcc94cc5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:51:20 -0400 Subject: [PATCH 2/8] ckb-next: rebuild for quazip-1.4_1 --- srcpkgs/ckb-next/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template index 729629fe45925d..dba89225e210a8 100644 --- a/srcpkgs/ckb-next/template +++ b/srcpkgs/ckb-next/template @@ -1,7 +1,7 @@ # Template file for 'ckb-next' pkgname=ckb-next version=0.6.0 -revision=2 +revision=3 build_style=cmake configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d" hostmakedepends="qt5-devel pkg-config" From 89e720aad6171cacb1dba18d2cd95b32f21c2b74 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:51:21 -0400 Subject: [PATCH 3/8] krita: rebuild for quazip-1.4_1 --- srcpkgs/krita/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 5ee175e80344f5..1486a0c6b6bf09 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=5.2.1 -revision=5 +revision=6 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 From b1dbb52d13b5372cb93112a0d2f3c95b1e265cd4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:51:22 -0400 Subject: [PATCH 4/8] nomacs: rebuild for quazip-1.4_1 --- srcpkgs/nomacs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template index 956bd21ebb129c..e0a0f37037fd6a 100644 --- a/srcpkgs/nomacs/template +++ b/srcpkgs/nomacs/template @@ -1,7 +1,7 @@ # Template file for 'nomacs' pkgname=nomacs version=3.17.2287 -revision=1 +revision=2 _plugins_ver=3.17.2285 build_wrksrc=ImageLounge build_style=cmake From dacb89887130e70fd6174299636448c5e6c045de Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:51:58 -0400 Subject: [PATCH 5/8] plume-creator: rebuild for quazip-1.4_1, orphan maintainer hasn't contributed in 6 years --- srcpkgs/plume-creator/template | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template index fbe9022f4bd16f..cf6ecfa2bcfd2c 100644 --- a/srcpkgs/plume-creator/template +++ b/srcpkgs/plume-creator/template @@ -1,38 +1,37 @@ # Template file for 'plume-creator' pkgname=plume-creator version=0.66+dfsg1pl3.2 -revision=1 +revision=2 build_style=qmake +configure_args="plume-creator-all.pro" hostmakedepends="qt5-qmake qt5-host-tools pkg-config" makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel qt5-quickcontrols2-devel qt5-multimedia-devel qt5-svg-devel hunspell-devel libzip-devel quazip-devel" -short_desc="An open-source tool for novelists" -maintainer="VargMon " +short_desc="Open-source tool for novelists" +maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="http://plume-creator.eu/" -configure_args="plume-creator-all.pro" -distfiles=" - ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz +homepage="https://packages.debian.org/sid/source/plume-creator" +distfiles="${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2" -checksum=" - f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c +checksum="f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00" - skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2" -post_extract() { +pre_patch() { local p TAR=$(command -v bsdtar || command -v tar) $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction for p in $(cat debian/patches/series); do patch -Np1 -F0 -i debian/patches/$p || return 1 done - sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \ + vsed -i 's|quazip5/JlCompress|QuaZip-Qt5-1.4/quazip/JlCompress|g' src/fileupdater.cpp src/hub.h \ src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \ src/common/utils.h + vsed -i 's|-lquazip5|-lquazip1-qt5|' plume-creator.pro } pre_build() { - [ -d ${wrksrc}/externals/quazip ] || ln -s -T ${XBPS_CROSS_BASE}/usr/include/quazip5 ${wrksrc}/externals/quazip + [ -d ${wrksrc}/externals/quazip ] || \ + ln -s -T ${XBPS_CROSS_BASE}/usr/include/QuaZip-Qt5-1.4/quazip ${wrksrc}/externals/quazip } From 4a48b5520ec21c054e831d3908e5d3062d5547cc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 03:51:23 -0400 Subject: [PATCH 6/8] texstudio: rebuild for quazip-1.4_1, switch to cmake --- srcpkgs/texstudio/template | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index 1011e07cf18537..9e043966033589 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -1,17 +1,14 @@ # Template file for 'texstudio' pkgname=texstudio version=4.5.2 -revision=1 -build_style=qmake -configure_args="USE_SYSTEM_HUNSPELL=y USE_SYSTEM_QUAZIP=y - INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/quazip5 - $(vopt_if phonon PHONON=true) $(vopt_if poppler '' NO_POPPLER_PREVIEW=true)" +revision=2 +build_style=cmake +configure_args="$(vopt_bool multimedia TEXSTUDIO_ENABLE_MEDIAPLAYER)" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="qt5-webkit-devel qt5-svg-devel qt5-script-devel qt5-tools-devel kdeclarative-devel hunspell-devel quazip-devel - $(vopt_if phonon phonon-qt5-devel) - $(vopt_if poppler "poppler-qt5-devel poppler-cpp-devel") - " + $(vopt_if multimedia qt5-multimedia-devel) + $(vopt_if poppler "poppler-qt5-devel poppler-cpp-devel")" depends="qt5-svg" short_desc="Powerful Tex/LaTeX editor based on texmaker" maintainer="Piraty " @@ -21,14 +18,14 @@ changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/util distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" checksum=d43dd21a111aacf57e40b0ee27c94b9923f8fdbddec5bad919596abf9a03f3cf -build_options="phonon poppler" -desc_option_phonon="build with phonon (=media support for pdf preview)" +build_options="multimedia poppler" +desc_option_phonon="build with qt5-multimedia (=media support for pdf preview)" desc_option_poppler="build with poppler (=internal pdf preview)" -build_options_default="phonon poppler" +build_options_default="multimedia poppler" case "$XBPS_TARGET_MACHINE" in ppc64*) ;; aarch64*|ppc*) - configure_args+=" NO_CRASH_HANDLER=true" ;; + configure_args+=" -DTEXSTUDIO_ENABLE_CRASH_HANDLER=OFF" ;; esac From 0fb110c7f2a293ef8e1d739f420e45cd47e4dd3f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 04:50:48 -0400 Subject: [PATCH 7/8] tomahawk: remove package abandoned for 4 years, last release 2015, needs quazip 0.x --- srcpkgs/removed-packages/template | 6 ++- srcpkgs/tomahawk-devel | 1 - srcpkgs/tomahawk-qt5 | 1 - srcpkgs/tomahawk-qt5-devel | 1 - srcpkgs/tomahawk/patches/musl.patch | 20 --------- srcpkgs/tomahawk/template | 63 ----------------------------- 6 files changed, 5 insertions(+), 87 deletions(-) delete mode 120000 srcpkgs/tomahawk-devel delete mode 120000 srcpkgs/tomahawk-qt5 delete mode 120000 srcpkgs/tomahawk-qt5-devel delete mode 100644 srcpkgs/tomahawk/patches/musl.patch delete mode 100644 srcpkgs/tomahawk/template diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 76482075d691eb..216eb85ff6fa0e 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20240418 +version=0.1.20240513 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -699,6 +699,10 @@ replaces=" terminal_markdown_viewer<=1.6.3_4 tilp2<=1.18_2 tlsdate<=0.0.13_16 + tomahawk<=0.8.4_25 + tomahawk-devel<=0.8.4_25 + tomahawk-qt5<=0.8.4_25 + tomahawk-qt5-devel<=0.8.4_25 transcode<=1.1.7_4 traverso<=0.49.6_2 ttyload-git<=20141117_4 diff --git a/srcpkgs/tomahawk-devel b/srcpkgs/tomahawk-devel deleted file mode 120000 index 4b39eaa821c91d..00000000000000 --- a/srcpkgs/tomahawk-devel +++ /dev/null @@ -1 +0,0 @@ -tomahawk \ No newline at end of file diff --git a/srcpkgs/tomahawk-qt5 b/srcpkgs/tomahawk-qt5 deleted file mode 120000 index 4b39eaa821c91d..00000000000000 --- a/srcpkgs/tomahawk-qt5 +++ /dev/null @@ -1 +0,0 @@ -tomahawk \ No newline at end of file diff --git a/srcpkgs/tomahawk-qt5-devel b/srcpkgs/tomahawk-qt5-devel deleted file mode 120000 index 4b39eaa821c91d..00000000000000 --- a/srcpkgs/tomahawk-qt5-devel +++ /dev/null @@ -1 +0,0 @@ -tomahawk \ No newline at end of file diff --git a/srcpkgs/tomahawk/patches/musl.patch b/srcpkgs/tomahawk/patches/musl.patch deleted file mode 100644 index 7c3cd4c60b63eb..00000000000000 --- a/srcpkgs/tomahawk/patches/musl.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libtomahawk/accounts/ResolverAccount.cpp -+++ b/src/libtomahawk/accounts/ResolverAccount.cpp -@@ -44,6 +44,17 @@ - #include - #include - -+#include -+ -+#ifndef __WORDSIZE -+# if ULONG_MAX == 0xffffffffffffffff -+# define __WORDSIZE 64 -+# elif ULONG_MAX == 0xffffffff -+# define __WORDSIZE 32 -+# endif /* ULONG_MAX */ -+#endif /* __WORDSIZE */ -+ -+ - #define MANUALRESOLVERS_DIR "manualresolvers" - - using namespace Tomahawk; diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template deleted file mode 100644 index 82c5a7f8fef7bd..00000000000000 --- a/srcpkgs/tomahawk/template +++ /dev/null @@ -1,63 +0,0 @@ -# Template file for 'tomahawk' -pkgname=tomahawk -version=0.8.4 -revision=25 -_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f -build_style=cmake -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 - 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-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=3305a8221af1bfa51cbf5256abf8ab3824393b684ce428a3c46409cf5e1d3fce -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="xmpp upower" - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" qt5-host-tools qt5-qmake" -fi - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" -fi - -CXXFLAGS="-Wno-deprecated-declarations" - -tomahawk-devel_package() { - depends="tomahawk>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - 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}" -} From b373cac4a4cd1f097aa16697379b373eb1958d85 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 May 2024 05:12:16 -0400 Subject: [PATCH 8/8] PrismLauncher: use system libraries, qt6 --- srcpkgs/PrismLauncher/template | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template index b9ace9c2cbf5a1..6fe5008608d3ef 100644 --- a/srcpkgs/PrismLauncher/template +++ b/srcpkgs/PrismLauncher/template @@ -1,13 +1,12 @@ # Template file for 'PrismLauncher' pkgname=PrismLauncher version=8.3 -revision=1 +revision=2 build_style=cmake -configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_QT_VERSION_MAJOR='5'" -hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt5-host-tools - qt5-qmake scdoc" -makedepends="qt5-devel" -depends="virtual?java-runtime qt5-svg qt5-imageformats" +configure_args="-DLauncher_BUILD_PLATFORM=Void" +hostmakedepends="extra-cmake-modules openjdk17 pkg-config qt6-tools qt6-base scdoc" +makedepends="qt6-base-devel qt6-qt5compat-devel zlib-devel quazip-qt6-devel" +depends="virtual?java-runtime qt6-svg qt6-imageformats" short_desc="Custom launcher for Minecraft" maintainer="Philipp David " license="GPL-3.0-only" @@ -26,10 +25,6 @@ case "$XBPS_TARGET_MACHINE" in armv*) broken="https://github.com/PrismLauncher/PrismLauncher/issues/128" ;; esac -post_extract() { - rm -rf .git -} - pre_configure() { local _date if [ "$SOURCE_DATE_EPOCH" ]; then