Mon Jul 10 20:27:07 2023 UTC ()
Pullup ticket #6777 - requested by abs
x11/qt5-qtwebkit: build fix

Revisions pulled up:
- x11/qt5-qtwebkit/Makefile                                     1.113

---
   Module Name:    pkgsrc
   Committed By:   gdt
   Date:           Mon Jul  3 11:46:28 UTC 2023

   Modified Files:
           pkgsrc/x11/qt5-qtwebkit: Makefile

   Log Message:
   qt5-qtwebengine: bl3 on libxml2

   .so files installed by the package show NEEDED on libxml2.  While it
   is properly TOOL_DEPENDS also, it therefore needs to be bl3 also.


(bsiegert)
diff -r1.112 -r1.112.2.1 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs diff -r1.112 -r1.112.2.1 pkgsrc/x11/qt5-qtwebkit/Makefile (switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2023/05/31 10:56:08 1.112
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2023/07/10 20:27:07 1.112.2.1
@@ -1,129 +1,130 @@ @@ -1,129 +1,130 @@
1# $NetBSD: Makefile,v 1.112 2023/05/31 10:56:08 adam Exp $ 1# $NetBSD: Makefile,v 1.112.2.1 2023/07/10 20:27:07 bsiegert Exp $
2 2
3QTWKVERSION= 5.212.0-alpha4 3QTWKVERSION= 5.212.0-alpha4
4DISTNAME= qtwebkit-${QTWKVERSION} 4DISTNAME= qtwebkit-${QTWKVERSION}
5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./} 5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./}
6PKGREVISION= 17 6PKGREVISION= 18
7CATEGORIES= x11 www 7CATEGORIES= x11 www
8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/}
9GITHUB_PROJECT= qtwebkit 9GITHUB_PROJECT= qtwebkit
10GITHUB_RELEASE= ${DISTNAME} 10GITHUB_RELEASE= ${DISTNAME}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki 14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki
15COMMENT= Qt5 WebView module 15COMMENT= Qt5 WebView module
16LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3 16LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3
17 17
18TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf 18TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
19TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 19TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
20TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 20TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
21TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 21TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
22 22
23USE_LANGUAGES= c c++11 23USE_LANGUAGES= c c++11
24USE_TOOLS+= bison perl:build pkg-config 24USE_TOOLS+= bison perl:build pkg-config
25CMAKE_INSTALL_PREFIX= ${QTDIR} 25CMAKE_INSTALL_PREFIX= ${QTDIR}
26CMAKE_INSTALL_NAME_DIR= ${QTDIR}/lib 26CMAKE_INSTALL_NAME_DIR= ${QTDIR}/lib
27TEST_TARGET= test 27TEST_TARGET= test
28 28
29# Source/JavaScriptCore/offlineasm/parser.rb:587:in `block in parseSequence': undefined method `=~' 29# Source/JavaScriptCore/offlineasm/parser.rb:587:in `block in parseSequence': undefined method `=~'
30RUBY_VERSIONS_INCOMPATIBLE= 32 30RUBY_VERSIONS_INCOMPATIBLE= 32
31 31
32CMAKE_ARGS+= -DPORT=Qt 32CMAKE_ARGS+= -DPORT=Qt
33CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 33CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
34CMAKE_ARGS+= -DENABLE_API_TESTS=OFF 34CMAKE_ARGS+= -DENABLE_API_TESTS=OFF
35CMAKE_ARGS+= -DENABLE_TOOLS=OFF 35CMAKE_ARGS+= -DENABLE_TOOLS=OFF
36CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${QTDIR}/libexec 36CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${QTDIR}/libexec
37CMAKE_ARGS+= -DSHARED_CORE=ON 37CMAKE_ARGS+= -DSHARED_CORE=ON
38CMAKE_ARGS+= -DUSE_LD_GOLD=OFF 38CMAKE_ARGS+= -DUSE_LD_GOLD=OFF
39CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON 39CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC=ON
40# for Darwin 40# for Darwin
41CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF 41CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF
42CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF 42CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF
43CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF 43CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF
44 44
45UNLIMIT_RESOURCES+= cputime 45UNLIMIT_RESOURCES+= cputime
46 46
47GCC_REQD+= 4.9 47GCC_REQD+= 4.9
48 48
49# wcstof(3) etc. is used in C++ code. 49# wcstof(3) etc. is used in C++ code.
50CFLAGS.NetBSD+= -D_NETBSD_SOURCE 50CFLAGS.NetBSD+= -D_NETBSD_SOURCE
51 51
52# temporary fix for GLib 2.68 breakage 52# temporary fix for GLib 2.68 breakage
53# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 53# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
54CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 54CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
55 55
56# avoid creating a .qt directory in the users home directory 56# avoid creating a .qt directory in the users home directory
57SCRIPTS_ENV+= HOME=${WRKDIR} 57SCRIPTS_ENV+= HOME=${WRKDIR}
58 58
59REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl 59REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl
60 60
61INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 61INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
62INSTALLATION_DIRS+= lib/pkgconfig 62INSTALLATION_DIRS+= lib/pkgconfig
63 63
64.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
65 65
66.if ${_USE_CWRAPPERS} == "yes" 66.if ${_USE_CWRAPPERS} == "yes"
67BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib 67BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib
68.else 68.else
69BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib 69BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib
70.endif 70.endif
71 71
72BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections 72BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections
73 73
74.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*} 74.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
75LDFLAGS+= -Wl,--no-keep-memory 75LDFLAGS+= -Wl,--no-keep-memory
76.endif 76.endif
77 77
78.if ${OPSYS} == "SunOS" 78.if ${OPSYS} == "SunOS"
79CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF 79CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF
80LDFLAGS+= -lsocket -lnsl 80LDFLAGS+= -lsocket -lnsl
81.endif 81.endif
82 82
83# JavaScriptCore requires at least MIPS32. 83# JavaScriptCore requires at least MIPS32.
84.if ${MACHINE_ARCH:Mmips64*} 84.if ${MACHINE_ARCH:Mmips64*}
85CFLAGS+= -march=mips64 85CFLAGS+= -march=mips64
86.elif ${MACHINE_ARCH:Mmips*} 86.elif ${MACHINE_ARCH:Mmips*}
87CFLAGS+= -march=mips32 87CFLAGS+= -march=mips32
88.endif 88.endif
89 89
90post-install: 90post-install:
91.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc 91.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
92 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 92 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
93 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i} 93 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i}
94.endfor 94.endfor
95 95
96# Not supported on Win and Mac. 96# Not supported on Win and Mac.
97# See comment in Source/WebKit2/PlatformQt.cmake 97# See comment in Source/WebKit2/PlatformQt.cmake
98PLIST_VARS+= npapi 98PLIST_VARS+= npapi
99 99
100.include "../../databases/sqlite3/buildlink3.mk" 100.include "../../databases/sqlite3/buildlink3.mk"
101.include "../../devel/cmake/build.mk" 101.include "../../devel/cmake/build.mk"
102.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 102.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
103.include "../../devel/libexecinfo/buildlink3.mk" 103.include "../../devel/libexecinfo/buildlink3.mk"
104.endif 104.endif
105.include "../../fonts/woff2/buildlink3.mk" 105.include "../../fonts/woff2/buildlink3.mk"
106.include "../../graphics/libwebp/buildlink3.mk" 106.include "../../graphics/libwebp/buildlink3.mk"
107.include "../../textproc/hyphen/buildlink3.mk" 107.include "../../textproc/hyphen/buildlink3.mk"
108.include "../../textproc/icu/buildlink3.mk" 108.include "../../textproc/icu/buildlink3.mk"
 109.include "../../textproc/libxml2/buildlink3.mk"
