ports/contrib (3.3): [notify] webkitgtk: 2.16.5 -> 2.18.3 new dependencies: gst-plugins-bad hyphen libtasn1 ninja

26 Nov 2017

commit 9bfec4cff2bc4f4db4a5ec4a4deb87dfa9aa7631
Author: Danny Rawlins <monster.romster@gmail.com>
Date:   Sun Nov 26 22:11:10 2017 +1100

    [notify] webkitgtk: 2.16.5 -> 2.18.3 new dependencies: gst-plugins-bad hyphen libtasn1 ninja

diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint
index e6393822..fbc7430a 100644
--- a/webkitgtk/.footprint
+++ b/webkitgtk/.footprint
@@ -1,4 +1,6 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/WebKitWebDriver
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/
 drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/JavaScriptCore/
@@ -11,8 +13,10 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/JavaScriptCore/
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
 drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/webkit2/
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -44,6 +48,8 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/webkit2/
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitNotification.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitPlugin.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
@@ -88,6 +94,8 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/webkitdom/
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
@@ -196,21 +204,21 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2-4.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so -> libjavascriptcoregtk-4.0.so.18
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.5.12
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.5.12
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.6.12
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.6.12
 lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so -> libwebkit2gtk-4.0.so.37
-lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.19.8
--rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.19.8
+lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.24.6
+-rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.24.6
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-4.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit2gtk-4.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
 drwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/MiniBrowser
--rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitDatabaseProcess
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitNetworkProcess
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitPluginProcess
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitPluginProcess2
+-rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitStorageProcess
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/WebKitWebProcess
 drwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/injected-bundle/
 -rwxr-xr-x	root/root	usr/lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
diff --git a/webkitgtk/.md5sum b/webkitgtk/.md5sum
index cfe30179..d73b304d 100644
--- a/webkitgtk/.md5sum
+++ b/webkitgtk/.md5sum
@@ -1 +1 @@
-fce72dc89cd310a663d9eb97133861fe  webkitgtk-2.16.5.tar.xz
+264a22d7467deae606e42b6eb5dd65af  webkitgtk-2.18.3.tar.xz
diff --git a/webkitgtk/.signature b/webkitgtk/.signature
index 848bd358..699f7101 100644
--- a/webkitgtk/.signature
+++ b/webkitgtk/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38NkXfBiKHqqMnktW4m26Xjt+3DmBFC2l9Dmx26daFzePHASvZVfevRrK4PhzLEHYZzjRTmoYq7JIcwuMeCmFAc=
-SHA256 (Pkgfile) = ea97a92243ca474de642be44f78c52dcd687b5e1f2f3feb17f8ba50a73dfb25d
-SHA256 (.footprint) = 9d0e180f15b1a4f848a1a16b64a19afb35cfcccac40849e326cc9ad7d5eaf8e8
-SHA256 (webkitgtk-2.16.5.tar.xz) = 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4
+RWSagIOpLGJF3zQ0EmxBH6cOMmbsyANEmJLxGNW8pHuXhxtU3kb86YTTKtfkZ2fHJm70NFVD7t3OTDx9IJUaq9lAs5k5hhoPaAs=
+SHA256 (Pkgfile) = c763192232df6c0ae2dfa07dd389718a771d39f23fa10f6971fe00b5a6fd6808
+SHA256 (.footprint) = 022247d08094bfe88c2a4d77acfda0f6dddb87e6f8d3e462c57db7025778ecea
+SHA256 (webkitgtk-2.18.3.tar.xz) = e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e
diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile
index d9e27176..c10c2573 100644
--- a/webkitgtk/Pkgfile
+++ b/webkitgtk/Pkgfile
@@ -1,15 +1,16 @@
 # Description: Small, efficient and fast rendering engine for Web Browsers.
 # URL: https://www.webkitgtk.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: gst-plugins-base gtk gtk3 harfbuzz-icu libgudev libsecret libsoup libwebp ruby xorg-libxt
-# Optional: enchant libnotify
+# Depends on: gst-plugins-bad gtk harfbuzz-icu hyphen libgudev libsecret libsoup libtasn1 ninja ruby xorg-libxt
+# Optional: enchant libnotify geoclue
 
 name=webkitgtk
-version=2.16.5
+version=2.18.3
 release=1
 source=(https://webkitgtk.org/releases/$name-$version.tar.xz)
 
 build() {
+	mkdir build
 	cd $name-$version
 
 	# setting CC and CXX breaks compilation
@@ -32,22 +33,29 @@ build() {
                 NOTIFY='-DUSE_LIBNOTIFY=OFF'
         fi
 
-	install -d build
-	cd build
+	local GEOLOCATION
+        if [ "$(pkginfo -i | grep '^geoclue ')" ]; then
+                GEOLOCATION='-DENABLE_GEOLOCATION=ON'
+        else
+                GEOLOCATION='-DENABLE_GEOLOCATION=OFF'
+        fi
 
-	cmake .. \
+	cd ../build
+
+	cmake ../$name-$version \
+		-G Ninja \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 		-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
 		-DCMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DPORT=GTK \
-		-DUSE_LIBHYPHEN=OFF \
 		-DENABLE_MINIBROWSER=ON \
-		-Wno-dev \
-		-DENABLE_GEOLOCATION=OFF $SPELLCHECK $NOTIFY
-	make
-	make DESTDIR=$PKG install
+		-DUSE_SYSTEM_MALLOC=ON \
+		-Wno-dev $GEOLOCATION $SPELLCHECK $NOTIFY
+
+	ninja -j ${JOBS-1}
+	DESTDIR=$PKG ninja install
 
 	rm -r $PKG/usr/share/locale
 }

    

crux＠crux.nu

tags

participants (1)