pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www webkit24-gtk: Use the same glib-2.68.0 fix



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e1aee59b0fd
branches:  trunk
changeset: 449662:0e1aee59b0fd
user:      cirnatdan <cirnatdan%pkgsrc.org@localhost>
date:      Sat Apr 03 10:19:03 2021 +0000

description:
webkit24-gtk: Use the same glib-2.68.0 fix

diffstat:

 www/webkit24-gtk/Makefile.common |  6 +++++-
 www/webkit24-gtk3/Makefile       |  6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 547beef0af56 -r 0e1aee59b0fd www/webkit24-gtk/Makefile.common
--- a/www/webkit24-gtk/Makefile.common  Sat Apr 03 10:14:31 2021 +0000
+++ b/www/webkit24-gtk/Makefile.common  Sat Apr 03 10:19:03 2021 +0000
@@ -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 @@
 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"
diff -r 547beef0af56 -r 0e1aee59b0fd www/webkit24-gtk3/Makefile
--- a/www/webkit24-gtk3/Makefile        Sat Apr 03 10:14:31 2021 +0000
+++ b/www/webkit24-gtk3/Makefile        Sat Apr 03 10:19:03 2021 +0000
@@ -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+=       --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:



Home | Main Index | Thread Index | Old Index