CVS commit: pkgsrc/x11/libqtxdg

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Fri Aug  2 16:54:22 UTC 2024

Modified Files:
        pkgsrc/x11/libqtxdg: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/x11/libqtxdg/patches: patch-CMakeLists.txt

Log Message:
x11/libqtxdg: update to 4.0.0

The library is ported to Qt6, such that the Qt5-based version 3.12.0 can be
installed alongside it for supporting Qt5-based apps. Also,

 - Considered the EV XDG_CURRENT_DESKTOP as a colon-separated list.
 - Fixed an FTBFS with BUILD_DEV_UTILS enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/libqtxdg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libqtxdg/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/libqtxdg/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libqtxdg/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libqtxdg/Makefile
diff -u pkgsrc/x11/libqtxdg/Makefile:1.34 pkgsrc/x11/libqtxdg/Makefile:1.35
--- pkgsrc/x11/libqtxdg/Makefile:1.34   Wed May 29 16:35:06 2024
+++ pkgsrc/x11/libqtxdg/Makefile        Fri Aug  2 16:54:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2024/05/29 16:35:06 adam Exp $
+# $NetBSD: Makefile,v 1.35 2024/08/02 16:54:22 pin Exp $
 
-DISTNAME=      libqtxdg-3.12.0
-PKGREVISION=   3
+DISTNAME=      libqtxdg-4.0.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -16,9 +15,6 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
-
 QTXDG_CONF=            share/lxqt
 PKG_SYSCONFSUBDIR=     xdg
 
@@ -36,11 +32,8 @@ CONF_FILES+= ${QTXDG_CONF}/qtxdg.conf \
 
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fuse-linker-plugin
 
-pre-configure:
-       ${MKDIR} -p ${WRKSRC}/build
-
-TOOL_DEPENDS+= lxqt-build-tools>=0.13.0:../../devel/lxqt-build-tools
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+TOOL_DEPENDS+= lxqt-build-tools>=2.0.0:../../devel/lxqt-build-tools
+TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
@@ -48,6 +41,7 @@ DEPENDS+=     {xterm,mxterm}-[0-9]*:../../x1
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/libqtxdg/PLIST
diff -u pkgsrc/x11/libqtxdg/PLIST:1.5 pkgsrc/x11/libqtxdg/PLIST:1.6
--- pkgsrc/x11/libqtxdg/PLIST:1.5       Wed May 11 00:30:42 2022
+++ pkgsrc/x11/libqtxdg/PLIST   Fri Aug  2 16:54:22 2024
@@ -1,45 +1,45 @@
-@comment $NetBSD: PLIST,v 1.5 2022/05/11 00:30:42 gutteridge Exp $
-include/qt5xdg/XdgAction
-include/qt5xdg/XdgAutoStart
-include/qt5xdg/XdgDefaultApps
-include/qt5xdg/XdgDesktopFile
-include/qt5xdg/XdgDirs
-include/qt5xdg/XdgIcon
-include/qt5xdg/XdgMenu
-include/qt5xdg/XdgMenuWidget
-include/qt5xdg/XdgMimeApps
-include/qt5xdg/XdgMimeType
-include/qt5xdg/XmlHelper
-include/qt5xdg/xdgaction.h
-include/qt5xdg/xdgautostart.h
-include/qt5xdg/xdgdefaultapps.h
-include/qt5xdg/xdgdesktopfile.h
-include/qt5xdg/xdgdirs.h
-include/qt5xdg/xdgicon.h
-include/qt5xdg/xdgmacros.h
-include/qt5xdg/xdgmenu.h
-include/qt5xdg/xdgmenuwidget.h
-include/qt5xdg/xdgmimeapps.h
-include/qt5xdg/xdgmimetype.h
-include/qt5xdg/xmlhelper.h
-include/qt5xdgiconloader/${PKGVERSION}/private/xdgiconloader/xdgiconloader_p.h
-include/qt5xdgiconloader/xdgiconloader_export.h
-lib/libQt5Xdg.so
-lib/libQt5Xdg.so.3
-lib/libQt5Xdg.so.${PKGVERSION}
-lib/libQt5XdgIconLoader.so
-lib/libQt5XdgIconLoader.so.3
-lib/libQt5XdgIconLoader.so.${PKGVERSION}
-lib/pkgconfig/Qt5Xdg.pc
-lib/pkgconfig/Qt5XdgIconLoader.pc
-qt5/plugins/iconengines/libQt5XdgIconPlugin.so
-share/cmake/qt5xdg/qt5xdg-config-version.cmake
-share/cmake/qt5xdg/qt5xdg-config.cmake
-share/cmake/qt5xdg/qt5xdg-targets-release.cmake
-share/cmake/qt5xdg/qt5xdg-targets.cmake
-share/cmake/qt5xdgiconloader/qt5xdgiconloader-config-version.cmake
-share/cmake/qt5xdgiconloader/qt5xdgiconloader-config.cmake
-share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets-release.cmake
-share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets.cmake
+@comment $NetBSD: PLIST,v 1.6 2024/08/02 16:54:22 pin Exp $
+include/qt6xdg/XdgAction
+include/qt6xdg/XdgAutoStart
+include/qt6xdg/XdgDefaultApps
+include/qt6xdg/XdgDesktopFile
+include/qt6xdg/XdgDirs
+include/qt6xdg/XdgIcon
+include/qt6xdg/XdgMenu
+include/qt6xdg/XdgMenuWidget
+include/qt6xdg/XdgMimeApps
+include/qt6xdg/XdgMimeType
+include/qt6xdg/XmlHelper
+include/qt6xdg/xdgaction.h
+include/qt6xdg/xdgautostart.h
+include/qt6xdg/xdgdefaultapps.h
+include/qt6xdg/xdgdesktopfile.h
+include/qt6xdg/xdgdirs.h
+include/qt6xdg/xdgicon.h
+include/qt6xdg/xdgmacros.h
+include/qt6xdg/xdgmenu.h
+include/qt6xdg/xdgmenuwidget.h
+include/qt6xdg/xdgmimeapps.h
+include/qt6xdg/xdgmimetype.h
+include/qt6xdg/xmlhelper.h
+include/qt6xdgiconloader/${PKGVERSION}/private/xdgiconloader/xdgiconloader_p.h
+include/qt6xdgiconloader/xdgiconloader_export.h
+lib/libQt6Xdg.so
+lib/libQt6Xdg.so.4
+lib/libQt6Xdg.so.${PKGVERSION}
+lib/libQt6XdgIconLoader.so
+lib/libQt6XdgIconLoader.so.4
+lib/libQt6XdgIconLoader.so.${PKGVERSION}
+lib/pkgconfig/Qt6Xdg.pc
+lib/pkgconfig/Qt6XdgIconLoader.pc
+qt6/plugins/iconengines/libQt6XdgIconPlugin.so
+share/cmake/qt6xdg/qt6xdg-config-version.cmake
+share/cmake/qt6xdg/qt6xdg-config.cmake
+share/cmake/qt6xdg/qt6xdg-targets-release.cmake
+share/cmake/qt6xdg/qt6xdg-targets.cmake
+share/cmake/qt6xdgiconloader/qt6xdgiconloader-config-version.cmake
+share/cmake/qt6xdgiconloader/qt6xdgiconloader-config.cmake
+share/cmake/qt6xdgiconloader/qt6xdgiconloader-targets-release.cmake
+share/cmake/qt6xdgiconloader/qt6xdgiconloader-targets.cmake
 share/lxqt/lxqt-qtxdg.conf
 share/lxqt/qtxdg.conf

