* [PR PATCH] [wip] transmission: build with qt6
@ 2024-03-24 13:48 dkwo
2024-03-24 14:44 ` dkwo
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: dkwo @ 2024-03-24 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 445 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
[wip] transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
I can't figure out how to fix cross compilation with qt6. Any ideas?
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 2128 bytes --]
From 0a874a95d105364c936d4ebff2c9edb5c664d0c6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH] transmission: build withg qt6 WIP broken cross
---
srcpkgs/transmission/template | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 058879644ab1c1..38050cd3e52dcf 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,13 +1,20 @@
# 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"
+build_helper="qemu"
+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"
+# cross: missing linguist-qt6 (linguist-tools)?
makedepends="dbus-glib-devel gtkmm4-devel glibmm-devel
- libcurl-devel libevent-devel qt5-tools-devel qt5-svg-devel
+ libcurl-devel libevent-devel qt6-tools-devel qt6-svg-devel
libdeflate-devel miniupnpc-devel"
short_desc="Fast, easy and free BitTorrent client"
maintainer="Jason Elswick <jason@jasondavid.tv>"
@@ -16,16 +23,9 @@ homepage="https://www.transmissionbt.com"
changelog="https://github.com/transmission/transmission/releases"
distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
-
-# Create transmission system user/group
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [wip] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
@ 2024-03-24 14:44 ` dkwo
2024-03-24 14:54 ` [PR PATCH] [Updated] " dkwo
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-24 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/49505#issuecomment-2016832006
Comment:
for cross:
```
[287/379] Automatic MOC and UIC for target transmission-qt
[288/379] Generating transmission_af.qm
FAILED: qt/transmission_af.qm /builddir/transmission-4.0.5/build/qt/transmission_af.qm
cd /builddir/transmission-4.0.5/build/qt && /usr/aarch64-linux-gnu/usr/lib64/qt6/bin/lrelease -silent /builddir/transmission-4.0.5/qt/translations/transmission_af.ts -qm /builddir/transmission-4.0.5/build/qt/transmission_af.qm
/bin/sh: line 1: /usr/aarch64-linux-gnu/usr/lib64/qt6/bin/lrelease: cannot execute binary file: Exec format error
```
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [wip] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
2024-03-24 14:44 ` dkwo
@ 2024-03-24 14:54 ` dkwo
2024-03-24 20:39 ` [PR REVIEW] " chrysos349
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-24 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
[wip] transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
I can't figure out how to fix cross compilation with qt6. Any ideas?
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 2038 bytes --]
From 86b69b2ca6f4237ebc62b544c43cf4c987a298bf Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH] transmission: build with qt6
---
srcpkgs/transmission/template | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 058879644ab1c1..48b4d808e98c31 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,13 +1,18 @@
# 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-tools-devel qt6-svg-devel
libdeflate-devel miniupnpc-devel"
short_desc="Fast, easy and free BitTorrent client"
maintainer="Jason Elswick <jason@jasondavid.tv>"
@@ -16,16 +21,9 @@ homepage="https://www.transmissionbt.com"
changelog="https://github.com/transmission/transmission/releases"
distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
-
-# Create transmission system user/group
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [wip] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
2024-03-24 14:44 ` dkwo
2024-03-24 14:54 ` [PR PATCH] [Updated] " dkwo
@ 2024-03-24 20:39 ` chrysos349
2024-03-25 1:07 ` dkwo
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: chrysos349 @ 2024-03-24 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/49505#discussion_r1536906879
Comment:
remove `qt6-tools-devel` to fix cross.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [wip] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (2 preceding siblings ...)
2024-03-24 20:39 ` [PR REVIEW] " chrysos349
@ 2024-03-25 1:07 ` dkwo
2024-03-25 1:08 ` [PR PATCH] [Updated] " dkwo
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-25 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/49505#discussion_r1536960740
Comment:
thanks, that worked.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (3 preceding siblings ...)
2024-03-25 1:07 ` dkwo
@ 2024-03-25 1:08 ` dkwo
2024-03-25 14:59 ` [PR REVIEW] " sgn
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-25 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 2031 bytes --]
From b7d15ff1fb80c355d4afca6f77cfdcbd8d494767 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH] transmission: build with qt6
---
srcpkgs/transmission/template | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 058879644ab1c1..7fd78d9d5dc0bc 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-devel"
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 <jason@jasondavid.tv>"
@@ -16,16 +22,9 @@ homepage="https://www.transmissionbt.com"
changelog="https://github.com/transmission/transmission/releases"
distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
-
-# Create transmission system user/group
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (4 preceding siblings ...)
2024-03-25 1:08 ` [PR PATCH] [Updated] " dkwo
@ 2024-03-25 14:59 ` sgn
2024-03-25 17:07 ` dkwo
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-25 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/49505#discussion_r1537737363
Comment:
```suggestion
qt6-tools"
```
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (5 preceding siblings ...)
2024-03-25 14:59 ` [PR REVIEW] " sgn
@ 2024-03-25 17:07 ` dkwo
2024-03-25 17:07 ` [PR PATCH] [Updated] " dkwo
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-25 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New review comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/49505#discussion_r1537934080
Comment:
done, thanks.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (6 preceding siblings ...)
2024-03-25 17:07 ` dkwo
@ 2024-03-25 17:07 ` dkwo
2024-03-25 18:31 ` dkwo
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-25 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 2025 bytes --]
From ca81750a2d308470e680a1d96bc99ba01c7182ad Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH] transmission: build with qt6
---
srcpkgs/transmission/template | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 058879644ab1c1..dd63c4882193a5 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 <jason@jasondavid.tv>"
@@ -16,16 +22,9 @@ homepage="https://www.transmissionbt.com"
changelog="https://github.com/transmission/transmission/releases"
distfiles="https://github.com/transmission/transmission/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357
-
-# Create transmission system user/group
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (7 preceding siblings ...)
2024-03-25 17:07 ` [PR PATCH] [Updated] " dkwo
@ 2024-03-25 18:31 ` dkwo
2024-03-28 2:18 ` sgn
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dkwo @ 2024-03-25 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 1677 bytes --]
From ddfb8e1c78962b36fe79b9b6e547fe2a2eb63290 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH] 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 <jason@jasondavid.tv>"
@@ -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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (8 preceding siblings ...)
2024-03-25 18:31 ` dkwo
@ 2024-03-28 2:18 ` sgn
2024-03-28 2:19 ` sgn
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-28 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 9150 bytes --]
From d85238e8162dedf586cfcb067b300249c2e1c886 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 20 Mar 2024 13:37:48 -0400
Subject: [PATCH 1/4] transmission: build with qt6
Close: #49505
---
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 <jason@jasondavid.tv>"
@@ -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 77e7445c9d360e28eaaaf7884e5d60a07f798240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 10:23:28 +0700
Subject: [PATCH 2/4] New package: libnatpmp-20230423
---
common/shlibs | 1 +
srcpkgs/libnatpmp-devel | 1 +
srcpkgs/libnatpmp/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 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..6194a3ee8d9391
--- /dev/null
+++ b/srcpkgs/libnatpmp/template
@@ -0,0 +1,30 @@
+# 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 <congdanhqx@gmail.com>"
+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
+
+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 9d82bb5ed11bbeb29f7dd9855ce046069313be4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 10:32:28 +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?= <mgorny@gentoo.org>
-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 eae684e0b032c0c7eafa21e3e6c2d492b43051cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 12:49:10 +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 <jason@jasondavid.tv>"
license="MIT, GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (9 preceding siblings ...)
2024-03-28 2:18 ` sgn
@ 2024-03-28 2:19 ` sgn
2024-03-28 2:20 ` sgn
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-28 2:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 9136 bytes --]
From 982d49bd8443077b33279e5b00976a57cd8557f2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
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 <jason@jasondavid.tv>"
@@ -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 f388205aa429952e0047f15eed404651c25376c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 10:23:28 +0700
Subject: [PATCH 2/4] New package: libnatpmp-20230423
---
common/shlibs | 1 +
srcpkgs/libnatpmp-devel | 1 +
srcpkgs/libnatpmp/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 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..6194a3ee8d9391
--- /dev/null
+++ b/srcpkgs/libnatpmp/template
@@ -0,0 +1,30 @@
+# 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 <congdanhqx@gmail.com>"
+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
+
+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 9d84b987e519848555da837e36d18421d8dea51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 10:32:28 +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?= <mgorny@gentoo.org>
-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 04fc4edd986de0b00777c1ce2b4623d38372985f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 26 Mar 2024 12:49:10 +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 <jason@jasondavid.tv>"
license="MIT, GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (10 preceding siblings ...)
2024-03-28 2:19 ` sgn
@ 2024-03-28 2:20 ` sgn
2024-03-28 3:18 ` sgn
2024-03-28 3:58 ` [PR PATCH] [Merged]: " sgn
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-28 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 9136 bytes --]
From 982d49bd8443077b33279e5b00976a57cd8557f2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
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 <jason@jasondavid.tv>"
@@ -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 de784494ae62a0560f07cd6c13118c66f11e40df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 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..6194a3ee8d9391
--- /dev/null
+++ b/srcpkgs/libnatpmp/template
@@ -0,0 +1,30 @@
+# 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 <congdanhqx@gmail.com>"
+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
+
+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 4753b8038d44c6fa0b7e79e7c7754e2c1eddfeb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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?= <mgorny@gentoo.org>
-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 8a09fb453cd4a75b84dbf3d233490cf2cef5e2a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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 <jason@jasondavid.tv>"
license="MIT, GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (11 preceding siblings ...)
2024-03-28 2:20 ` sgn
@ 2024-03-28 3:18 ` sgn
2024-03-28 3:58 ` [PR PATCH] [Merged]: " sgn
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-28 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/dkwo/void-packages trans
https://github.com/void-linux/void-packages/pull/49505
transmission: build with qt6
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/49505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-trans-49505.patch --]
[-- Type: text/x-diff, Size: 9190 bytes --]
From 0fc6c7430103ce45d883c605c8ab03d2ae8ce63b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
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 <jason@jasondavid.tv>"
@@ -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?=
<congdanhqx@gmail.com>
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 <congdanhqx@gmail.com>"
+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?=
<congdanhqx@gmail.com>
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?= <mgorny@gentoo.org>
-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?=
<congdanhqx@gmail.com>
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 <jason@jasondavid.tv>"
license="MIT, GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Merged]: transmission: build with qt6
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
` (12 preceding siblings ...)
2024-03-28 3:18 ` sgn
@ 2024-03-28 3:58 ` sgn
13 siblings, 0 replies; 15+ messages in thread
From: sgn @ 2024-03-28 3:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
There's a merged pull request on the void-packages repository
transmission: build with qt6
https://github.com/void-linux/void-packages/pull/49505
Description:
- I built this PR locally for my native architecture, (x86_64)
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-03-28 3:58 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-24 13:48 [PR PATCH] [wip] transmission: build with qt6 dkwo
2024-03-24 14:44 ` dkwo
2024-03-24 14:54 ` [PR PATCH] [Updated] " dkwo
2024-03-24 20:39 ` [PR REVIEW] " chrysos349
2024-03-25 1:07 ` dkwo
2024-03-25 1:08 ` [PR PATCH] [Updated] " dkwo
2024-03-25 14:59 ` [PR REVIEW] " sgn
2024-03-25 17:07 ` dkwo
2024-03-25 17:07 ` [PR PATCH] [Updated] " dkwo
2024-03-25 18:31 ` dkwo
2024-03-28 2:18 ` sgn
2024-03-28 2:19 ` sgn
2024-03-28 2:20 ` sgn
2024-03-28 3:18 ` sgn
2024-03-28 3:58 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).