Received: by mail.netbsd.org (Postfix, from userid 605) id 6FA2E84F10; Fri, 30 Dec 2022 20:19:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9FA6684D3D for ; Fri, 30 Dec 2022 20:19:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 54SakOZUB6Sp for ; Fri, 30 Dec 2022 20:19:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7222384D32 for ; Fri, 30 Dec 2022 20:19:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 69EC2FA90; Fri, 30 Dec 2022 20:19:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167243155019510" MIME-Version: 1.0 Date: Fri, 30 Dec 2022 20:19:10 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/x11/qt5-qtwebkit To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20221230201910.69EC2FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167243155019510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Dec 30 20:19:10 UTC 2022 Modified Files: pkgsrc/x11/qt5-qtwebkit: Makefile PLIST distinfo Added Files: pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_JavaScriptCore_jsc.cpp patch-Source_WebKit_qt_declarative_CMakeLists.txt patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt patch-Source_cmake_WebKitMacros.cmake Log Message: qt5-qtwebkit: fix building on Darwin; cleanups To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 pkgsrc/x11/qt5-qtwebkit/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/qt5-qtwebkit/PLIST cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/qt5-qtwebkit/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167243155019510 Content-Disposition: inline Content-Length: 11628 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtwebkit/Makefile diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.100 pkgsrc/x11/qt5-qtwebkit/Makefile:1.101 --- pkgsrc/x11/qt5-qtwebkit/Makefile:1.100 Mon Nov 28 19:16:13 2022 +++ pkgsrc/x11/qt5-qtwebkit/Makefile Fri Dec 30 20:19:10 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2022/11/28 19:16:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.101 2022/12/30 20:19:10 adam Exp $ QTWKVERSION= 5.212.0-alpha4 DISTNAME= qtwebkit-${QTWKVERSION} @@ -35,9 +35,10 @@ CMAKE_ARGS+= -DSHARED_CORE:BOOL=ON CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC:BOOL=ON CMAKE_ARGS+= -DUSE_LD_GOLD:BOOL=OFF CMAKE_ARGS+= -DENABLE_API_TESTS=OFF - +CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF +CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF +CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec -#CMAKE_ARGS+= -DLIBEXEC_INSTALL_DIR=${CMAKE_INSTALL_PREFIX}/libexec UNLIMIT_RESOURCES+= cputime @@ -53,15 +54,11 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 -## for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. -#BUILDLINK_TRANSFORM+= rm:-Wundef - # avoid creating a .qt directory in the users home directory SCRIPTS_ENV+= HOME=${WRKDIR} REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl -#MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -75,7 +72,7 @@ BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/li BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections -.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*arm*) +.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*} LDFLAGS+= -Wl,--no-keep-memory .endif @@ -85,9 +82,9 @@ LDFLAGS+= -lsocket -lnsl .endif # JavaScriptCore requires at least MIPS32. -.if !empty(MACHINE_ARCH:Mmips64*) +.if ${MACHINE_ARCH:Mmips64*} CFLAGS+= -march=mips64 -.elif !empty(MACHINE_ARCH:Mmips*) +.elif ${MACHINE_ARCH:Mmips*} CFLAGS+= -march=mips32 .endif @@ -97,6 +94,10 @@ post-install: ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i} .endfor +# Not supported on Win and Mac. +# See comment in Source/WebKit2/PlatformQt.cmake +PLIST_VARS+= npapi + .include "../../databases/sqlite3/buildlink3.mk" .if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" .include "../../devel/libexecinfo/buildlink3.mk" @@ -110,9 +111,11 @@ post-install: .include "../../multimedia/gst-plugins1-base/buildlink3.mk" .include "../../multimedia/gst-plugins1-bad/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" +PLIST.npapi= yes .endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../x11/qt5-qtlocation/buildlink3.mk" +.include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../x11/qt5-qtsensors/buildlink3.mk" .include "../../x11/qt5-qtwebchannel/buildlink3.mk" PYTHON_FOR_BUILD_ONLY= tool Index: pkgsrc/x11/qt5-qtwebkit/PLIST diff -u pkgsrc/x11/qt5-qtwebkit/PLIST:1.7 pkgsrc/x11/qt5-qtwebkit/PLIST:1.8 --- pkgsrc/x11/qt5-qtwebkit/PLIST:1.7 Sat Mar 21 19:42:36 2020 +++ pkgsrc/x11/qt5-qtwebkit/PLIST Fri Dec 30 20:19:10 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2020/03/21 19:42:36 nia Exp $ +@comment $NetBSD: PLIST,v 1.8 2022/12/30 20:19:10 adam Exp $ lib/pkgconfig/Qt5WebKit.pc lib/pkgconfig/Qt5WebKitWidgets.pc qt5/include/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h @@ -89,34 +89,34 @@ qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKit qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake qt5/lib/libANGLESupport.a -qt5/lib/libJavaScriptCore.${RUBY_DLEXT} +qt5/lib/libJavaScriptCore.so qt5/lib/libJavaScriptCore.so.5 qt5/lib/libJavaScriptCore.so.5.212.0 -qt5/lib/libQt5WebKit.${RUBY_DLEXT} +qt5/lib/libQt5WebKit.so qt5/lib/libQt5WebKit.so.5 qt5/lib/libQt5WebKit.so.5.212.0 -qt5/lib/libQt5WebKitWidgets.${RUBY_DLEXT} +qt5/lib/libQt5WebKitWidgets.so qt5/lib/libQt5WebKitWidgets.so.5 qt5/lib/libQt5WebKitWidgets.so.5.212.0 -qt5/lib/libWTF.${RUBY_DLEXT} -qt5/lib/libWebCore.${RUBY_DLEXT} +qt5/lib/libWTF.so +qt5/lib/libWebCore.so qt5/lib/libWebCore.so.5 qt5/lib/libWebCore.so.5.212.0 -qt5/lib/libWebKit2.${RUBY_DLEXT} +qt5/lib/libWebKit2.so qt5/lib/libWebKit2.so.5 qt5/lib/libWebKit2.so.5.212.0 qt5/lib/pkgconfig/Qt5WebKit.pc qt5/lib/pkgconfig/Qt5WebKitWidgets.pc qt5/libexec/QtWebNetworkProcess -qt5/libexec/QtWebPluginProcess +${PLIST.npapi}qt5/libexec/QtWebPluginProcess qt5/libexec/QtWebProcess qt5/libexec/QtWebStorageProcess qt5/mkspecs/modules/qt_lib_webkit.pri qt5/mkspecs/modules/qt_lib_webkit_private.pri qt5/mkspecs/modules/qt_lib_webkitwidgets.pri qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri -qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.${RUBY_DLEXT} +qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so qt5/qml/QtWebKit/experimental/qmldir -qt5/qml/QtWebKit/libqmlwebkitplugin.${RUBY_DLEXT} +qt5/qml/QtWebKit/libqmlwebkitplugin.so qt5/qml/QtWebKit/plugins.qmltypes qt5/qml/QtWebKit/qmldir Index: pkgsrc/x11/qt5-qtwebkit/distinfo diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.28 pkgsrc/x11/qt5-qtwebkit/distinfo:1.29 --- pkgsrc/x11/qt5-qtwebkit/distinfo:1.28 Mon Apr 25 02:45:44 2022 +++ pkgsrc/x11/qt5-qtwebkit/distinfo Fri Dec 30 20:19:10 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2022/04/25 02:45:44 markd Exp $ +$NetBSD: distinfo,v 1.29 2022/12/30 20:19:10 adam Exp $ BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 @@ -12,6 +12,7 @@ SHA1 (patch-Source_JavaScriptCore_dfg_DF SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be +SHA1 (patch-Source_JavaScriptCore_jsc.cpp) = 796ce0232f1a833757b2e7ca5c910fac75f783ad SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632 SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = 3a1346216b20853b73abf9b1756617d1e761cb94 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e @@ -31,5 +32,8 @@ SHA1 (patch-Source_WebCore_platform_text SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3 SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e +SHA1 (patch-Source_WebKit_qt_declarative_CMakeLists.txt) = bda5cb2751027aab161ae54f46b8f9103532fb13 +SHA1 (patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt) = b95ac623f36018e3f2cc55a2988e97ef3f713159 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 8fb8d11c4aab36e913a560ac48acce930f074635 SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143 +SHA1 (patch-Source_cmake_WebKitMacros.cmake) = 5498b5cccf392f5d3bc370b00a72b2aa5389492d Added files: Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp:1.1 --- /dev/null Fri Dec 30 20:19:10 2022 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp Fri Dec 30 20:19:10 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_JavaScriptCore_jsc.cpp,v 1.1 2022/12/30 20:19:10 adam Exp $ + +Remove ambiguity on Darwin. + +--- Source/JavaScriptCore/jsc.cpp.orig 2022-12-30 08:36:58.000000000 +0000 ++++ Source/JavaScriptCore/jsc.cpp +@@ -189,7 +189,7 @@ private: + + class ElementHandleOwner : public WeakHandleOwner { + public: +- bool isReachableFromOpaqueRoots(Handle handle, void*, SlotVisitor& visitor) override ++ bool isReachableFromOpaqueRoots(JSC::Handle handle, void*, SlotVisitor& visitor) override + { + Element* element = jsCast(handle.slot()->asCell()); + return visitor.containsOpaqueRoot(element->root()); Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt:1.1 --- /dev/null Fri Dec 30 20:19:10 2022 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt Fri Dec 30 20:19:10 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_WebKit_qt_declarative_CMakeLists.txt,v 1.1 2022/12/30 20:19:10 adam Exp $ + +Link against WebKit2 library. + +--- Source/WebKit/qt/declarative/CMakeLists.txt.orig 2022-12-30 10:44:44.000000000 +0000 ++++ Source/WebKit/qt/declarative/CMakeLists.txt +@@ -23,7 +23,7 @@ include_directories(SYSTEM + + add_library(qmlwebkitplugin MODULE plugin.cpp) + target_link_libraries(qmlwebkitplugin +- WebKit Qt5::Quick) ++ WebKit2 Qt5::Quick) + + set(qmlwebkit_output_dir "${CMAKE_BINARY_DIR}/imports/QtWebKit") + set(qmlwebkit_install_dir "${QML_INSTALL_DIR}/QtWebKit") Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt:1.1 --- /dev/null Fri Dec 30 20:19:10 2022 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt Fri Dec 30 20:19:10 2022 @@ -0,0 +1,14 @@ +$NetBSD: patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt,v 1.1 2022/12/30 20:19:10 adam Exp $ + +Link aganst WebKit2 library. + +--- Source/WebKit/qt/declarative/experimental/CMakeLists.txt.orig 2022-12-30 10:46:13.000000000 +0000 ++++ Source/WebKit/qt/declarative/experimental/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_library(qmlwebkitexperimentalplugin MODULE plugin.cpp) + target_link_libraries(qmlwebkitexperimentalplugin +- WebKit Qt5::Quick) ++ WebKit2 Qt5::Quick) + + set(qmlwebkitexperimental_output_dir "${CMAKE_BINARY_DIR}/imports/QtWebKit/experimental") + set(qmlwebkitexperimental_install_dir "${QML_INSTALL_DIR}/QtWebKit/experimental") Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake:1.1 --- /dev/null Fri Dec 30 20:19:10 2022 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake Fri Dec 30 20:19:10 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-Source_cmake_WebKitMacros.cmake,v 1.1 2022/12/30 20:19:10 adam Exp $ + +Don't build frameworks on Darwin. + +--- Source/cmake/WebKitMacros.cmake.orig 2020-03-04 17:16:37.000000000 +0000 ++++ Source/cmake/WebKitMacros.cmake +@@ -285,7 +285,7 @@ macro(WEBKIT_FRAMEWORK _target) + add_custom_command(TARGET ${_target} POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM) + endif () + +- if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC) ++ if (FALSE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC) + set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE) + if (${_target}_PUBLIC_HEADERS) + set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}") --_----------=_167243155019510--