CVS commit: pkgsrc

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Dec  1 21:26:00 UTC 2022

Modified Files:
        pkgsrc/devel: Makefile
        pkgsrc/meta-pkgs/qt6: Makefile
        pkgsrc/x11/qt6-qtbase: Makefile.common
Added Files:
        pkgsrc/devel/qt6-qt5compat: DESCR Makefile PLIST buildlink3.mk distinfo

Log Message:
Add qt6-qt5compat version 6.4.1 to pkgsrc-current

Qt6 module that includes Qt5 core API:s that have been removed in Qt6,
Qt5 applications can be ported to Qt6 more easily using this module.


To generate a diff of this commit:
cvs rdiff -u -r1.3840 -r1.3841 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/qt6-qt5compat/DESCR \
    pkgsrc/devel/qt6-qt5compat/Makefile pkgsrc/devel/qt6-qt5compat/PLIST \
    pkgsrc/devel/qt6-qt5compat/buildlink3.mk \
    pkgsrc/devel/qt6-qt5compat/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/meta-pkgs/qt6/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt6-qtbase/Makefile.common

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

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.3840 pkgsrc/devel/Makefile:1.3841
--- pkgsrc/devel/Makefile:1.3840        Thu Dec  1 12:47:40 2022
+++ pkgsrc/devel/Makefile       Thu Dec  1 21:26:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3840 2022/12/01 12:47:40 prlw1 Exp $
+# $NetBSD: Makefile,v 1.3841 2022/12/01 21:26:00 nros Exp $
 #
 
 COMMENT=       Development utilities
@@ -2985,6 +2985,7 @@ SUBDIR+=  pythontidy
 SUBDIR+=       qconf
 SUBDIR+=       qjson
 SUBDIR+=       qore-uuid-module
+SUBDIR+=       qt6-qt5compat
 SUBDIR+=       qt6-qttools
 SUBDIR+=       qtscriptgenerator
 SUBDIR+=       quilt

Index: pkgsrc/meta-pkgs/qt6/Makefile
diff -u pkgsrc/meta-pkgs/qt6/Makefile:1.23 pkgsrc/meta-pkgs/qt6/Makefile:1.24
--- pkgsrc/meta-pkgs/qt6/Makefile:1.23  Wed Nov 30 20:57:36 2022
+++ pkgsrc/meta-pkgs/qt6/Makefile       Thu Dec  1 21:26:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/11/30 20:57:36 nros Exp $
+# $NetBSD: Makefile,v 1.24 2022/12/01 21:26:00 nros Exp $
 
 DISTNAME=      qt6-${QTVERSION}
 
