CVS commit: pkgsrc/x11/qt5-qtbase

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Apr  3 20:16:46 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile buildlink3.mk distinfo
Removed Files:
        pkgsrc/x11/qt5-qtbase/patches:
            patch-src_3rdparty_double-conversion_include_double-conversion_utils.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/qt5-qtbase/buildlink3.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_3rdparty_double-conversion_include_double-conversion_utils.h

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

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.127 pkgsrc/x11/qt5-qtbase/Makefile:1.128
--- pkgsrc/x11/qt5-qtbase/Makefile:1.127        Sun Jan 29 21:15:15 2023
+++ pkgsrc/x11/qt5-qtbase/Makefile      Mon Apr  3 20:16:46 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.127 2023/01/29 21:15:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2023/04/03 20:16:46 nros Exp $
 
 DISTNAME=      qtbase-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"
@@ -41,6 +41,8 @@ CONFIGURE_ARGS+=      -system-libpng
 CONFIGURE_ARGS+=       -system-pcre
 CONFIGURE_ARGS+=       -system-sqlite
 CONFIGURE_ARGS+=       -system-zlib
+CONFIGURE_ARGS+=       -system-doubleconversion
+CONFIGURE_ARGS+=       -system-libmd4c
 .if defined(MAKE_JOBS)
 .  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
 CONFIGURE_ENV+=                MAKEFLAGS=-j${MAKE_JOBS}
@@ -253,8 +255,10 @@ post-install:
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../math/double-conversion/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/md4c/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
 .include "../../fonts/fontconfig/buildlink3.mk"

Index: pkgsrc/x11/qt5-qtbase/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.48 pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.49
--- pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.48    Sun Jan 29 21:15:15 2023
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk Mon Apr  3 20:16:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.48 2023/01/29 21:15:15 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2023/04/03 20:16:46 nros Exp $
 
 BUILDLINK_TREE+=       qt5-qtbase
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        qt5-qtbase
 QT5_QTBASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt5-qtbase+=     qt5-qtbase>=5.9.1
-BUILDLINK_ABI_DEPENDS.qt5-qtbase+=     qt5-qtbase>=5.15.8nb1
+BUILDLINK_ABI_DEPENDS.qt5-qtbase+=     qt5-qtbase>=5.15.8nb2
 BUILDLINK_PKGSRCDIR.qt5-qtbase?=       ../../x11/qt5-qtbase
 
 BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.74 pkgsrc/x11/qt5-qtbase/distinfo:1.75
--- pkgsrc/x11/qt5-qtbase/distinfo:1.74 Thu Jan  5 16:01:15 2023
+++ pkgsrc/x11/qt5-qtbase/distinfo      Mon Apr  3 20:16:46 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2023/01/05 16:01:15 adam Exp $
+$NetBSD: distinfo,v 1.75 2023/04/03 20:16:46 nros Exp $
 
 BLAKE2s (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 64f754155b8646d8e8dc87f1c51eb4439236f7f40302c05ebffacdfb3d211cc4
 SHA512 (qtbase-everywhere-opensource-src-5.15.8.tar.xz) = 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
@@ -10,7 +10,6 @@ SHA1 (patch-mkspecs_features_toolchain.p
 SHA1 (patch-qmake_Makefile.unix) = 8a55d0eb30903266ce529bbfa562b492cdd359b3
 SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 6ea4efd2ce88d7cf3c73e1dc2cdf984fe3b6af04
-SHA1 (patch-src_3rdparty_double-conversion_include_double-conversion_utils.h) = 88cd4ab81fd480c5dd28cc0a4ac0560c9565a0bc
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
 SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7