diff --git a/webkitgtk-60/.footprint b/webkitgtk-60/.footprint index 3f0c06a..28ba330 100644 --- a/webkitgtk-60/.footprint +++ b/webkitgtk-60/.footprint @@ -1,6 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/WebKitWebDriver +-rwxr-xr-x root/root usr/bin/WebKitWebDriver-6.0 drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/webkitgtk-6.0/ drwxr-xr-x root/root usr/include/webkitgtk-6.0/jsc/ diff --git a/webkitgtk-60/.signature b/webkitgtk-60/.signature index 2d2b1b5..8a58c51 100644 --- a/webkitgtk-60/.signature +++ b/webkitgtk-60/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxHVw3I00Fe1kLIKeGueeMd30KRq1JCjYnhPYTYrhUmpsUMNqBOfFT+zL+Hytywto5ZGHD7oS4ju+1xzeOv0aOw4= -SHA256 (Pkgfile) = 0dad02c60cc3144049f275d88dcdf10189015812b381ce17400b901d188fba89 -SHA256 (.footprint) = c750db9958f4a2a40e28b50887586bc3f8b44b09973bd0f4640866f76328bd48 +RWTTPlFarK9CxKK3l7S7WjE5JXAUwgsmgV8UnWK5NX/lYJSO7+E2EB9zRr+hBoCeYGs2jTR7m9X5blA7lPXeNzOQvMd/2EFfTA8= +SHA256 (Pkgfile) = ae20d6fb890b1588af11339ca447f75ee7ec30706c305ad20170ef319b90da34 +SHA256 (.footprint) = 2ed2899025e2cfa90e14f2747c9c963611b6da7ff372c82642114c6fdaffb461 SHA256 (webkitgtk-2.41.4.tar.xz) = ad792d4acd4e8536cc0a652fd0303bfef93a7f8718d2b3d72db83e25f52777af diff --git a/webkitgtk-60/Pkgfile b/webkitgtk-60/Pkgfile index eed7780..641c410 100644 --- a/webkitgtk-60/Pkgfile +++ b/webkitgtk-60/Pkgfile @@ -48,4 +48,7 @@ build() { DESTDIR=$PKG ninja -C build install rm -r $PKG/usr/share/locale + + # avoid a conflict with the webkitgtk footprint + mv $PKG/usr/bin/WebKitWebDriver $PKG/usr/bin/WebKitWebDriver-6.0 } diff --git a/webkitgtk-60/README b/webkitgtk-60/README index 4aaca9c..e0a3f84 100644 --- a/webkitgtk-60/README +++ b/webkitgtk-60/README @@ -1,2 +1,9 @@ This unstable branch of webkitgtk only works with bleeding-edge versions of gtk4 (>= 4.11.2). It will not compile with the latest stable gtk4. + +Stable and unstable webkitgtk libraries (soversions 4.0 and 6.0) can +coexist on the same system, but /usr/bin/WebKitWebDriver can only be +owned by one of them. This port avoids the conflict by appending "-6.0" +to the bin filename. You should place a symlink (or a wrapper script) at +the expected location /usr/bin/WebKitWebDriver once you decide which +version of webkitgtk you want to prioritize.