diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile index ab828bf60666..b2831a472319 100644 --- a/www/qt5-webkit/Makefile +++ b/www/qt5-webkit/Makefile @@ -1,66 +1,64 @@ PORTNAME= webkit DISTVERSION= 5.212.0-alpha4 PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/ PKGNAMEPREFIX= qt5- DISTNAME= qt${PORTNAME}-${DISTVERSION} -PATCH_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/commit/ \ - https://github.com/qtwebkit/qtwebkit/pull/1058/commits/:glib268 -PATCHFILES+= 78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch:-p1 \ - 5b698ba3faffd4e198a45be9fe74f53307395e4b.patch:-p1:glib268 +PATCH_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/commit/ +PATCHFILES+= 78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch:-p1 MAINTAINER= kde@FreeBSD.org COMMENT= QtWebKit with a more modern WebKit code base LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libhyphen.so:textproc/hyphen \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libwoff2dec.so:devel/woff2 USES= bison cmake compiler:c++11-lang gnome gperf jpeg \ pathfix perl5 pkgconfig python:3.5+,build qt:5 sqlite:3 \ tar:xz xorg USE_GNOME= glib20 libxml2 libxslt USE_PERL5= build USE_QT= core declarative gui location network opengl printsupport \ sensors webchannel widgets \ buildtools_build qmake_build testlib_build USE_RUBY= yes USE_XORG= x11 xcomposite xrender # Fix pkgconfig install paths. PATHFIX_CMAKELISTSTXT= PlatformQt.cmake RUBY_NO_RUN_DEPENDS= yes CMAKE_ARGS= -DPORT:STRING="Qt" \ -DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \ -DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}" CMAKE_ON= ENABLE_OPENGL CMAKE_OFF= USE_QT_MULTIMEDIA USE_LD_GOLD # Add -DNDEBUG to CXXFLAGS which in turn gets sucked into # CMAKE_CXX_FLAGS_RELEASE where we actually want to have it. # [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ] CXXFLAGS+= -DNDEBUG PLIST_SUB= FULLVER="${PORTVERSION:R}" SUB_FILES= pkg-install SUB_LIST= QT_INCDIR="${QT_INCDIR}" OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT= GSTREAMER GSTREAMER_LIB_DEPENDS= libgstapp-1.0.so:multimedia/gstreamer1-plugins \ libgstbase-1.0.so:multimedia/gstreamer1 GSTREAMER_USE= GSTREAMER1=core GSTREAMER_CMAKE_OFF= -DUSE_GSTREAMER:BOOL=OFF BINARY_ALIAS= python3=${PYTHON_CMD} .include diff --git a/www/qt5-webkit/distinfo b/www/qt5-webkit/distinfo index 0a2cde9210e0..705582e44c58 100644 --- a/www/qt5-webkit/distinfo +++ b/www/qt5-webkit/distinfo @@ -1,7 +1,5 @@ TIMESTAMP = 1627113086 SHA256 (qtwebkit-5.212.0-alpha4.tar.xz) = 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 SIZE (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 SHA256 (78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch) = 9db5480dfbd3c440489e8e4131e3555b2af61fa4b6c19f35227588c5996be128 SIZE (78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch) = 1100 -SHA256 (5b698ba3faffd4e198a45be9fe74f53307395e4b.patch) = aee2faef4e77809051cef163195b9be4fc4ec1302d4ceca4c6027d3f5d8d2a25 -SIZE (5b698ba3faffd4e198a45be9fe74f53307395e4b.patch) = 841 diff --git a/www/qt5-webkit/files/patch-Source_WTF_wtf_glib_GRefPtr.h b/www/qt5-webkit/files/patch-Source_WTF_wtf_glib_GRefPtr.h new file mode 100644 index 000000000000..cdb0307225ec --- /dev/null +++ b/www/qt5-webkit/files/patch-Source_WTF_wtf_glib_GRefPtr.h @@ -0,0 +1,24 @@ +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + + g_object_ref_sink is defined as a macro meanwhile and so the build fails. + Just remove the declarations, glib.h is included anyway. + +Obtained from: + +https://github.com/qtwebkit/qtwebkit/commit/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch + +--- Source/WTF/wtf/glib/GRefPtr.h.orig 2020-03-04 17:16:37 UTC ++++ Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt };