Mon Apr 3 20:16:46 2023 UTC ()
Use double-conversion and md4c as dependecies for qt5-qtbase

Unbundle double-conversion and md4c when building qt5-qtbase.
Remove patch for bundled doubleconversion.
Bump pkgrevision.
Bump ABI revision.


(nros)
diff -r1.127 -r1.128 pkgsrc/x11/qt5-qtbase/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/buildlink3.mk
diff -r1.74 -r1.75 pkgsrc/x11/qt5-qtbase/distinfo
diff -r1.1 -r0 pkgsrc/x11/qt5-qtbase/patches/patch-src_3rdparty_double-conversion_include_double-conversion_utils.h
cvs diff -r1.127 -r1.128 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2023/01/29 21:15:15 1.127
+++ pkgsrc/x11/qt5-qtbase/Makefile 2023/04/03 20:16:46 1.128
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.127 2023/01/29 21:15:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.128 2023/04/03 20:16:46 nros Exp $
2 2
3DISTNAME= qtbase-everywhere-opensource-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-opensource-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 1 5PKGREVISION= 2
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
11CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
12CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
13CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
14CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
16CONFIGURE_ARGS+= -accessibility 16CONFIGURE_ARGS+= -accessibility
17CONFIGURE_ARGS+= -icu 17CONFIGURE_ARGS+= -icu
18CONFIGURE_ARGS+= -libproxy 18CONFIGURE_ARGS+= -libproxy
@@ -31,26 +31,28 @@ CONFIGURE_ARGS+= -no-sql-tds @@ -31,26 +31,28 @@ CONFIGURE_ARGS+= -no-sql-tds
31CONFIGURE_ARGS+= -no-strip 31CONFIGURE_ARGS+= -no-strip
32CONFIGURE_ARGS+= -no-tslib 32CONFIGURE_ARGS+= -no-tslib
33CONFIGURE_ARGS+= -no-vulkan 33CONFIGURE_ARGS+= -no-vulkan
34CONFIGURE_ARGS+= -no-use-gold-linker 34CONFIGURE_ARGS+= -no-use-gold-linker
35CONFIGURE_ARGS+= -pkg-config 35CONFIGURE_ARGS+= -pkg-config
36CONFIGURE_ARGS+= -release 36CONFIGURE_ARGS+= -release
37CONFIGURE_ARGS+= -shared 37CONFIGURE_ARGS+= -shared
38CONFIGURE_ARGS+= -system-harfbuzz 38CONFIGURE_ARGS+= -system-harfbuzz
39CONFIGURE_ARGS+= -system-libjpeg 39CONFIGURE_ARGS+= -system-libjpeg
40CONFIGURE_ARGS+= -system-libpng 40CONFIGURE_ARGS+= -system-libpng
41CONFIGURE_ARGS+= -system-pcre 41CONFIGURE_ARGS+= -system-pcre
42CONFIGURE_ARGS+= -system-sqlite 42CONFIGURE_ARGS+= -system-sqlite
43CONFIGURE_ARGS+= -system-zlib 43CONFIGURE_ARGS+= -system-zlib
 44CONFIGURE_ARGS+= -system-doubleconversion
 45CONFIGURE_ARGS+= -system-libmd4c
44.if defined(MAKE_JOBS) 46.if defined(MAKE_JOBS)
45. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) 47. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
46CONFIGURE_ENV+= MAKEFLAGS=-j${MAKE_JOBS} 48CONFIGURE_ENV+= MAKEFLAGS=-j${MAKE_JOBS}
47. endif 49. endif
48.endif 50.endif
49 51
50.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
51 53
52.if ${OPSYS} != "Darwin" 54.if ${OPSYS} != "Darwin"
53CONFIGURE_ARGS+= -fontconfig 55CONFIGURE_ARGS+= -fontconfig
54QMAKE_CONF= qmake.conf 56QMAKE_CONF= qmake.conf
55. if ${OPSYS} != "SunOS" && \ 57. if ${OPSYS} != "SunOS" && \
56 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)) 58 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
@@ -243,28 +245,30 @@ post-install: @@ -243,28 +245,30 @@ post-install:
243 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \ 245 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \
244 ${DESTDIR}${PREFIX}/${BROKEN_FILES1} 246 ${DESTDIR}${PREFIX}/${BROKEN_FILES1}
245 247
246.include "../../archivers/zstd/buildlink3.mk" 248.include "../../archivers/zstd/buildlink3.mk"
247.include "../../converters/libiconv/buildlink3.mk" 249.include "../../converters/libiconv/buildlink3.mk"
248.include "../../databases/sqlite3/buildlink3.mk" 250.include "../../databases/sqlite3/buildlink3.mk"
249.include "../../devel/gettext-lib/buildlink3.mk" 251.include "../../devel/gettext-lib/buildlink3.mk"
250.include "../../devel/glib2/buildlink3.mk" 252.include "../../devel/glib2/buildlink3.mk"
251.include "../../devel/pcre2/buildlink3.mk" 253.include "../../devel/pcre2/buildlink3.mk"
252.include "../../devel/zlib/buildlink3.mk" 254.include "../../devel/zlib/buildlink3.mk"
253.include "../../fonts/harfbuzz/buildlink3.mk" 255.include "../../fonts/harfbuzz/buildlink3.mk"
254.include "../../graphics/freetype2/buildlink3.mk" 256.include "../../graphics/freetype2/buildlink3.mk"
255.include "../../graphics/png/buildlink3.mk" 257.include "../../graphics/png/buildlink3.mk"
 258.include "../../math/double-conversion/buildlink3.mk"
