Fri Apr 2 15:19:46 2021 UTC ()
webkit24-gtk3: Fix build with glib-2.68.0


(cirnatdan)
diff -r1.36 -r1.37 pkgsrc/www/webkit24-gtk3/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/www/webkit24-gtk3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit24-gtk3/Attic/Makefile 2020/11/06 15:30:11 1.36
+++ pkgsrc/www/webkit24-gtk3/Attic/Makefile 2021/04/02 15:19:45 1.37
@@ -1,26 +1,30 @@ @@ -1,26 +1,30 @@
1# $NetBSD: Makefile,v 1.36 2020/11/06 15:30:11 nia Exp $ 1# $NetBSD: Makefile,v 1.37 2021/04/02 15:19:45 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
14# Automatically generate PLIST from www/webkit24-gtk/PLIST 18# Automatically generate PLIST from www/webkit24-gtk/PLIST
15.PHONY: print-PLIST-from-gtk 19.PHONY: print-PLIST-from-gtk
16print-PLIST-from-gtk: 20print-PLIST-from-gtk:
17 ${RUN}${SED} \ 21 ${RUN}${SED} \
18 -e 's/jsc-1/jsc-3/' \ 22 -e 's/jsc-1/jsc-3/' \
19 -e 's/javascriptcoregtk-1.0/javascriptcoregtk-3.0/' \ 23 -e 's/javascriptcoregtk-1.0/javascriptcoregtk-3.0/' \
20 -e 's/webkit-1.0.pc/webkitgtk-3.0.pc/' \ 24 -e 's/webkit-1.0.pc/webkitgtk-3.0.pc/' \
21 -e 's/webkit-1.0/webkit-3.0/' \ 25 -e 's/webkit-1.0/webkit-3.0/' \
22 -e 's/webkit-2.0/webkit-3.0/' \ 26 -e 's/webkit-2.0/webkit-3.0/' \
23 -e 's/webkitgtk-2.0.mo/webkitgtk-3.0.mo/' \ 27 -e 's/webkitgtk-2.0.mo/webkitgtk-3.0.mo/' \
24 -e 's/webkitgtk-1.0/webkitgtk-3.0/' \ 28 -e 's/webkitgtk-1.0/webkitgtk-3.0/' \
25 -e 's/JSCore-1.0/JSCore-3.0/' \ 29 -e 's/JSCore-1.0/JSCore-3.0/' \
26 -e 's/WebKit-1.0/WebKit-3.0/' \ 30 -e 's/WebKit-1.0/WebKit-3.0/' \