Hi people.
I'd like to remove the gtk+2 dependency from webkitgtk4.
It's only needed for legacy plugins like flash (*huh*)...
Does anyone have a use for this? If not, I intend to commit this rather sooner
than later after it passes a bulk in case some ports inheritated the gtk+2
dependency from webkitgtk4.
Landry, what do you think about it?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 20 Nov 2015 14:35:52 -0000 1.31
+++ Makefile 18 Dec 2015 17:53:27 -0000
@@ -16,7 +16,7 @@ EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
DPB_PROPERTIES = parallel
-REVISION = 0
+REVISION = 1
SHARED_LIBS += javascriptcoregtk-${API} 1.0 # 18.0
SHARED_LIBS += webkit2gtk-${API} 1.1 # 37.2
@@ -31,15 +31,14 @@ MAINTAINER = Landry Breuil <landry@open
# LGPLv2 and BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += EGL GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender Xt atk-1.0 c cairo cairo-gobject
-WANTLIB += enchant fontconfig freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gstapp-1.0
-WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
-WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gtk-3 gtk-x11-2.0
-WANTLIB += harfbuzz harfbuzz-icu hyphen icui18n icuuc jpeg m notify
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread secret-1
-WANTLIB += soup-2.4 sqlite3 webp xml2 xslt z
+WANTLIB += EGL GL X11 Xcomposite Xdamage Xrender Xt atk-1.0 c
+WANTLIB += cairo cairo-gobject enchant fontconfig freetype gdk-3
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
+WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gtk-3 harfbuzz
+WANTLIB += harfbuzz-icu hyphen icui18n icuuc jpeg m notify pango-1.0
+WANTLIB += pangocairo-1.0 png pthread secret-1 soup-2.4 sqlite3
+WANTLIB += webp xml2 xslt z
MASTER_SITES = http://webkitgtk.org/releases/
@@ -78,7 +77,6 @@ LIB_DEPENDS = devel/harfbuzz,-icu \
textproc/hyphen \
textproc/libxslt \
x11/gnome/libsecret \
- x11/gtk+2 \
x11/gtk+3
CFLAGS += -I${X11BASE}/include
@@ -86,7 +84,8 @@ LDFLAGS = -L${X11BASE}/lib
CONFIGURE_ARGS = -DPORT=GTK \
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
- -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}"
+ -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+ -DENABLE_PLUGIN_PROCESS_GTK2=OFF
# sync with Source/JavaScriptCore/assembler/MacroAssembler.h
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 23 Sep 2015 06:06:11 -0000 1.4
+++ pkg/PLIST 18 Dec 2015 17:53:27 -0000
@@ -293,7 +293,6 @@ libexec/webkit2gtk-${API}/
@bin libexec/webkit2gtk-${API}/WebKitDatabaseProcess
@bin libexec/webkit2gtk-${API}/WebKitNetworkProcess
@bin libexec/webkit2gtk-${API}/WebKitPluginProcess
-@bin libexec/webkit2gtk-${API}/WebKitPluginProcess2
@bin libexec/webkit2gtk-${API}/WebKitWebProcess
share/gir-1.0/JavaScriptCore-${API}.gir
share/gir-1.0/WebKit2-${API}.gir
--
Antoine