109.include "../../textproc/libxslt/buildlink3.mk" 110.include "../../textproc/libxslt/buildlink3.mk"
110.if ${OPSYS} != "Darwin" 111.if ${OPSYS} != "Darwin"
111.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 112.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
112.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 113.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
113.include "../../x11/libXcomposite/buildlink3.mk" 114.include "../../x11/libXcomposite/buildlink3.mk"
114PLIST.npapi= yes 115PLIST.npapi= yes
115.endif 116.endif
116.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 117.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
117.include "../../x11/qt5-qtlocation/buildlink3.mk" 118.include "../../x11/qt5-qtlocation/buildlink3.mk"
118.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 119.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
119.include "../../x11/qt5-qtsensors/buildlink3.mk" 120.include "../../x11/qt5-qtsensors/buildlink3.mk"
120.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 121.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
121PYTHON_FOR_BUILD_ONLY= tool 122PYTHON_FOR_BUILD_ONLY= tool
122.include "../../lang/python/tool.mk" 123.include "../../lang/python/tool.mk"
123.include "../../lang/ruby/buildlink3.mk" 124.include "../../lang/ruby/buildlink3.mk"
124BUILDLINK_DEPMETHOD.${RUBY_BASE}= build 125BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
125.include "../../mk/curses.buildlink3.mk" 126.include "../../mk/curses.buildlink3.mk"
126.include "../../mk/dlopen.buildlink3.mk" 127.include "../../mk/dlopen.buildlink3.mk"
127BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 128BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
128.include "../../mk/atomic64.mk" 129.include "../../mk/atomic64.mk"
129.include "../../mk/bsd.pkg.mk" 130.include "../../mk/bsd.pkg.mk"