256.include "../../security/openssl/buildlink3.mk" 259.include "../../security/openssl/buildlink3.mk"
257.include "../../textproc/icu/buildlink3.mk" 260.include "../../textproc/icu/buildlink3.mk"
 261.include "../../textproc/md4c/buildlink3.mk"
258.include "../../www/libproxy/buildlink3.mk" 262.include "../../www/libproxy/buildlink3.mk"
259.if ${OPSYS} != "Darwin" 263.if ${OPSYS} != "Darwin"
260.include "../../fonts/fontconfig/buildlink3.mk" 264.include "../../fonts/fontconfig/buildlink3.mk"
261.include "../../graphics/glu/buildlink3.mk" 265.include "../../graphics/glu/buildlink3.mk"
262. if !empty(MESALIB_SUPPORTS_EGL:Myes) 266. if !empty(MESALIB_SUPPORTS_EGL:Myes)
263PLIST.egl= yes 267PLIST.egl= yes
264. endif 268. endif
265. if !empty(MESALIB_SUPPORTS_DRI:Myes) 269. if !empty(MESALIB_SUPPORTS_DRI:Myes)
266CONFIGURE_ARGS+= -kms 270CONFIGURE_ARGS+= -kms
267.include "../../x11/libdrm/buildlink3.mk" 271.include "../../x11/libdrm/buildlink3.mk"
268. endif 272. endif
269BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11 273BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11
270.include "../../x11/libxcb/buildlink3.mk" 274.include "../../x11/libxcb/buildlink3.mk"
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/buildlink3.mk 2023/01/29 21:15:15 1.48
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk 2023/04/03 20:16:46 1.49
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.48 2023/01/29 21:15:15 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.49 2023/04/03 20:16:46 nros Exp $
2 2
3BUILDLINK_TREE+= qt5-qtbase 3BUILDLINK_TREE+= qt5-qtbase
4 4
5.if !defined(QT5_QTBASE_BUILDLINK3_MK) 5.if !defined(QT5_QTBASE_BUILDLINK3_MK)
6QT5_QTBASE_BUILDLINK3_MK:= 6QT5_QTBASE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1 8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1
9BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.8nb1 9BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.8nb2
10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase 10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
11 11
12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include 12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib 13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins 14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
15 15
16QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 16QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
17CMAKE_PREFIX_PATH+= ${QTDIR} 17CMAKE_PREFIX_PATH+= ${QTDIR}
18 18
19CONFIGURE_ENV+= QTDIR=${QTDIR} 19CONFIGURE_ENV+= QTDIR=${QTDIR}
20MAKE_ENV+= QTDIR=${QTDIR} 20MAKE_ENV+= QTDIR=${QTDIR}
21 21
22CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" 22CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
cvs diff -r1.74 -r1.75 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2023/01/05 16:01:15 1.74
+++ pkgsrc/x11/qt5-qtbase/distinfo 2023/04/03 20:16:46 1.75
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1$NetBSD: distinfo,v 1.74 2023/01/05 16:01:15 adam Exp $ 1$NetBSD: distinfo,v 1.75 2023/04/03 20:16:46 nros Exp $
2 2
3BLAKE2s (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 64f754155b8646d8e8dc87f1c51eb4439236f7f40302c05ebffacdfb3d211cc4 3BLAKE2s (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 64f754155b8646d8e8dc87f1c51eb4439236f7f40302c05ebffacdfb3d211cc4
4SHA512 (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce 4SHA512 (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
5Size (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 50259432 bytes 5Size (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 50259432 bytes
6SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b 6SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
7SHA1 (patch-mkspecs_common_gcc-base.conf) = 7b461079adff516ac3957d0cdb127dee67dab7ce 7SHA1 (patch-mkspecs_common_gcc-base.conf) = 7b461079adff516ac3957d0cdb127dee67dab7ce
8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26 8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515 9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
10SHA1 (patch-qmake_Makefile.unix) = 8a55d0eb30903266ce529bbfa562b492cdd359b3 10SHA1 (patch-qmake_Makefile.unix) = 8a55d0eb30903266ce529bbfa562b492cdd359b3
11SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d 11SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04 12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
13SHA1 (patch-src_3rdparty_double-conversion_include_double-conversion_utils.h) = 88cd4ab81fd480c5dd28cc0a4ac0560c9565a0bc 
14SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0 13SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
15SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb 14SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
16SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7 15SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
17SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc 16SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
18SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9 17SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
19SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 18SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
20SHA1 (patch-src_corelib_kernel_qcore__mac__p.h) = 721f17123eaac392cee68d0d90b77d023ba4e73f 19SHA1 (patch-src_corelib_kernel_qcore__mac__p.h) = 721f17123eaac392cee68d0d90b77d023ba4e73f
21SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec 20SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
22SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd 21SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
23SHA1 (patch-src_corelib_tools_qsharedpointer__impl.h) = 91755dcdd0e13bfc047167db918b9a4d7a172165 22SHA1 (patch-src_corelib_tools_qsharedpointer__impl.h) = 91755dcdd0e13bfc047167db918b9a4d7a172165
24SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5 23SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
25SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f 24SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
26SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9 25SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
File Deleted: pkgsrc/x11/qt5-qtbase/patches/Attic/patch-src_3rdparty_double-conversion_include_double-conversion_utils.h