From 0fc6c7430103ce45d883c605c8ab03d2ae8ce63b Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 20 Mar 2024 13:37:48 -0400 Subject: [PATCH 1/4] transmission: build with qt6 --- srcpkgs/transmission/template | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 058879644ab1c1..79b402a731dbd6 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,13 +1,19 @@ # Template file for 'transmission' pkgname=transmission version=4.0.5 -revision=1 +revision=2 build_style=cmake -configure_args="-DENABLE_CLI=ON -DENABLE_GTK=ON -DENABLE_QT=ON -DENABLE_MAC=OFF" -hostmakedepends="autoconf automake intltool glib-devel - libtool pkg-config qt5-host-tools qt5-qmake" +configure_args=" + -DENABLE_CLI=ON + -DENABLE_GTK=ON + -DENABLE_QT=ON + -DUSE_QT_VERSION=6 + -DWITH_SYSTEMD=OFF + -DENABLE_MAC=OFF" +hostmakedepends="intltool glib-devel libtool pkg-config qt6-base + qt6-tools" makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel - libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel + libcurl-devel libevent-devel qt6-svg-devel libdeflate-devel miniupnpc-devel" short_desc="Fast, easy and free BitTorrent client" maintainer="Jason Elswick " @@ -22,10 +28,6 @@ system_accounts="transmission" transmission_homedir="/var/lib/transmission" make_dirs="/var/lib/transmission 0755 transmission transmission" -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" -fi - post_install() { rm -f ${DESTDIR}/usr/share/${pkgname}/web/LICENSE vsv transmission-daemon From 8d1ed60ab085362e27d152ab0ff69c07a5997200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 28 Mar 2024 09:20:15 +0700 Subject: [PATCH 2/4] New package: libnatpmp-20230423 --- common/shlibs | 1 + srcpkgs/libnatpmp-devel | 1 + srcpkgs/libnatpmp/template | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 120000 srcpkgs/libnatpmp-devel create mode 100644 srcpkgs/libnatpmp/template diff --git a/common/shlibs b/common/shlibs index b5d8634b844462..93b8afebaaa010 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1092,6 +1092,7 @@ libORBit-2.so.0 libORBit2-2.14.19_1 libORBit-imodule-2.so.0 libORBit2-2.14.19_1 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1 libminiupnpc.so.17 miniupnpc-2.1_1 +libnatpmp.so.1 libnatpmp-20230423_1 libxbps.so.5 libxbps-0.59.1_4 libatf-c.so.1 atf-libs-0.21_1 libatf-c++.so.2 atf-libs-0.21_1 diff --git a/srcpkgs/libnatpmp-devel b/srcpkgs/libnatpmp-devel new file mode 120000 index 00000000000000..3d60a28ba8e8e5 --- /dev/null +++ b/srcpkgs/libnatpmp-devel @@ -0,0 +1 @@ +libnatpmp \ No newline at end of file diff --git a/srcpkgs/libnatpmp/template b/srcpkgs/libnatpmp/template new file mode 100644 index 00000000000000..385c534809ead0 --- /dev/null +++ b/srcpkgs/libnatpmp/template @@ -0,0 +1,34 @@ +# Template file for 'libnatpmp' +pkgname=libnatpmp +version=20230423 +revision=1 +build_style=gnu-makefile +make_use_env=y +short_desc="Libraries for client side of NAT-PMP" +maintainer="Đoàn Trần Công Danh " +license="BSD-3-Clause" +homepage="http://miniupnp.free.fr/libnatpmp.html" +changelog="http://miniupnp.free.fr/files/changelog.php?file=libnatpmp-${version}.tar.gz" +distfiles="http://miniupnp.free.fr/files/libnatpmp-${version}.tar.gz" +checksum=0684ed2c8406437e7519a1bd20ea83780db871b3a3a5d752311ba3e889dbfc70 + +post_patch() { + sed -i '/^CC =/d' Makefile +} + +do_install() { + make install PREFIX=$DESTDIR + vinstall natpmp_declspec.h 0644 usr/include + vman natpmpc.1 + vlicense LICENSE +} + +libnatpmp-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 5cddec8617412a92df3a31ce54b6a11039192c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 28 Mar 2024 09:20:20 +0700 Subject: [PATCH 3/4] miniupnpc: update to 2.2.7. --- ...x-install-rules-to-account-for-BUILD.patch | 54 ------------------- srcpkgs/miniupnpc/template | 4 +- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/miniupnpc/patches/0001-Makefile-fix-install-rules-to-account-for-BUILD.patch diff --git a/srcpkgs/miniupnpc/patches/0001-Makefile-fix-install-rules-to-account-for-BUILD.patch b/srcpkgs/miniupnpc/patches/0001-Makefile-fix-install-rules-to-account-for-BUILD.patch deleted file mode 100644 index d494aa2a089382..00000000000000 --- a/srcpkgs/miniupnpc/patches/0001-Makefile-fix-install-rules-to-account-for-BUILD.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 29 Sep 2021 08:28:27 +0200 -Subject: [PATCH] Makefile: fix install rules to account for $(BUILD) - -Fix missing references to $(BUILD) in the install rules, as well -as incorrect shared library symlink name. Otherwise, the 'install' -phase fails either being unable to find files: - - make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop. - -or trying to create the symlink in the wrong subdirectory: - - ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory ---- - miniupnpc/Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile -index 4563b28..11a17f9 100644 ---- a/Makefile -+++ b/Makefile -@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig - - FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) - ifeq (, $(findstring amiga, $(OS))) --FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc -+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc - endif - - -@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL) - $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB) - ifeq (, $(findstring amiga, $(OS))) - $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME) -- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY) -+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY)) - $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) -- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR) - endif - $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN) - ifneq (, $(findstring amiga, $(OS))) -- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc - else -- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc -+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc - endif - $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip - ifeq (, $(findstring amiga, $(OS))) --- -2.35.1 - diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template index 4a207b9d2d7805..327ab6f982af6d 100644 --- a/srcpkgs/miniupnpc/template +++ b/srcpkgs/miniupnpc/template @@ -1,6 +1,6 @@ # Template file for 'miniupnpc' pkgname=miniupnpc -version=2.2.3 +version=2.2.7 revision=1 build_style=gnu-makefile make_use_env=y @@ -12,7 +12,7 @@ license="BSD-3-Clause" #changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-${version}.tar.gz" homepage="http://miniupnp.free.fr" distfiles="http://miniupnp.free.fr/files/${pkgname}-${version}.tar.gz" -checksum=dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24 +checksum=b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1 post_install() { vlicense LICENSE From 11eb8024f18f50d795b84ddbb573aa6a87ac781f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 28 Mar 2024 09:20:23 +0700 Subject: [PATCH 4/4] transmission: use system libraries --- srcpkgs/transmission/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 79b402a731dbd6..3185b0eec9015c 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -10,11 +10,10 @@ configure_args=" -DUSE_QT_VERSION=6 -DWITH_SYSTEMD=OFF -DENABLE_MAC=OFF" -hostmakedepends="intltool glib-devel libtool pkg-config qt6-base - qt6-tools" -makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel - libcurl-devel libevent-devel qt6-svg-devel - libdeflate-devel miniupnpc-devel" +hostmakedepends="gettext glib-devel pkg-config qt6-base qt6-tools" +makedepends="dbus-glib-devel gtkmm4-devel glibmm2.68-devel gtk4-devel + libcurl-devel libevent-devel qt6-svg-devel libglvnd-devel libpsl-devel + libdeflate-devel miniupnpc-devel libnatpmp-devel openssl-devel libb64-devel" short_desc="Fast, easy and free BitTorrent client" maintainer="Jason Elswick " license="MIT, GPL-2.0-or-later"