diff options
author | wiz <wiz@pkgsrc.org> | 2022-06-07 20:28:43 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2022-06-07 20:28:43 +0000 |
commit | ac896a8d455c370bfe09e93673c570407e63ed95 (patch) | |
tree | 00283d14797dbd3b4fc7984e1d436d4b5a2ae629 /www | |
parent | b43546a60c9a946bd99130e29e656065a8733d50 (diff) | |
download | pkgsrc-ac896a8d455c370bfe09e93673c570407e63ed95.tar.gz |
webkit-gtk: remove introspection option, enabling it by default
It was default-on, bump PKGREVISION for those who had it disabled.
Diffstat (limited to 'www')
-rw-r--r-- | www/webkit-gtk/Makefile | 8 | ||||
-rw-r--r-- | www/webkit-gtk/PLIST | 14 | ||||
-rw-r--r-- | www/webkit-gtk/buildlink3.mk | 4 | ||||
-rw-r--r-- | www/webkit-gtk/options.mk | 21 |
4 files changed, 18 insertions, 29 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 9b35e4a54ec..c04582b45d1 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -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.32.1 .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" diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST index 5f8018dea25..599a26f0684 100644 --- a/www/webkit-gtk/PLIST +++ b/www/webkit-gtk/PLIST @@ -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/WebKitDOMXPathResult.h 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 diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk index 655036f400e..dca626f2961 100644 --- a/www/webkit-gtk/buildlink3.mk +++ b/www/webkit-gtk/buildlink3.mk @@ -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 diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk index 015ddf70073..67c6883317b 100644 --- a/www/webkit-gtk/options.mk +++ b/www/webkit-gtk/options.mk @@ -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) |