Friday, March 10, 2023

Re: [update] net/transmission 4.0.1 - work in progress

On Fri, Mar 10, 2023 at 03:09:42PM +0000, Klemens Nanni wrote:
[snip]
> Here is a diff using cmake, qt6 and gtk4 as per upstream defaults.
> Above mentioned cmake issues should be mentioned upstream.
> The one new local patch is trivial, free PR for anyone taking their time.
>
> Both gtk and qt run fine on amd64 for me.

Thank you for your diff!

1. I needed to add a BUILD_DEPENDS for x11/qt6/qttools to complete the
qt configure step; it wasn't pre-installed on my build system when I began.

2. transmission-gtk now produces a locale warning here. I'm not sure how
to correct it as I'm one of those en_US.UTF-8 users who never pays any
attention to locale -- until something like this happens and then I just
stare at the screen with a slack-jawed gaze.

** (transmission-gtk:32822): WARNING **: 14:20:24.974: Can't make the global C++ locale equal to the C locale.
collate_byname<char>::collate_byname failed to construct for C/en_US.UTF-8/C/C/C/C
C locale = C/en_US.UTF-8/C/C/C/C

I have some additional minor changes to your Makefile:

* the BDEP noted above
* 2 lines of WANTLIB-qt per port-lib-depends-check
* RDEP adds and deletes according to portcheck(1)
* MASTER_SITES over 2 lines to fit within 80 chars, per portcheck().

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index ae7a342a6b4..6c384373071 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -14,7 +14,8 @@ MAINTAINER= Josh Grosse <josh@jggimi.net>
# GPLv2+
PERMIT_PACKAGE= Yes

-MASTER_SITES= https://github.com/transmission/transmission/releases/download/${VER}/
+MASTER_SITES= \
+ https://github.com/transmission/transmission/releases/download/${VER}/
EXTRACT_SUFX= .tar.xz

MULTI_PACKAGES= -main -gtk -qt
@@ -22,7 +23,6 @@ MULTI_PACKAGES= -main -gtk -qt
# gnu++17
COMPILER = base-clang ports-gcc

-
PSEUDO_FLAVORS= no_gtk no_qt
FLAVOR?=

@@ -38,12 +38,13 @@ WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 pangocairo-1.0
WANTLIB-gtk += pangomm-2.48 sigc-3.0

WANTLIB-qt += GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg Qt6Widgets
+WANTLIB-qt += ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp
+WANTLIB-qt += psl ssl

MODULES = devel/cmake \
textproc/intltool

-LIB_DEPENDS-common=devel/gettext,-runtime \
- net/curl \
+LIB_DEPENDS-common=net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
@@ -57,6 +58,7 @@ LIB_DEPENDS-qt= ${LIB_DEPENDS-common} \

RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
+ x11/gtk+3,-guic \
x11/gtk+4,-guic
RUN_DEPENDS-qt= ${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
@@ -80,6 +82,7 @@ MODULES += x11/qt6
# XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
CONFIGURE_ARGS += -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
+BUILD_DEPENDS+= x11/qt6/qttools
.else
CONFIGURE_ARGS += -DENABLE_QT=OFF
.endif

No comments:

Post a Comment