Sat Apr 3 10:19:03 2021 UTC ()
webkit24-gtk: Use the same glib-2.68.0 fix


(cirnatdan)
diff -r1.20 -r1.21 pkgsrc/www/webkit24-gtk/Makefile.common
diff -r1.37 -r1.38 pkgsrc/www/webkit24-gtk3/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/www/webkit24-gtk/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/webkit24-gtk/Attic/Makefile.common 2020/12/31 20:04:14 1.20
+++ pkgsrc/www/webkit24-gtk/Attic/Makefile.common 2021/04/03 10:19:03 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.20 2020/12/31 20:04:14 nia Exp $ 1# $NetBSD: Makefile.common,v 1.21 2021/04/03 10:19:03 cirnatdan Exp $
2# used by www/webkit24-gtk/Makefile 2# used by www/webkit24-gtk/Makefile
3# used by www/webkit24-gtk3/Makefile 3# used by www/webkit24-gtk3/Makefile
4 4
5DISTNAME= webkitgtk-2.4.11 5DISTNAME= webkitgtk-2.4.11
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
12LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
13 13
14DISTINFO_FILE= ${.CURDIR}/../../www/webkit24-gtk/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../www/webkit24-gtk/distinfo
@@ -73,26 +73,30 @@ CXXFLAGS+= -Wno-c++11-narrowing @@ -73,26 +73,30 @@ CXXFLAGS+= -Wno-c++11-narrowing
73.endif 73.endif
74 74
75CXXFLAGS+= -Wno-expansion-to-defined 75CXXFLAGS+= -Wno-expansion-to-defined
76 76
77.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) 77.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
78CONFIGURE_ARGS+= --disable-fast-malloc 78CONFIGURE_ARGS+= --disable-fast-malloc
79CPPFLAGS+= -DUSE_SYSTEM_MALLOC 79CPPFLAGS+= -DUSE_SYSTEM_MALLOC
80.endif 80.endif
81 81
82.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm" 82.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
83LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory 83LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory
84.endif 84.endif
85 85
 86# temporary fix for GLib 2.68 breakage
 87# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
 88CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
 89
86.include "../../mk/atomic64.mk" 90.include "../../mk/atomic64.mk"
87BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 91BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
88.include "../../devel/glib2/buildlink3.mk" 92.include "../../devel/glib2/buildlink3.mk"
89.include "../../devel/zlib/buildlink3.mk" 93.include "../../devel/zlib/buildlink3.mk"
90.include "../../databases/sqlite3/buildlink3.mk" 94.include "../../databases/sqlite3/buildlink3.mk"
91.include "../../devel/flex/buildlink3.mk" 95.include "../../devel/flex/buildlink3.mk"
92.include "../../devel/gperf/buildlink3.mk" 96.include "../../devel/gperf/buildlink3.mk"
93# This is optional, but needs testing. 97# This is optional, but needs testing.
94#.include "../../devel/pango/buildlink3.mk" 98#.include "../../devel/pango/buildlink3.mk"
95# A correct Webkit build requires flex 2.5.33 99# A correct Webkit build requires flex 2.5.33
96.include "../../fonts/harfbuzz-icu/buildlink3.mk" 100.include "../../fonts/harfbuzz-icu/buildlink3.mk"
97.include "../../graphics/freetype2/buildlink3.mk" 101.include "../../graphics/freetype2/buildlink3.mk"
98.include "../../graphics/libwebp/buildlink3.mk" 102.include "../../graphics/libwebp/buildlink3.mk"
cvs diff -r1.37 -r1.38 pkgsrc/www/webkit24-gtk3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit24-gtk3/Attic/Makefile 2021/04/02 15:19:45 1.37
+++ pkgsrc/www/webkit24-gtk3/Attic/Makefile 2021/04/03 10:19:03 1.38
@@ -1,30 +1,26 @@ @@ -1,30 +1,26 @@
1# $NetBSD: Makefile,v 1.37 2021/04/02 15:19:45 cirnatdan Exp $ 1# $NetBSD: Makefile,v 1.38 2021/04/03 10:19:03 cirnatdan Exp $
2 2
3PKGREVISION= 32 3PKGREVISION= 32
4.include "../../www/webkit24-gtk/Makefile.common" 4.include "../../www/webkit24-gtk/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/webkitgtk/webkit24-gtk3/} 6PKGNAME= ${DISTNAME:S/webkitgtk/webkit24-gtk3/}
7 7
8COMMENT= GTK3 port of the WebKit browser engine 8COMMENT= GTK3 port of the WebKit browser engine
9 9
10CONFIGURE_ARGS+= --with-gtk=3.0 10CONFIGURE_ARGS+= --with-gtk=3.0
11CONFIGURE_ARGS+= --disable-gtk-doc-html 11CONFIGURE_ARGS+= --disable-gtk-doc-html
12CONFIGURE_ARGS+= --disable-webkit2 12CONFIGURE_ARGS+= --disable-webkit2
13 13
14# temporary fix for GLib 2.68 breakage 
15# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 
16CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 
17 
18# Automatically generate PLIST from www/webkit24-gtk/PLIST 14# Automatically generate PLIST from www/webkit24-gtk/PLIST
19.PHONY: print-PLIST-from-gtk 15.PHONY: print-PLIST-from-gtk
20print-PLIST-from-gtk: 16print-PLIST-from-gtk:
21 ${RUN}${SED} \ 17 ${RUN}${SED} \
22 -e 's/jsc-1/jsc-3/' \ 18 -e 's/jsc-1/jsc-3/' \
23 -e 's/javascriptcoregtk-1.0/javascriptcoregtk-3.0/' \ 19 -e 's/javascriptcoregtk-1.0/javascriptcoregtk-3.0/' \
24 -e 's/webkit-1.0.pc/webkitgtk-3.0.pc/' \ 20 -e 's/webkit-1.0.pc/webkitgtk-3.0.pc/' \
25 -e 's/webkit-1.0/webkit-3.0/' \ 21 -e 's/webkit-1.0/webkit-3.0/' \
26 -e 's/webkit-2.0/webkit-3.0/' \ 22 -e 's/webkit-2.0/webkit-3.0/' \
27 -e 's/webkitgtk-2.0.mo/webkitgtk-3.0.mo/' \ 23 -e 's/webkitgtk-2.0.mo/webkitgtk-3.0.mo/' \
28 -e 's/webkitgtk-1.0/webkitgtk-3.0/' \ 24 -e 's/webkitgtk-1.0/webkitgtk-3.0/' \
29 -e 's/JSCore-1.0/JSCore-3.0/' \ 25 -e 's/JSCore-1.0/JSCore-3.0/' \
30 -e 's/WebKit-1.0/WebKit-3.0/' \ 26 -e 's/WebKit-1.0/WebKit-3.0/' \