[crux-commits] ports/opt (3.5): webkitgtk: 2.28.2 -> 2.28.3

crux at crux.nu crux at crux.nu
Thu Jul 9 12:46:50 UTC 2020


commit 91bf0e665c610daf172f1d94fc599993709e7481
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jul 9 22:46:39 2020 +1000

    webkitgtk: 2.28.2 -> 2.28.3

diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint
index 9b057a290..fbf44eb80 100644
--- a/webkitgtk/.footprint
+++ b/webkitgtk/.footprint
@@ -224,11 +224,11 @@ 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.16.5
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.16.5
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.16.6
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.16.6
 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.44.4
--rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.44.4
+lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.44.5
+-rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.44.5
 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
diff --git a/webkitgtk/.signature b/webkitgtk/.signature
index d835a0978..f914111a3 100644
--- a/webkitgtk/.signature
+++ b/webkitgtk/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TAzfn2t2Oy+Ypkej3kwvHpMmkuI7MFyGGLGS3RTtnrNQu59Ax9WkWK7Na5Z/hVNSLRQAw/KaZigCGv7xVLkNgU=
-SHA256 (Pkgfile) = 27653d23866f843a67b54d5e1259aa97f470cbccd0a733a32fa1f9d9af37a2f9
-SHA256 (.footprint) = 1a5460e63025b9b5535394d6bfa42182ef4f51ac6c87d592f482f29b32a8c80c
-SHA256 (webkitgtk-2.28.2.tar.xz) = b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd
+RWSE3ohX2g5d/TEdClx0M6dwgoVb1D4MzNzgCI9Sx2H2/m5B+Q/8oqKpcDnqK2vsTgAeaA0oIj3WA6HeDDap07uQyFNv9+Fiegk=
+SHA256 (Pkgfile) = 9e953d11bfff3d0973ce6c1978322158df8308072914edaa719cd84c64544a73
+SHA256 (.footprint) = 789535564f12ae347332645121b2706ff5e87dc0a769b4ae59ae2a3bb5f3be38
+SHA256 (webkitgtk-2.28.3.tar.xz) = f0898ac072c220e13a4aee819408421a6cb56a6eb89170ceafe52468b0903522
diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile
index 9b60d8715..3df6a5680 100644
--- a/webkitgtk/Pkgfile
+++ b/webkitgtk/Pkgfile
@@ -1,34 +1,24 @@
 # 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 hyphen libsecret libsoup libwebp ruby woff2 xorg-libxt bubblewrap xdg-dbus-proxy libseccomp libxslt
+# Depends on: bubblewrap gst-plugins-base gtk gtk3 harfbuzz-icu hyphen libseccomp libsecret libsoup libwebp libxslt ruby woff2 xdg-dbus-proxy xorg-libxt
 # Optional: enchant libnotify geoclue openjpeg2
 
 name=webkitgtk
-version=2.28.2
+version=2.28.3
 release=1
 source=(https://webkitgtk.org/releases/$name-$version.tar.xz)
 
 build() {
-	mkdir build
-	cd $name-$version
-
 	# Make sure we do not have ccache masquerade directory in PATH.
-	# Use -DCMAKE_CXX_COMPILER_LAUNCHER=ccache instead of providing a wrapped compiler
-	if [ -e '/usr/bin/ccache' ]; then
-		#PKGMK_WEBKITGTK+=' -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
-		PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
-	fi
+	[ -e '/usr/bin/ccache' ] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
 
 	prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF'
 	prt-get isinst enchant || PKGMK_WEBKITGTK+=' -DENABLE_SPELLCHECK=OFF'
 	prt-get isinst libnotify && PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=OFF'
 	prt-get isinst geoclue && PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=OFF'
 
-	cd ../build
-
-	cmake ../$name-$version ${PKGMK_WEBKITGTK} \
-		-G Ninja \
+	cmake -S$name-$version -Bbuild -GNinja ${PKGMK_WEBKITGTK} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 		-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
@@ -39,8 +29,8 @@ build() {
 		-DUSE_SYSTEM_MALLOC=ON \
 		-Wno-dev
 
-	ninja -j ${JOBS-1}
-	DESTDIR=$PKG ninja install
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 
 	rm -r $PKG/usr/share/locale
 }


More information about the crux-commits mailing list