Mon May 8 01:31:09 2023 UTC ()
Drop now redundant SunOS build fixes for LXQt components

This was fixed differently (more generally) in lxqt-build-tools by
jperkin@. (libqtxdg does still pass "-fuse-linker-plugin" locally.)


(gutteridge)
diff -r1.28 -r1.29 pkgsrc/x11/libfm-qt/Makefile
diff -r1.28 -r1.29 pkgsrc/x11/liblxqt/Makefile
diff -r1.26 -r1.27 pkgsrc/x11/libqtxdg/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/x11/libfm-qt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libfm-qt/Makefile 2023/04/19 08:08:54 1.28
+++ pkgsrc/x11/libfm-qt/Makefile 2023/05/08 01:31:09 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2023/04/19 08:08:54 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2023/05/08 01:31:09 gutteridge Exp $
2 2
3DISTNAME= libfm-qt-1.3.0 3DISTNAME= libfm-qt-1.3.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/lxqt/libfm-qt/ 11HOMEPAGE= https://github.com/lxqt/libfm-qt/
12COMMENT= Core library of PCManFM-Qt 12COMMENT= Core library of PCManFM-Qt
13LICENSE= gnu-lgpl-v2.1 AND modified-bsd 13LICENSE= gnu-lgpl-v2.1 AND modified-bsd
14 14
@@ -27,21 +27,18 @@ SUBST_CLASSES+= prefix @@ -27,21 +27,18 @@ SUBST_CLASSES+= prefix
27SUBST_MESSAGE.prefix= Fixing paths. 27SUBST_MESSAGE.prefix= Fixing paths.
28SUBST_STAGE.prefix= pre-configure 28SUBST_STAGE.prefix= pre-configure
29SUBST_FILES.prefix= src/core/fileinfo.cpp 29SUBST_FILES.prefix= src/core/fileinfo.cpp
30SUBST_FILES.prefix+= src/core/vfs/vfs-menu.c 30SUBST_FILES.prefix+= src/core/vfs/vfs-menu.c
31SUBST_SED.prefix= -e 's,/etc/xdg,${PKG_SYSCONFDIR},g' 31SUBST_SED.prefix= -e 's,/etc/xdg,${PKG_SYSCONFDIR},g'
32SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g' 32SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g'
33 33
34pre-configure: 34pre-configure:
35 ${MKDIR} -p ${WRKSRC}/build 35 ${MKDIR} -p ${WRKSRC}/build
36 36
37TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools 37TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools
38TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools 38TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
39 39
40BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions 
41BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic 
42 
43.include "../../x11/qt5-qtbase/buildlink3.mk" 40.include "../../x11/qt5-qtbase/buildlink3.mk"
44.include "../../x11/qt5-qtx11extras/buildlink3.mk" 41.include "../../x11/qt5-qtx11extras/buildlink3.mk"
45.include "../../graphics/libexif/buildlink3.mk" 42.include "../../graphics/libexif/buildlink3.mk"
46.include "../../sysutils/menu-cache/buildlink3.mk" 43.include "../../sysutils/menu-cache/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/x11/liblxqt/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/liblxqt/Makefile 2023/04/19 08:08:55 1.28
+++ pkgsrc/x11/liblxqt/Makefile 2023/05/08 01:31:09 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2023/04/19 08:08:55 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2023/05/08 01:31:09 gutteridge Exp $
2 2
3DISTNAME= liblxqt-1.3.0 3DISTNAME= liblxqt-1.3.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/lxqt/liblxqt/ 11HOMEPAGE= https://github.com/lxqt/liblxqt/
12COMMENT= Core utility library for all LXQt components 12COMMENT= Core utility library for all LXQt components
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -16,22 +16,21 @@ USE_CMAKE= yes @@ -16,22 +16,21 @@ USE_CMAKE= yes
16USE_TOOLS+= pkg-config perl 16USE_TOOLS+= pkg-config perl
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18 18
19CONFIGURE_DIRS= build 19CONFIGURE_DIRS= build
20CMAKE_ARG_PATH= .. 20CMAKE_ARG_PATH= ..
21 21
22pre-configure: 22pre-configure:
23 ${MKDIR} -p ${WRKSRC}/build 23 ${MKDIR} -p ${WRKSRC}/build
24 24
25TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools 25TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools
26TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools 26TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
27 27
28LDFLAGS.SunOS+= -lsocket 28LDFLAGS.SunOS+= -lsocket
29BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions 
30 29
31.include "../../x11/qt5-qtbase/buildlink3.mk" 30.include "../../x11/qt5-qtbase/buildlink3.mk"
32.include "../../x11/qt5-qtx11extras/buildlink3.mk" 31.include "../../x11/qt5-qtx11extras/buildlink3.mk"
33.include "../../x11/kwindowsystem/buildlink3.mk" 32.include "../../x11/kwindowsystem/buildlink3.mk"
34.include "../../x11/libqtxdg/buildlink3.mk" 33.include "../../x11/libqtxdg/buildlink3.mk"
35.include "../../x11/libXScrnSaver/buildlink3.mk" 34.include "../../x11/libXScrnSaver/buildlink3.mk"
36.include "../../security/polkit-qt5/buildlink3.mk" 35.include "../../security/polkit-qt5/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/x11/libqtxdg/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libqtxdg/Makefile 2023/04/19 08:08:55 1.26
+++ pkgsrc/x11/libqtxdg/Makefile 2023/05/08 01:31:09 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2023/04/19 08:08:55 adam Exp $ 1# $NetBSD: Makefile,v 1.27 2023/05/08 01:31:09 gutteridge Exp $
2 2
3DISTNAME= libqtxdg-3.11.0 3DISTNAME= libqtxdg-3.11.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/lxqt/libqtxdg/ 11HOMEPAGE= https://github.com/lxqt/libqtxdg/
12COMMENT= Qt implementation of freedesktop.org xdg specs 12COMMENT= Qt implementation of freedesktop.org xdg specs
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -24,28 +24,26 @@ PKG_SYSCONFSUBDIR= xdg @@ -24,28 +24,26 @@ PKG_SYSCONFSUBDIR= xdg
24 24
25SUBST_CLASSES+= prefix 25SUBST_CLASSES+= prefix
26SUBST_MESSAGE.prefix= Fixing paths. 26SUBST_MESSAGE.prefix= Fixing paths.
27SUBST_STAGE.prefix= pre-configure 27SUBST_STAGE.prefix= pre-configure
28SUBST_FILES.prefix= src/qtxdg/xdgdirs.cpp 28SUBST_FILES.prefix= src/qtxdg/xdgdirs.cpp
29SUBST_SED.prefix= -e 's,/etc/xdg,${PKG_SYSCONFDIR},g' 29SUBST_SED.prefix= -e 's,/etc/xdg,${PKG_SYSCONFDIR},g'
30SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g' 30SUBST_SED.prefix+= -e 's,/usr/share,${PREFIX}/share,g'
31 31
32CONF_FILES= ${QTXDG_CONF}/lxqt-qtxdg.conf \ 32CONF_FILES= ${QTXDG_CONF}/lxqt-qtxdg.conf \
33 ${PKG_SYSCONFDIR}/lxqt-qtxdg.conf 33 ${PKG_SYSCONFDIR}/lxqt-qtxdg.conf
34CONF_FILES+= ${QTXDG_CONF}/qtxdg.conf \ 34CONF_FILES+= ${QTXDG_CONF}/qtxdg.conf \
35 ${PKG_SYSCONFDIR}/qtxdg.conf 35 ${PKG_SYSCONFDIR}/qtxdg.conf
36 36
37BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic 
38BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-Bsymbolic-functions 
39BUILDLINK_TRANSFORM.SunOS+= rm:-fuse-linker-plugin 37BUILDLINK_TRANSFORM.SunOS+= rm:-fuse-linker-plugin
40 38
41pre-configure: 39pre-configure:
42 ${MKDIR} -p ${WRKSRC}/build 40 ${MKDIR} -p ${WRKSRC}/build
43 41
44TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools 42TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools
45TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools 43TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
46 44
47.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
48.if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular" 46.if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
49DEPENDS+= {xterm,mxterm}-[0-9]*:../../x11/xterm 47DEPENDS+= {xterm,mxterm}-[0-9]*:../../x11/xterm
50.endif 48.endif
51 49