Wed Jan 25 22:27:03 2023 UTC ()
qt5-qtwebkit: revert previous

Switch back to USE_CMAKE for now.


(wiz)
diff -r1.104 -r1.105 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs diff -r1.104 -r1.105 pkgsrc/x11/qt5-qtwebkit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2023/01/24 18:36:36 1.104
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2023/01/25 22:27:02 1.105
@@ -1,56 +1,62 @@ @@ -1,56 +1,62 @@
1# $NetBSD: Makefile,v 1.104 2023/01/24 18:36:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.105 2023/01/25 22:27:02 wiz 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= 12 6PKGREVISION= 12
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+= perl:build pkg-config bison 24USE_TOOLS+= perl:build pkg-config bison
 25USE_CMAKE= yes
 26CMAKE_ARG_PATH= ..
 27CONFIGURE_DIRS= _build
25CMAKE_INSTALL_PREFIX= ${PREFIX}/qt5 28CMAKE_INSTALL_PREFIX= ${PREFIX}/qt5
26TEST_TARGET= test 29TEST_TARGET= test
27 30
28CMAKE_ARGS+= -DPORT=Qt 31CMAKE_ARGS+= -DPORT=Qt
29CMAKE_ARGS+= -DENABLE_TOOLS=OFF 32CMAKE_ARGS+= -DENABLE_TOOLS=OFF
30CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 33CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
31CMAKE_ARGS+= -DSHARED_CORE:BOOL=ON 34CMAKE_ARGS+= -DSHARED_CORE:BOOL=ON
32CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC:BOOL=ON 35CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC:BOOL=ON
33CMAKE_ARGS+= -DUSE_LD_GOLD:BOOL=OFF 36CMAKE_ARGS+= -DUSE_LD_GOLD:BOOL=OFF
34CMAKE_ARGS+= -DENABLE_API_TESTS=OFF 37CMAKE_ARGS+= -DENABLE_API_TESTS=OFF
35CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF 38CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF
36CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF 39CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF
37CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF 40CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF
38CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec 41CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec
39 42
40UNLIMIT_RESOURCES+= cputime 43UNLIMIT_RESOURCES+= cputime
41 44
42GCC_REQD+= 4.9 45GCC_REQD+= 4.9
43 46
 47pre-configure:
 48 ${MKDIR} ${WRKSRC}/_build
 49
44# wcstof(3) etc. is used in C++ code. 50# wcstof(3) etc. is used in C++ code.
45CFLAGS.NetBSD+= -D_NETBSD_SOURCE 51CFLAGS.NetBSD+= -D_NETBSD_SOURCE
46 52
47# temporary fix for GLib 2.68 breakage 53# temporary fix for GLib 2.68 breakage
48# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 54# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
49CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 55CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
50 56
51# avoid creating a .qt directory in the users home directory 57# avoid creating a .qt directory in the users home directory
52SCRIPTS_ENV+= HOME=${WRKDIR} 58SCRIPTS_ENV+= HOME=${WRKDIR}
53 59
54REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl 60REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl
55 61
56INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 62INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
@@ -82,27 +88,26 @@ CFLAGS+= -march=mips64 @@ -82,27 +88,26 @@ CFLAGS+= -march=mips64
82CFLAGS+= -march=mips32 88CFLAGS+= -march=mips32
83.endif 89.endif
84 90
85post-install: 91post-install:
86.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc 92.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
87 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 93 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
88 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i} 94 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i}
89.endfor 95.endfor
90 96
91# Not supported on Win and Mac. 97# Not supported on Win and Mac.
92# See comment in Source/WebKit2/PlatformQt.cmake 98# See comment in Source/WebKit2/PlatformQt.cmake
93PLIST_VARS+= npapi 99PLIST_VARS+= npapi
94 100
95.include "../../devel/cmake/build.mk" 
96.include "../../databases/sqlite3/buildlink3.mk" 101.include "../../databases/sqlite3/buildlink3.mk"
97.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 102.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
98.include "../../devel/libexecinfo/buildlink3.mk" 103.include "../../devel/libexecinfo/buildlink3.mk"
99.endif 104.endif
100.include "../../fonts/woff2/buildlink3.mk" 105.include "../../fonts/woff2/buildlink3.mk"
101.include "../../graphics/libwebp/buildlink3.mk" 106.include "../../graphics/libwebp/buildlink3.mk"
102.include "../../textproc/hyphen/buildlink3.mk" 107.include "../../textproc/hyphen/buildlink3.mk"
103.include "../../textproc/icu/buildlink3.mk" 108.include "../../textproc/icu/buildlink3.mk"
104.include "../../textproc/libxslt/buildlink3.mk" 109.include "../../textproc/libxslt/buildlink3.mk"
105.if ${OPSYS} != "Darwin" 110.if ${OPSYS} != "Darwin"
106.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 111.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
107.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 112.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
108.include "../../x11/libXcomposite/buildlink3.mk" 113.include "../../x11/libXcomposite/buildlink3.mk"