CVS commit: pkgsrc/www

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Sat Apr  3 10:19:03 UTC 2021

Modified Files:
        pkgsrc/www/webkit24-gtk: Makefile.common
        pkgsrc/www/webkit24-gtk3: Makefile

Log Message:
webkit24-gtk: Use the same glib-2.68.0 fix


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/webkit24-gtk/Makefile.common
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/webkit24-gtk3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/webkit24-gtk/Makefile.common
diff -u pkgsrc/www/webkit24-gtk/Makefile.common:1.20 pkgsrc/www/webkit24-gtk/Makefile.common:1.21
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.20        Thu Dec 31 20:04:14 2020
+++ pkgsrc/www/webkit24-gtk/Makefile.common     Sat Apr  3 10:19:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2020/12/31 20:04:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.21 2021/04/03 10:19:03 cirnatdan Exp $
 # used by www/webkit24-gtk/Makefile
 # used by www/webkit24-gtk3/Makefile
 
@@ -83,6 +83,10 @@ CPPFLAGS+=           -DUSE_SYSTEM_MALLOC
 LDFLAGS+=      -Wl,-no-keep-memory -Wl,-reduce-memory
 .endif
 
+# temporary fix for GLib 2.68 breakage
+# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
+CXXFLAGS+=     -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
+
 .include "../../mk/atomic64.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/www/webkit24-gtk3/Makefile
diff -u pkgsrc/www/webkit24-gtk3/Makefile:1.37 pkgsrc/www/webkit24-gtk3/Makefile:1.38
--- pkgsrc/www/webkit24-gtk3/Makefile:1.37      Fri Apr  2 15:19:45 2021
+++ pkgsrc/www/webkit24-gtk3/Makefile   Sat Apr  3 10:19:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/04/02 15:19:45 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.38 2021/04/03 10:19:03 cirnatdan Exp $
 
 PKGREVISION= 32
 .include "../../www/webkit24-gtk/Makefile.common"
@@ -11,10 +11,6 @@ CONFIGURE_ARGS+=     --with-gtk=3.0
 CONFIGURE_ARGS+=       --disable-gtk-doc-html
 CONFIGURE_ARGS+=       --disable-webkit2
 
-# temporary fix for GLib 2.68 breakage
-# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
-CXXFLAGS+=             -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
-
 # Automatically generate PLIST from www/webkit24-gtk/PLIST
 .PHONY: print-PLIST-from-gtk
 print-PLIST-from-gtk: