From 2eda07484391156e369f6a97a00891c0caebca81 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Fri, 15 Mar 2019 22:34:28 +1100 Subject: [PATCH] webkitgtk: 2.22.7 -> 2.24.0 --- webkitgtk/.footprint | 13 ++++++++----- webkitgtk/.signature | 8 ++++---- webkitgtk/Pkgfile | 35 ++++++++--------------------------- 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint index bd9023a96..2247bd945 100644 --- a/webkitgtk/.footprint +++ b/webkitgtk/.footprint @@ -18,6 +18,7 @@ drwxr-xr-x root/root usr/include/webkitgtk-4.0/jsc/ -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCContext.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCDefines.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCException.h +-rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCOptions.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCValue.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCVersion.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/jsc/JSCVirtualMachine.h @@ -38,6 +39,7 @@ drwxr-xr-x root/root usr/include/webkitgtk-4.0/webkit2/ -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitCookieManager.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitCredential.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitDefines.h +-rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitDeviceInfoPermissionRequest.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitDownload.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitEditorState.h @@ -75,7 +77,9 @@ drwxr-xr-x root/root usr/include/webkitgtk-4.0/webkit2/ -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitURIRequest.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitURIResponse.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h +-rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitURIUtilities.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitUserContent.h +-rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h -rw-r--r-- root/root usr/include/webkitgtk-4.0/webkit2/WebKitVersion.h @@ -216,11 +220,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.11.8 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.11.8 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.13.3 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.13.3 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.33.8 --rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.33.8 +lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.37.2 +-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.37.2 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 @@ -230,7 +234,6 @@ drwxr-xr-x root/root usr/lib/webkit2gtk-4.0/ -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/.signature b/webkitgtk/.signature index 3fa90378b..866f69971 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VXgueaZJ01BGKKuRHdAtXUev7ed/qC3aSqGC9FYqCaWS6LZ8nRZz60+XLGIsEqNZhxe3uOlw1TuEuH/nszuAA0= -SHA256 (Pkgfile) = 1c2179f00a74e979a903fba3ff975ea71baec14f4cfee7957a0a683c7a0eeee4 -SHA256 (.footprint) = 0edd514793e5e64883551e9f3b48b585fbc5f46d49a108423e7f5ed0bd0b4a25 -SHA256 (webkitgtk-2.22.7.tar.xz) = 4be6f7d605cd0a690fd26e8aa83b089a33ad9d419148eafcfb60580dd2af30ff +RWSE3ohX2g5d/eHL+wIZQJkDvZ5AdtMr34SwXmW/Ozn9CArLI1FQ6nwF1wBEBuD9bV57ZYA5JyrzIwJvFK8CKQbuu06ZEpX4DgY= +SHA256 (Pkgfile) = 638009c24824e4d9c94d9a8028159191f679fcbe176374ee90e817c7651d9a9e +SHA256 (.footprint) = 12ce6b23333490a423d5ed05787b92834c7fe23ec0207d52234228dd9c847957 +SHA256 (webkitgtk-2.24.0.tar.xz) = 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407 diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index 2bc1fb1b9..937b94e8a 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -5,7 +5,7 @@ # Optional: enchant libnotify geoclue name=webkitgtk -version=2.22.7 +version=2.24.0 release=1 source=(https://webkitgtk.org/releases/$name-$version.tar.xz) @@ -14,35 +14,16 @@ build() { cd $name-$version # setting CC and CXX breaks compilation - if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then - unset CC CXX - export PATH="/usr/lib/ccache/:$PATH" - fi + prt-get isinst ccache && unset CC CXX; export PATH="/usr/lib/ccache/:$PATH" - local SPELLCHECK - if [ "$(pkginfo -i | grep '^enchant ')" ]; then - SPELLCHECK='' - else - SPELLCHECK='-DENABLE_SPELLCHECK=OFF' - fi - - local NOTIFY - if [ "$(pkginfo -i | grep '^libnotify ')" ]; then - NOTIFY='-DUSE_LIBNOTIFY=ON' - else - NOTIFY='-DUSE_LIBNOTIFY=OFF' - fi - - local GEOLOCATION - if [ "$(pkginfo -i | grep '^geoclue ')" ]; then - GEOLOCATION='-DENABLE_GEOLOCATION=ON' - else - GEOLOCATION='-DENABLE_GEOLOCATION=OFF' - fi + prt-get isinst openjpeg || 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 \ + cmake ../$name-$version ${PKGMK_WEBKITGTK} \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ @@ -52,7 +33,7 @@ build() { -DPORT=GTK \ -DENABLE_MINIBROWSER=ON \ -DUSE_SYSTEM_MALLOC=ON \ - -Wno-dev $GEOLOCATION $SPELLCHECK $NOTIFY + -Wno-dev ninja -j ${JOBS-1} DESTDIR=$PKG ninja install