Index: pkgsrc/x11/libqtxdg/buildlink3.mk
diff -u pkgsrc/x11/libqtxdg/buildlink3.mk:1.27 pkgsrc/x11/libqtxdg/buildlink3.mk:1.28
--- pkgsrc/x11/libqtxdg/buildlink3.mk:1.27      Sat Apr  6 08:07:03 2024
+++ pkgsrc/x11/libqtxdg/buildlink3.mk   Fri Aug  2 16:54:22 2024
@@ -1,17 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.27 2024/04/06 08:07:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2024/08/02 16:54:22 pin Exp $
 
 BUILDLINK_TREE+=       libqtxdg
 
 .if !defined(LIBQTXDG_BUILDLINK3_MK)
 LIBQTXDG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libqtxdg+=       libqtxdg>=3.11.0
-BUILDLINK_ABI_DEPENDS.libqtxdg?=               libqtxdg>=3.12.0nb2
+BUILDLINK_API_DEPENDS.libqtxdg+=       libqtxdg>=4.0.0
 BUILDLINK_PKGSRCDIR.libqtxdg?=         ../../x11/libqtxdg
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
 .endif # LIBQTXDG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libqtxdg

Index: pkgsrc/x11/libqtxdg/distinfo
diff -u pkgsrc/x11/libqtxdg/distinfo:1.12 pkgsrc/x11/libqtxdg/distinfo:1.13
--- pkgsrc/x11/libqtxdg/distinfo:1.12   Thu Nov  9 03:26:34 2023
+++ pkgsrc/x11/libqtxdg/distinfo        Fri Aug  2 16:54:22 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2023/11/09 03:26:34 gutteridge Exp $
+$NetBSD: distinfo,v 1.13 2024/08/02 16:54:22 pin Exp $
 
-BLAKE2s (libqtxdg-3.12.0.tar.xz) = 138404cdeb342eb977a9c188ef68a1c5794d12e757ce8ce988ad7c00242e7e19
-SHA512 (libqtxdg-3.12.0.tar.xz) = 9db46b0dddb027a24e1c19a2e3679014735cc246f15d32bc5fb9e778cd7d8fb57c9b105f819091308002f0a2eff8269920ecc0d7bd5ce8a01fbaf0b37e61a76e
-Size (libqtxdg-3.12.0.tar.xz) = 71684 bytes
-SHA1 (patch-CMakeLists.txt) = 9935490d2250041107499df3a2324c6478922e5f
+BLAKE2s (libqtxdg-4.0.0.tar.xz) = af4e6dec46b35a6271f133ec98425110d0e661adac4b1b43ad8ce2da0a96fc60
+SHA512 (libqtxdg-4.0.0.tar.xz) = 4a8a32968e74ed54d700cf65c9cfb238001f58d93a9e374e18d60023615d6277f80459dd8477205ce31a6d8caf798cde70b91681df80b1bff3b754e0586868d2
+Size (libqtxdg-4.0.0.tar.xz) = 71508 bytes
+SHA1 (patch-CMakeLists.txt) = 62a8164883471f77dcef08160c0eabf6348b5a2e

Index: pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt
diff -u pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt:1.1 pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt:1.1        Wed May 11 00:30:42 2022
+++ pkgsrc/x11/libqtxdg/patches/patch-CMakeLists.txt    Fri Aug  2 16:54:22 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2022/05/11 00:30:42 gutteridge Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/08/02 16:54:22 pin Exp $
 
 Install config files to pkgsrc standard location.
 
---- CMakeLists.txt.orig        2022-05-10 19:59:47.077468288 +0000
+--- CMakeLists.txt.orig        2024-05-27 07:57:49.656959023 +0000
 +++ CMakeLists.txt
 @@ -68,7 +68,7 @@ message(STATUS "Building ${PROJECT_NAME}
  if (QTXDG_INSTALL_DEFAPPS_CONFIG)