diff --git a/REPO b/REPO index e1430ed..01ba7d1 100644 --- a/REPO +++ b/REPO @@ -12,7 +12,6 @@ d:xournalpp d:texlive-base d:jp2a d:python3-agate-excel -d:python3-sqlalchemy d:librsync d:sbcl d:labwc @@ -34,7 +33,6 @@ d:sfwbar d:kitty d:recode d:zathura-pdf-poppler -d:webkitgtk-60 d:libfreeimage-lite d:libfixposix d:epiphany @@ -107,9 +105,6 @@ f:f20b6a834f26f6502d605cf9fda3e58b:jp2a/.footprint f:9fc1a9cdaeed92b8cf117c69a6756301:python3-agate-excel/.signature f:28cf36fc9dd94a5fb7884319c526e4f7:python3-agate-excel/Pkgfile f:d7f8036673b58d23191529e107495a05:python3-agate-excel/.footprint -f:d33237b0d4c0dd5d74217a21f772e7fa:python3-sqlalchemy/.signature -f:1629f2112389bffef4d8ff91ce1de03d:python3-sqlalchemy/Pkgfile -f:9d527e4b9af644ab3008aedc0a7ce88c:python3-sqlalchemy/.footprint f:1cc611db3a5ff7830999546fcd8e1c76:librsync/.signature f:594ca9ecf32fdb415d3b7e19558e441b:librsync/Pkgfile f:cdefc83fffba86a176801cdf2b4d0683:librsync/.footprint @@ -178,18 +173,14 @@ f:e1cf1c12ed92637910cf5b565c97070c:recode/.footprint f:7651f4129adc39769742da14b15b81a4:zathura-pdf-poppler/.signature f:6f20e58ad296314f506976a66073e432:zathura-pdf-poppler/Pkgfile f:3961411333908c5200c5ba74f8240798:zathura-pdf-poppler/.footprint -f:95ed2c92dd96132378050eca03da25c6:webkitgtk-60/README -f:00f7fdd509c6798a9e8944de5ae6c9c5:webkitgtk-60/.signature -f:0d5f12d6e5a372b9b2b3d1ea3f9f8d68:webkitgtk-60/Pkgfile -f:e690c6bf2a65ab9f1244386d5a1ab79c:webkitgtk-60/.footprint f:0cc425d03faffdcc793b0af7ec749893:libfreeimage-lite/.signature f:c4a660d93a260478a5f4d246be1c260d:libfreeimage-lite/Pkgfile f:55654b9c5c4042bbd1ca6d158629d37a:libfreeimage-lite/.footprint f:3226679cd5db1655a4c15159163ea364:libfixposix/.signature f:71db753215e3f60625b22d48aaca2888:libfixposix/Pkgfile f:4f4524a2130da2b111dbdd57ba1abccb:libfixposix/.footprint -f:0cbd9c7bc46a86e238d89de5ae13992c:epiphany/.signature -f:cf94c17da6a249a01d9ca0f0ac2476d4:epiphany/Pkgfile +f:29237c07a0bf20838ece802084764d01:epiphany/.signature +f:fe5c3a94ba770c0fc4428a74993c52bf:epiphany/Pkgfile f:627ed74e27650ad8b5f860f26a174def:epiphany/post-install f:1d85a0aa812813bace4fe92bbc8aada5:epiphany/.footprint f:259742d9decea4ad6f256a1dd0999279:mblaze/README diff --git a/epiphany/.signature b/epiphany/.signature index 860e083..23f089b 100644 --- a/epiphany/.signature +++ b/epiphany/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxHdiX3nytUp1IbVkd/57DORUUeZoJvGdHOuUp+x3aIRvcI+NRLR3D0g68ka4XpBmQbF1KDIITMa5iovazBlG7wo= -SHA256 (Pkgfile) = 7507059b53039e995fa6b60db718011e47f79e749620c2873e9a1b6307dda5bf +RWTTPlFarK9CxLJCS7gEhKQPVJKcz/+EjdQ08dHFv4R5c75aKy1Pw9R6EuUEANBjBjfsZEU9lZ9LH7attRMXUYDuCURN+zfmLAg= +SHA256 (Pkgfile) = 87da8fadb771e0d04046ea6e36893bd361a062712baca9eaa5cf4372f190ffe8 SHA256 (.footprint) = 0e0ed5587dfd1c354189baba8bff0a7347d46bcbc3a2c23922aea517de9c54e8 SHA256 (epiphany-45.2.tar.bz2) = 199401623efc67d2af0e1b50f1920f5ff241ae82954ee0fe09a81f2a51c22fbe diff --git a/epiphany/Pkgfile b/epiphany/Pkgfile index 657445b..f2f3184 100644 --- a/epiphany/Pkgfile +++ b/epiphany/Pkgfile @@ -1,7 +1,7 @@ # Description: A GNOME web browser based on the WebKit rendering engine # URL: https://gitlab.gnome.org/GNOME/epiphany # Maintainer: John McQuah, jmcquah at disroot dot org -# Depends on: appstream libhandy libportal iso-codes webkitgtk-60 gcr libadwaita +# Depends on: appstream libhandy libportal iso-codes webkitgtk gcr libadwaita # Optional: gst-plugins-good gst-plugins-bad gst-libav libnotify enchant name=epiphany diff --git a/webkitgtk-60/.footprint b/webkitgtk-60/.footprint deleted file mode 100644 index 809fc3f..0000000 --- a/webkitgtk-60/.footprint +++ /dev/null @@ -1,126 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/WebKitWebDriver-60 -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/ --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCClass.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCContext.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCDefines.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCException.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCOptions.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCValue.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCVersion.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCVirtualMachine.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/JSCWeakValue.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/jsc/jsc.h -drwxr-xr-x root/root usr/include/webkitgtk-6.0/webkit/ --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitApplicationInfo.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitAuthenticationRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitAutocleanups.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitAutomationSession.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitBackForwardList.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitBackForwardListItem.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitClipboardPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitColorChooserRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitContextMenu.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitContextMenuActions.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitContextMenuItem.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitCookieManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitCredential.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitDefines.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitDeviceInfoPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitDownload.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitEditingCommands.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitEditorState.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitEnumTypes.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitError.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFaviconDatabase.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFeature.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFileChooserRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFindController.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFormSubmissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitFrame.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitGeolocationManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitGeolocationPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitHitTestResult.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitInputMethodContext.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitInstallMissingMediaPluginsPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitMediaKeySystemPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitMemoryPressureSettings.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNavigationAction.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNavigationPolicyDecision.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNetworkProxySettings.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNetworkSession.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNotification.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitNotificationPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitOptionMenu.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitOptionMenuItem.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitPermissionStateQuery.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitPointerLockPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitPolicyDecision.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitPrintOperation.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitResponsePolicyDecision.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitScriptDialog.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitScriptWorld.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitSecurityManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitSecurityOrigin.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitSettings.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitURIRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitURIResponse.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitURISchemeRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitURISchemeResponse.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitURIUtilities.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitUserContent.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitUserContentFilterStore.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitUserContentManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitUserMediaPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitUserMessage.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitVersion.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebContext.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebEditor.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebFormManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebHitTestResult.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebInspector.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebPage.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebProcessEnumTypes.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebProcessExtension.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebResource.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebView.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebViewBase.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebViewSessionState.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebsiteData.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebsiteDataAccessPermissionRequest.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebsiteDataManager.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWebsitePolicies.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/WebKitWindowProperties.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/webkit-web-process-extension.h --rw-r--r-- root/root usr/include/webkitgtk-6.0/webkit/webkit.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/girepository-1.0/ --rw-r--r-- root/root usr/lib/girepository-1.0/JavaScriptCore-6.0.typelib --rw-r--r-- root/root usr/lib/girepository-1.0/WebKit-6.0.typelib --rw-r--r-- root/root usr/lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so -> libjavascriptcoregtk-6.0.so.1 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.14 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.1.14 -lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so -> libwebkitgtk-6.0.so.4 -lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.8 --rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.4.8 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-6.0.pc --rw-r--r-- root/root usr/lib/pkgconfig/webkitgtk-6.0.pc --rw-r--r-- root/root usr/lib/pkgconfig/webkitgtk-web-process-extension-6.0.pc -drwxr-xr-x root/root usr/lib/webkitgtk-6.0/ --rwxr-xr-x root/root usr/lib/webkitgtk-6.0/MiniBrowser --rwxr-xr-x root/root usr/lib/webkitgtk-6.0/WebKitNetworkProcess --rwxr-xr-x root/root usr/lib/webkitgtk-6.0/WebKitWebProcess -drwxr-xr-x root/root usr/lib/webkitgtk-6.0/injected-bundle/ --rwxr-xr-x root/root usr/lib/webkitgtk-6.0/injected-bundle/libwebkitgtkinjectedbundle.so --rwxr-xr-x root/root usr/lib/webkitgtk-6.0/jsc -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/gir-1.0/ --rw-r--r-- root/root usr/share/gir-1.0/JavaScriptCore-6.0.gir --rw-r--r-- root/root usr/share/gir-1.0/WebKit-6.0.gir --rw-r--r-- root/root usr/share/gir-1.0/WebKitWebProcessExtension-6.0.gir diff --git a/webkitgtk-60/.signature b/webkitgtk-60/.signature deleted file mode 100644 index cfc5881..0000000 --- a/webkitgtk-60/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxGa0e99frsX0MY8NHxgwvZglXAxbI//hRKa6eQC+Wce7YN7UCYYJoPASIV+/MXELbTn0Zh/aN9UoobVXtND+ogg= -SHA256 (Pkgfile) = c708c091f713739259305db367073677a30257ecc33287d1d972eafb682deaf6 -SHA256 (.footprint) = b2acfb994fcbb061babdc44ef8ba5be860afa4c1bb41febf590dfd6e4cdb8566 -SHA256 (webkitgtk-2.42.5.tar.xz) = b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 diff --git a/webkitgtk-60/.watch b/webkitgtk-60/.watch deleted file mode 100755 index 6cbbccf..0000000 --- a/webkitgtk-60/.watch +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -found_stable=0 - -curl -s -L "https://webkitgtk.org/" | \ - while read -r line; do - [ "$found_stable" -eq 1 ] && { wkver=${line%.tar.xz*}; wkver=${wkver#*webkitgtk-}; \ - echo "$wkver"; break; } - [[ "$line" =~ "Stable tarball" ]] && found_stable=1 - done diff --git a/webkitgtk-60/Pkgfile b/webkitgtk-60/Pkgfile deleted file mode 100644 index d697de0..0000000 --- a/webkitgtk-60/Pkgfile +++ /dev/null @@ -1,63 +0,0 @@ -# Description: web rendering engine, built against gtk4 -# URL: https://www.webkitgtk.org/ -# Maintainer: John McQuah, jmcquah at disroot dot org -# Depends on: gtk4 gst-plugins-base hyphen icu lcms2 libseccomp libsecret libsoup3 libwebp ruby unifdef woff2 -# Optional: enchant libjxl libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap pipewire wpebackend-fdo libmanette - -name=webkitgtk-60 -version=2.42.5 -release=1 -source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz) - -build() { - # fail the build if dependencies are not met - [ -e /usr/include/harfbuzz/hb-icu.h ] || \ - { echo "Rebuild harfbuzz with icu present; otherwise webkitgtk will not work."; exit 1; } - - #for p in $SRC/*.patch; do - # patch -Np1 -d webkitgtk-$version -i $p - #done - - PKGMK_WEBKITGTK=(-G Ninja -D CMAKE_BUILD_TYPE=Release - -Wno-dev -D CMAKE_INSTALL_PREFIX:PATH=/usr - -D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib - -D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib - -D CMAKE_SKIP_RPATH=ON - -D PORT=GTK - -D USE_GTK4=ON - -D USE_SOUP2=OFF - -D ENABLE_MINIBROWSER=ON - -D ENABLE_JOURNALD_LOG=OFF - -D ENABLE_DOCUMENTATION=OFF - -D ENABLE_QUARTZ_TARGET=OFF - -D USE_GSTREAMER_TRANSCODER=OFF - -D USER_AGENT_BRANDING=CRUX-3.7) - - if prt-get isinst bubblewrap xdg-dbus-proxy; then - PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=ON) - else - PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=OFF) - fi - - prt-get isinst lld && LDFLAGS+=" -Wl,-fuse-ld=gold" - prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=(-DUSE_OPENJPEG=OFF) - prt-get isinst libjxl || PKGMK_WEBKITGTK+=(-DUSE_JPEGXL=OFF) - prt-get isinst enchant || PKGMK_WEBKITGTK+=(-DENABLE_SPELLCHECK=OFF) - prt-get isinst geoclue && PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=ON) || PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=OFF) - prt-get isinst wpebackend-fdo || PKGMK_WEBKITGTK+=(-DUSE_WPE_RENDERER=OFF) - prt-get isinst libmanette || PKGMK_WEBKITGTK+=(-DENABLE_GAMEPAD=OFF) - prt-get isinst libavif || PKGMK_WEBKITGTK+=(-DUSE_AVIF=OFF) - - cmake -S ${name%-*}-$version -B build "${PKGMK_WEBKITGTK[@]}" \ - -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -DNDEBUG -ffat-lto-objects" \ - -D CMAKE_C_FLAGS_RELEASE="${CFLAGS} -DNDEBUG -ffat-lto-objects" \ - -D CMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" - - ninja -C build -j ${JOBS:-1} - DESTDIR=$PKG ninja -C build install - - rm -r $PKG/usr/share/locale - - # avoid a conflict with the webkitgtk footprint - mv $PKG/usr/bin/WebKitWebDriver{,-60} -} diff --git a/webkitgtk-60/README b/webkitgtk-60/README deleted file mode 100644 index e0a3f84..0000000 --- a/webkitgtk-60/README +++ /dev/null @@ -1,9 +0,0 @@ -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.