From 1defaa297d8de7b6250958804914b6d1ca5ab6a3 Mon Sep 17 00:00:00 2001 From: John McQuah Date: Mon, 12 Jun 2023 22:17:20 -0400 Subject: [PATCH] epiphany: update to 44.3, new dependency webkitgtk-60 --- REPO | 16 ++++++++-------- epiphany/.footprint | 4 ++-- epiphany/.signature | 8 ++++---- epiphany/Pkgfile | 20 ++++++++++++++------ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/REPO b/REPO index 2155b72..5099dd9 100644 --- a/REPO +++ b/REPO @@ -15,7 +15,6 @@ d:librsync d:sbcl d:labwc d:maelstrom -d:webkitgtk-41 d:wildmidi d:python3-agate-sql d:lagrange @@ -35,6 +34,7 @@ d:sfwbar d:kitty d:recode d:zathura-pdf-poppler +d:webkitgtk-60 d:libfreeimage-lite d:libfixposix d:qscintilla-qt5 @@ -122,10 +122,6 @@ f:aa0a6869d42fc9a2d392330a589d0d14:maelstrom/maelstrom.desktop f:0ef5de38b7caa0ba88aead2cf71ff771:maelstrom/Pkgfile f:9e19f6160558cb713c892443221e304e:maelstrom/include-time_h.patch f:07f044cd6d38e412e36dcb593c3d37b1:maelstrom/.footprint -f:8bcc65cdf4f46fe189e4f6324c6ebe7c:webkitgtk-41/README -f:bd1fcf0fdce873917945fd60ceec3773:webkitgtk-41/.signature -f:e7db1d3996122daad16a0727a981b3e5:webkitgtk-41/Pkgfile -f:5bb14a3f969135de3e5398da36b1c87d:webkitgtk-41/.footprint f:7e2e1fbe5247bb9e9ec795c280585705:wildmidi/.signature f:907865719069b041caabab770caf65d6:wildmidi/Pkgfile f:c1d50dffa63b8b9b704da2922a49aac4:wildmidi/.footprint @@ -186,6 +182,10 @@ f:e1cf1c12ed92637910cf5b565c97070c:recode/.footprint f:39680318d83f51fa90fd16fa4ed05154:zathura-pdf-poppler/.signature f:13d8d971c19328457beb3c9af2788a94:zathura-pdf-poppler/Pkgfile f:3961411333908c5200c5ba74f8240798:zathura-pdf-poppler/.footprint +f:b9fb1c6cbaa9234081d1df3eb12619a3:webkitgtk-60/README +f:c828257906a251962eef3d5655464daa:webkitgtk-60/.signature +f:76895282c03b61199f055e0ec0abe742:webkitgtk-60/Pkgfile +f:bbf26ef7109f9268b59b459ed0b1485c:webkitgtk-60/.footprint f:0cc425d03faffdcc793b0af7ec749893:libfreeimage-lite/.signature f:c4a660d93a260478a5f4d246be1c260d:libfreeimage-lite/Pkgfile f:55654b9c5c4042bbd1ca6d158629d37a:libfreeimage-lite/.footprint @@ -195,10 +195,10 @@ f:4f4524a2130da2b111dbdd57ba1abccb:libfixposix/.footprint f:a8773594eaa18fa6cbbee01725eecc10:qscintilla-qt5/.signature f:9b6357a1376700ededd2502ea45cea37:qscintilla-qt5/Pkgfile f:74044f52385df8eb19c9930998469862:qscintilla-qt5/.footprint -f:fd0ced00907d69207d01e886a374940b:epiphany/.signature -f:72621744a93a7e37f7f248a0350fdb51:epiphany/Pkgfile +f:bbc1dc3bf7fcbe31ca437e937100a746:epiphany/.signature +f:5546cb68b6c05d70f51c82a31b0b53d4:epiphany/Pkgfile f:627ed74e27650ad8b5f860f26a174def:epiphany/post-install -f:f67a296e319df9ffddf6697157246a87:epiphany/.footprint +f:1d85a0aa812813bace4fe92bbc8aada5:epiphany/.footprint f:259742d9decea4ad6f256a1dd0999279:mblaze/README f:c1eca91654e731640d6771edc361d437:mblaze/mdelete.1 f:de51de573d2fa05ed336c9ebc0551e50:mblaze/.signature diff --git a/epiphany/.footprint b/epiphany/.footprint index 44930f5..f7a461e 100644 --- a/epiphany/.footprint +++ b/epiphany/.footprint @@ -2,13 +2,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/epiphany drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/epiphany-search-provider +-rwxr-xr-x root/root usr/lib/epiphany-webapp-provider drwxr-xr-x root/root usr/lib/epiphany/ -rwxr-xr-x root/root usr/lib/epiphany/ephy-profile-migrator -rwxr-xr-x root/root usr/lib/epiphany/libephymain.so -rwxr-xr-x root/root usr/lib/epiphany/libephymisc.so -rwxr-xr-x root/root usr/lib/epiphany/libephysync.so --rwxr-xr-x root/root usr/lib/epiphany-search-provider --rwxr-xr-x root/root usr/lib/epiphany-webapp-provider drwxr-xr-x root/root usr/lib/epiphany/web-process-extensions/ -rwxr-xr-x root/root usr/lib/epiphany/web-process-extensions/libephywebextension.so -rwxr-xr-x root/root usr/lib/epiphany/web-process-extensions/libephywebprocessextension.so diff --git a/epiphany/.signature b/epiphany/.signature index c05b8e7..e003c43 100644 --- a/epiphany/.signature +++ b/epiphany/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxK1JEy1xH+5J/S/gxjaEgN3U+NNEXH0RU7ffEcEBS9CNWSbMz37/IilSOM61/ijJS5GS6YXxyvuM5937n2hU0Q4= -SHA256 (Pkgfile) = a6f255a111f63dc7eb5a0542ddf79a6155a9c005572e708802223474af6b0de5 -SHA256 (.footprint) = 7e33ef10012056c66b0c4d83403b4e1271ddd7a0de08964fd90a0165da561f8f -SHA256 (epiphany-43.0.tar.xz) = b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227 +RWTTPlFarK9CxM4qCU7/EVwIIJk7opRoKQJROZGIHTOpJZJi55rxXUAqfxPxtuBW6m514pgxwqscpLU1MoSYVHoWHcCI9zzrlAQ= +SHA256 (Pkgfile) = 8530ea3393115baad2423f5ca231ae68d2e9eacd00cd0450aeadacf0a0578c35 +SHA256 (.footprint) = 0e0ed5587dfd1c354189baba8bff0a7347d46bcbc3a2c23922aea517de9c54e8 +SHA256 (epiphany-44.3.tar.xz) = f5e904b2e5102104d8b7fe3a615034add78de03116492b54cbdebca280bdd899 diff --git a/epiphany/Pkgfile b/epiphany/Pkgfile index 314e15e..127345c 100644 --- a/epiphany/Pkgfile +++ b/epiphany/Pkgfile @@ -1,21 +1,29 @@ # Description: A GNOME web browser based on the WebKit rendering engine # URL: https://wiki.gnome.org/Apps/Web # Maintainer: John McQuah, jmcquah at disroot dot org -# Depends on: appstream-glib libhandy libportal iso-codes itstool libdazzle webkitgtk-41 gcr3 icu docbook-xml gobject-introspection gstreamer -# Optional: gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav libnotify enchant +# Depends on: appstream libhandy libportal iso-codes webkitgtk-60 gcr libadwaita +# Optional: gst-plugins-good gst-plugins-bad gst-libav libnotify enchant + name=epiphany -version=43.0 +version=44.3 release=1 source=(https://download.gnome.org/sources/${name}/${version%.*}/${name}-${version}.tar.xz) build() { cd "${name}-${version}" - sed -i "/^subdir('po')/d" meson.build - meson build \ + # fail the build if libportal was not compiled against gtk4 + [ -e /usr/lib/pkgconfig/libportal-gtk4.pc ] || \ + { echo "You need to rebuild libportal with gtk4 installed."; exit 1; } + + sed -e "/^subdir('po')/d" \ + -i meson.build + + meson setup build \ --prefix="/usr" --libexecdir="/usr/lib" \ -Ddeveloper_mode=false - ninja -C build + + ninja -C build -j ${JOBS:-1} DESTDIR="${PKG}" meson install -C build rm -r "${PKG}/usr/share/help" }