@@ -33,5 +33,6 @@ DEPENDS+=     qt6-qtspeech-${QTVERSION}{,nb[
 DEPENDS+=      qt6-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../www/qt6-qtwebchannel
 DEPENDS+=      qt6-qthttpserver-${QTVERSION}{,nb[0-9]*}:../../www/qt6-qthttpserver
 DEPENDS+=      qt6-qttools-${QTVERSION}{,nb[0-9]*}:../../devel/qt6-qttools
+DEPENDS+=      qt6-qt5compat-${QTVERSION}{,nb[0-9]*}:../../devel/qt6-qt5compat
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt6-qtbase/Makefile.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.24 pkgsrc/x11/qt6-qtbase/Makefile.common:1.25
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.24  Wed Nov 30 20:57:36 2022
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Thu Dec  1 21:26:00 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2022/11/30 20:57:36 nros Exp $
+# $NetBSD: Makefile.common,v 1.25 2022/12/01 21:26:00 nros Exp $
 # used by audio/qt6-qtspeech/Makefile
 # used by databases/qt6-odbc/Makefile
 # used by databases/qt6-psql/Makefile
+# used by devel/qt6-qt5compat/Makefile
 # used by devel/qt6-qttools/Makefile
 # used by graphics/qt6-qt3d/Makefile
 # used by graphics/qt6-qtcharts/Makefile

Added files:

Index: pkgsrc/devel/qt6-qt5compat/DESCR
diff -u /dev/null pkgsrc/devel/qt6-qt5compat/DESCR:1.1
--- /dev/null   Thu Dec  1 21:26:01 2022
+++ pkgsrc/devel/qt6-qt5compat/DESCR    Thu Dec  1 21:26:00 2022
@@ -0,0 +1,2 @@
+Qt6 module that includes Qt5 core API:s that have been removed in Qt6,
+Qt5 applications can be ported to Qt6 more easily using this module.
Index: pkgsrc/devel/qt6-qt5compat/Makefile
diff -u /dev/null pkgsrc/devel/qt6-qt5compat/Makefile:1.1
--- /dev/null   Thu Dec  1 21:26:01 2022
+++ pkgsrc/devel/qt6-qt5compat/Makefile Thu Dec  1 21:26:00 2022
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2022/12/01 21:26:00 nros Exp $
+
+DISTNAME=      qt5compat-everywhere-src-${QTVERSION}
+PKGNAME=       qt6-qt5compat-${QTVERSION}
+COMMENT=       Qt6 module for Qt5 portability
+CATEGORIES=    devel x11
+
+LICENSE=       gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
+
+.include "../../x11/qt6-qtbase/Makefile.common"
+
+PKGCONFIG_OVERRIDE+=   lib/pkgconfig/Qt6Core5Compat.pc
+
+.include "../../graphics/qt6-qtshadertools/buildlink3.mk"
+.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/qt6-qt5compat/PLIST
diff -u /dev/null pkgsrc/devel/qt6-qt5compat/PLIST:1.1
--- /dev/null   Thu Dec  1 21:26:01 2022
+++ pkgsrc/devel/qt6-qt5compat/PLIST    Thu Dec  1 21:26:00 2022
@@ -0,0 +1,131 @@
+@comment $NetBSD: PLIST,v 1.1 2022/12/01 21:26:00 nros Exp $
+lib/pkgconfig/Qt6Core5Compat.pc
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/cp949codetbl_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbig5codec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbinaryjson_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbinaryjsonarray_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbinaryjsonobject_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qbinaryjsonvalue_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qeucjpcodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qeuckrcodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qgb18030codec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qiconvcodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qicucodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qisciicodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qjiscodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qjpunicode_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qlatincodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qsimplecodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qsjiscodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qtcore5compat-config_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qtextcodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qtsciicodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qutfcodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qwindowscodec_p.h
+qt6/include/QtCore5Compat/${PKGVERSION}/QtCore5Compat/private/qxml_p.h
+qt6/include/QtCore5Compat/QBinaryJson
+qt6/include/QtCore5Compat/QConcatenable
+qt6/include/QtCore5Compat/QLinkedList
+qt6/include/QtCore5Compat/QLinkedListData
+qt6/include/QtCore5Compat/QLinkedListIterator
+qt6/include/QtCore5Compat/QLinkedListNode
+qt6/include/QtCore5Compat/QMutableLinkedListIterator
+qt6/include/QtCore5Compat/QRegExp
+qt6/include/QtCore5Compat/QStringRef
+qt6/include/QtCore5Compat/QTextCodec
+qt6/include/QtCore5Compat/QTextDecoder
+qt6/include/QtCore5Compat/QTextEncoder
+qt6/include/QtCore5Compat/QXmlAttributes
+qt6/include/QtCore5Compat/QXmlContentHandler
+qt6/include/QtCore5Compat/QXmlDTDHandler
+qt6/include/QtCore5Compat/QXmlDeclHandler
+qt6/include/QtCore5Compat/QXmlDefaultHandler
+qt6/include/QtCore5Compat/QXmlEntityResolver
+qt6/include/QtCore5Compat/QXmlErrorHandler
+qt6/include/QtCore5Compat/QXmlInputSource
+qt6/include/QtCore5Compat/QXmlLexicalHandler
+qt6/include/QtCore5Compat/QXmlLocator
+qt6/include/QtCore5Compat/QXmlNamespaceSupport
+qt6/include/QtCore5Compat/QXmlParseException
+qt6/include/QtCore5Compat/QXmlReader
+qt6/include/QtCore5Compat/QXmlSimpleReader
+qt6/include/QtCore5Compat/QtCore5Compat
+qt6/include/QtCore5Compat/QtCore5CompatDepends
+qt6/include/QtCore5Compat/QtCore5CompatVersion
+qt6/include/QtCore5Compat/qbinaryjson.h
+qt6/include/QtCore5Compat/qcore5global.h
+qt6/include/QtCore5Compat/qlinkedlist.h
+qt6/include/QtCore5Compat/qregexp.h
+qt6/include/QtCore5Compat/qstringref.h
+qt6/include/QtCore5Compat/qtcore5compat-config.h
+qt6/include/QtCore5Compat/qtcore5compatversion.h
+qt6/include/QtCore5Compat/qtextcodec.h
+qt6/include/QtCore5Compat/qxml.h
+qt6/lib/cmake/Qt6/FindWrapIconv.cmake
+qt6/lib/cmake/Qt6BuildInternals/StandaloneTests/Qt5CompatTestsConfig.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfig.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfigVersion.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatDependencies.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets-release.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatTargets.cmake
+qt6/lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfig.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginTargets-release.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspluginTargets.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfig.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfigVersion.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets-release.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake
+qt6/lib/libQt6Core5Compat.prl
+qt6/lib/libQt6Core5Compat.so
+qt6/lib/libQt6Core5Compat.so.6
+qt6/lib/libQt6Core5Compat.so.${PKGVERSION}
+qt6/lib/metatypes/qt6core5compat_release_metatypes.json
+qt6/lib/pkgconfig/Qt6Core5Compat.pc
+qt6/mkspecs/modules/qt_lib_core5compat.pri
+qt6/mkspecs/modules/qt_lib_core5compat_private.pri
+qt6/modules/Core5Compat.json
+qt6/qml/Qt5Compat/GraphicalEffects/Blend.qml
+qt6/qml/Qt5Compat/GraphicalEffects/BrightnessContrast.qml
+qt6/qml/Qt5Compat/GraphicalEffects/ColorOverlay.qml
+qt6/qml/Qt5Compat/GraphicalEffects/Colorize.qml
+qt6/qml/Qt5Compat/GraphicalEffects/ConicalGradient.qml
+qt6/qml/Qt5Compat/GraphicalEffects/Desaturate.qml
+qt6/qml/Qt5Compat/GraphicalEffects/DirectionalBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/Displace.qml
+qt6/qml/Qt5Compat/GraphicalEffects/DropShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/FastBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/GammaAdjust.qml
+qt6/qml/Qt5Compat/GraphicalEffects/GaussianBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/Glow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/HueSaturation.qml
+qt6/qml/Qt5Compat/GraphicalEffects/InnerShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/LevelAdjust.qml
+qt6/qml/Qt5Compat/GraphicalEffects/LinearGradient.qml
+qt6/qml/Qt5Compat/GraphicalEffects/MaskedBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/OpacityMask.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RadialBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RadialGradient.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RectangularGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/RecursiveBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/ThresholdMask.qml
+qt6/qml/Qt5Compat/GraphicalEffects/ZoomBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/libqtgraphicaleffectsplugin.so
+qt6/qml/Qt5Compat/GraphicalEffects/plugins.qmltypes
+qt6/qml/Qt5Compat/GraphicalEffects/private/DropShadowBase.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/FastGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/FastInnerShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianDirectionalBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianGlow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianInnerShadow.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianMaskedBlur.qml
+qt6/qml/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
+qt6/qml/Qt5Compat/GraphicalEffects/private/qmldir
+qt6/qml/Qt5Compat/GraphicalEffects/qmldir
Index: pkgsrc/devel/qt6-qt5compat/buildlink3.mk
diff -u /dev/null pkgsrc/devel/qt6-qt5compat/buildlink3.mk:1.1
--- /dev/null   Thu Dec  1 21:26:01 2022
+++ pkgsrc/devel/qt6-qt5compat/buildlink3.mk    Thu Dec  1 21:26:00 2022
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/12/01 21:26:00 nros Exp $
+
+BUILDLINK_TREE+=       qt6-qt5compat
+
+.if !defined(QT6_QT5COMPAT_BUILDLINK3_MK)
+QT6_QT5COMPAT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qt6-qt5compat+=  qt6-qt5compat>=6.4.1
+BUILDLINK_PKGSRCDIR.qt6-qt5compat?=    ../../devel/qt6-qt5compat
+
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif # QT6_QT5COMPAT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -qt6-qt5compat
Index: pkgsrc/devel/qt6-qt5compat/distinfo
diff -u /dev/null pkgsrc/devel/qt6-qt5compat/distinfo:1.1
--- /dev/null   Thu Dec  1 21:26:01 2022
+++ pkgsrc/devel/qt6-qt5compat/distinfo Thu Dec  1 21:26:00 2022
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/12/01 21:26:00 nros Exp $
+
+BLAKE2s (qt5compat-everywhere-src-6.4.1.tar.xz) = fa03d290c0a83caf01ac44eb5bea4bcb5a92dcc2910430877fb10dc56f4c4dc7
+SHA512 (qt5compat-everywhere-src-6.4.1.tar.xz) = b858e9c9a756e598a5d56be7bc59e1e2814ff1ef15ed69e29b3a840263ce99a2ce6931dfb9e9f7c6ff90f074abe07208188e0a8929acf2632623931c5183769b
+Size (qt5compat-everywhere-src-6.4.1.tar.xz) = 14637884 bytes