From ae154fa2079da83eca8f6076df0bc059534fb2fe Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Mon, 24 Jan 2022 12:53:53 -0500
Subject: [epiphany]: upgrade to v41.3

---
 libre/epiphany/PKGBUILD | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'libre/epiphany/PKGBUILD')

diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index fd00ee4df..5c4b4242a 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -1,19 +1,21 @@
-# Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
-# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Contributor: Iván Ávalos <avalos@disroot.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 
 # parabola changes and rationale:
 #  - rebranded to parabola
 #  - switched default searchengine to duckduckgo
 #  - removed useless dependency on icu because it's not
 #    used at runtime according to readelf -d
+#  - pin to sodeps
 
 pkgname=epiphany
-pkgver=40.2
-pkgrel=2
+pkgver=41.3
+pkgrel=1
 pkgrel+=.parabola1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
 pkgdesc+=", with DuckDuckGo-HTML search"
@@ -21,42 +23,47 @@ url="https://wiki.gnome.org/Apps/Web"
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(GPL)
-depends=(webkit2gtk gcr icu libdazzle libhandy libportal libarchive)
+depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive)
 depends=( $( sed 's| icu | |' <<<${depends[@]} ) )
 depends+=(libhogweed.so)
 makedepends=(docbook-xml startup-notification lsb-release gobject-introspection
              yelp-tools git meson)
+makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x
+                                                     #        "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments."
+                                                     #        possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6
 checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko)
 groups=(gnome)
-_commit=95552d19b3fc8c7e1c014db301390a0a517dc3e6  # tags/40.2^0
+_commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367  # tags/41.3^0
 source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit")
 source+=(libre.patch)
-sha256sums=('SKIP'
-            '2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')
+sha256sums=('SKIP')
+sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')
 
 # check() requires networking
 _run_check=1
 
+
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
+  echo "applying libre.patch"
   patch -Np1 -i ../libre.patch
 }
 
 build() {
-  arch-meson $pkgname build
-  meson compile -C build
+  arch-meson $pkgname build -D soup2=disabled -D libportal=disabled
+  meson compile -C build 
 }
 
 check() {
   (( _run_check )) || ! echo "skipping check()" || return 0
 
-  dbus-run-session xvfb-run \
-    -s '-screen 0 1920x1080x24 -nolisten local' \
+  dbus-run-session xvfb-run -s '-nolisten local' \
     meson test -C build --print-errorlogs
 }
 
-- 
cgit v1.2.3