CVS commit: pkgsrc/www/webkit-gtk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  7 20:28:43 UTC 2022

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile PLIST buildlink3.mk options.mk

Log Message:
webkit-gtk: remove introspection option, enabling it by default

It was default-on, bump PKGREVISION for those who had it disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/www/webkit-gtk/PLIST
cvs rdiff -u -r1.89 -r1.90 pkgsrc/www/webkit-gtk/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/webkit-gtk/options.mk

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

Modified files:

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.227 pkgsrc/www/webkit-gtk/Makefile:1.228
--- pkgsrc/www/webkit-gtk/Makefile:1.227        Mon May 30 20:40:55 2022
+++ pkgsrc/www/webkit-gtk/Makefile      Tue Jun  7 20:28:43 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.227 2022/05/30 20:40:55 leot Exp $
+# $NetBSD: Makefile,v 1.228 2022/06/07 20:28:43 wiz Exp $
 
 DISTNAME=      webkitgtk-2.36.3
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -50,6 +50,7 @@ CMAKE_ARGS+=          -DENABLE_X11_TARGET=ON
 CMAKE_ARGS+=           -DENABLE_MINIBROWSER=ON
 CMAKE_ARGS+=           -DENABLE_GAMEPAD=OFF
 CMAKE_ARGS+=           -DENABLE_GEOLOCATION=OFF
+CMAKE_ARGS+=           -DENABLE_INTROSPECTION=ON
 CMAKE_ARGS+=           -DENABLE_JOURNALD_LOG=OFF
 CMAKE_ARGS+=           -DENABLE_BUBBLEWRAP_SANDBOX=OFF
 CMAKE_ARGS+=           -DUSE_GSTREAMER_GL=OFF
@@ -142,6 +143,9 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/harfbuzz-icu/buildlink3.mk"

Index: pkgsrc/www/webkit-gtk/PLIST
diff -u pkgsrc/www/webkit-gtk/PLIST:1.83 pkgsrc/www/webkit-gtk/PLIST:1.84
--- pkgsrc/www/webkit-gtk/PLIST:1.83    Sun May 29 17:47:15 2022
+++ pkgsrc/www/webkit-gtk/PLIST Tue Jun  7 20:28:43 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.83 2022/05/29 17:47:15 leot Exp $
+@comment $NetBSD: PLIST,v 1.84 2022/06/07 20:28:43 wiz Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -216,9 +216,9 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
 include/webkitgtk-4.0/webkitdom/webkitdom.h
 include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
 include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
-${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
-${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
-${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
+lib/girepository-1.0/JavaScriptCore-4.0.typelib
+lib/girepository-1.0/WebKit2-4.0.typelib
+lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
 lib/libjavascriptcoregtk-4.0.so.18.20.7
@@ -233,9 +233,9 @@ libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
-${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
+share/gir-1.0/JavaScriptCore-4.0.gir
+share/gir-1.0/WebKit2-4.0.gir
+share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo

Index: pkgsrc/www/webkit-gtk/buildlink3.mk
diff -u pkgsrc/www/webkit-gtk/buildlink3.mk:1.89 pkgsrc/www/webkit-gtk/buildlink3.mk:1.90
--- pkgsrc/www/webkit-gtk/buildlink3.mk:1.89    Sun May 29 17:47:15 2022
+++ pkgsrc/www/webkit-gtk/buildlink3.mk Tue Jun  7 20:28:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.89 2022/05/29 17:47:15 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.90 2022/06/07 20:28:43 wiz Exp $
 
 BUILDLINK_TREE+=       webkit-gtk
 
@@ -15,7 +15,7 @@ GCC_REQD+=    8
 pkgbase := webkit-gtk
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
+.if ${PKG_BUILD_OPTIONS.webkit-gtk:Menchant}
 .include "../../textproc/enchant2/buildlink3.mk"
 .endif
 

Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.22 pkgsrc/www/webkit-gtk/options.mk:1.23
--- pkgsrc/www/webkit-gtk/options.mk:1.22       Sun May 29 17:47:15 2022
+++ pkgsrc/www/webkit-gtk/options.mk    Tue Jun  7 20:28:43 2022
@@ -1,16 +1,14 @@
-# $NetBSD: options.mk,v 1.22 2022/05/29 17:47:15 leot Exp $
+# $NetBSD: options.mk,v 1.23 2022/06/07 20:28:43 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland
-PKG_SUGGESTED_OPTIONS= enchant introspection opengl
+PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit wayland
+PKG_SUGGESTED_OPTIONS= enchant opengl
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
 PKG_SUGGESTED_OPTIONS+=        wayland
 .endif
 
-PLIST_VARS=    introspection
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 #
@@ -72,19 +70,6 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 .endif
 
 #
-# Introspection
-#
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection=                           yes
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CMAKE_ARGS+=   -DENABLE_INTROSPECTION=ON
-.else
-CMAKE_ARGS+=   -DENABLE_INTROSPECTION=OFF
-.endif
-
-#
 # Wayland display server support
 #
 .if !empty(PKG_OPTIONS:Mwayland)