ports/contrib (3.4): [notify] webkitgtk: 2.18.6 -> 2.20.0 new dependency woff2

crux at crux.nu crux at crux.nu
Wed Mar 14 12:41:19 UTC 2018


commit 495c85aeec62ea6d81f7542b93b64e3ee204aabd
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Wed Mar 14 22:25:41 2018 +1100

    [notify] webkitgtk: 2.18.6 -> 2.20.0 new dependency woff2

diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint
index 222de5db..f2936379 100644
--- a/webkitgtk/.footprint
+++ b/webkitgtk/.footprint
@@ -75,6 +75,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-4.0/webkit2/
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebPage.h
+-rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebResource.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebView.h
 -rw-r--r--	root/root	usr/include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
@@ -204,11 +205,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.6.15
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.6.15
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.7.8
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-4.0.so.18.7.8
 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.24.9
--rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.24.9
+lrwxrwxrwx	root/root	usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.28.0
+-rwxr-xr-x	root/root	usr/lib/libwebkit2gtk-4.0.so.37.28.0
 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/.md5sum b/webkitgtk/.md5sum
index c44994f2..27664f15 100644
--- a/webkitgtk/.md5sum
+++ b/webkitgtk/.md5sum
@@ -1,2 +1 @@
-6700854d41a714c73085242af39f1f5a  enchant-2.patch
-c1a548595135ee75ad3bf2e18ac83112  webkitgtk-2.18.6.tar.xz
+51cc47345c3ec53802718cd6fc9b746f  webkitgtk-2.20.0.tar.xz
diff --git a/webkitgtk/.signature b/webkitgtk/.signature
index b72c7731..2d832475 100644
--- a/webkitgtk/.signature
+++ b/webkitgtk/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zXVJa44XuVC2C4zRbyuY2FPOeyzt69LMc9TVSHv0Z1ld5O2u2iUu8epb13QGeT/0uB6I9mKRUoeeAnrW4Cf+ws=
-SHA256 (Pkgfile) = a4d83ff7419519adc216d2145eed6a0a184f96d059ed246d17dc5760289127bd
-SHA256 (.footprint) = 1d9c6cf7142a7529f10c7c50357b251bc87d149bc80203309a3f3ddd5d4400d7
-SHA256 (webkitgtk-2.18.6.tar.xz) = 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c
-SHA256 (enchant-2.patch) = ed8e5fe614ed800da3caccb8162bdd2d8dbd5a69ab90d426b34e124dee5cf1b6
+RWSagIOpLGJF38l44EOaiz060amkIF6fqyismzhZuIPfrEprBmz9v7nTRsN+v3pvP4Bz/KjqTRpZ3hzj5zSUJz7cv3jXgBniegM=
+SHA256 (Pkgfile) = 637ffda3b7c11543169d23e38e9f7bccdfc318bb8aeb8a7b5b53cfda1cbd7dc6
+SHA256 (.footprint) = 3fce2f34e483810fe3cde313b4ee91862e2add70bf5d7597bdb9db23f9361ca8
+SHA256 (webkitgtk-2.20.0.tar.xz) = 57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c
diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile
index c64ac254..90dab11c 100644
--- a/webkitgtk/Pkgfile
+++ b/webkitgtk/Pkgfile
@@ -1,21 +1,18 @@
 # 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-bad gtk harfbuzz-icu hyphen libgudev libsecret libsoup libtasn1 ninja ruby xorg-libxt
+# Depends on: gst-plugins-bad gtk harfbuzz-icu hyphen libgudev libsecret libsoup libtasn1 ninja ruby woff2 xorg-libxt
 # Optional: enchant libnotify geoclue
 
 name=webkitgtk
-version=2.18.6
+version=2.20.0
 release=1
-source=(https://webkitgtk.org/releases/$name-$version.tar.xz
-	enchant-2.patch)
+source=(https://webkitgtk.org/releases/$name-$version.tar.xz)
 
 build() {
 	mkdir build
 	cd $name-$version
 
-	patch -p1 -i $SRC/enchant-2.patch
-
 	# setting CC and CXX breaks compilation
 	if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
 		unset CC CXX
diff --git a/webkitgtk/enchant-2.patch b/webkitgtk/enchant-2.patch
deleted file mode 100644
index 93c98828..00000000
--- a/webkitgtk/enchant-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake
---- webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake	2017-08-09 11:13:53.000000000 +0200
-+++ webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake	2018-01-18 10:06:07.127310881 +0100
-@@ -28,7 +28,7 @@
- # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- find_package(PkgConfig)
--pkg_check_modules(PC_ENCHANT enchant)
-+pkg_check_modules(PC_ENCHANT enchant-2)
- 
- find_path(ENCHANT_INCLUDE_DIRS
-     NAMES enchant.h
-@@ -37,7 +37,7 @@
- )
- 
- find_library(ENCHANT_LIBRARIES
--    NAMES enchant
-+    NAMES enchant-2
-     PATHS ${PC_ENCHANT_LIBDIR}
-           ${PC_ENCHANT_LIBRARY_DIRS}
- )


More information about the CRUX mailing list