Date: Tuesday, October 25, 2022 @ 14:58:08 Author: heftig Revision: 458886
43.0-1 Added: epiphany/trunk/fix-test.diff Modified: epiphany/trunk/PKGBUILD ---------------+ PKGBUILD | 23 +++++++++++++++++------ fix-test.diff | 13 +++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-25 14:29:46 UTC (rev 458885) +++ PKGBUILD 2022-10-25 14:58:08 UTC (rev 458886) @@ -2,21 +2,26 @@ # Contributor: Jan de Groot <[email protected]> pkgname=epiphany -pkgver=42.4 +pkgver=43.0 pkgrel=1 pkgdesc="A GNOME web browser based on the WebKit rendering engine" url="https://wiki.gnome.org/Apps/Web"; arch=(x86_64) license=(GPL) -depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive libportal-gtk3) +depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive libportal-gtk3 + libsoup3) makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools git meson) checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko) groups=(gnome) options=(debug) -_commit=a904a30bfe911e000d6263f338f99cf20b66ad97 # tags/42.4^0 -source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit";) -sha256sums=('SKIP') +_commit=e5882e2b1fa040fbe6494ee9808591046a6eafa5 # tags/43.0^0 +source=( + "git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit"; + fix-test.diff +) +sha256sums=('SKIP' + 'faa710836067fa199954701e6f68a54aa4a67223b7f851113cafaf7b1f0c9d48') pkgver() { cd epiphany @@ -25,10 +30,14 @@ prepare() { cd epiphany + + # Fix encoding test; perhaps caused by different glibc or locale env + # https://gitlab.gnome.org/GNOME/epiphany/-/issues/1842 + git apply -3 ../fix-test.diff } build() { - arch-meson epiphany build -D soup2=disabled + arch-meson epiphany build meson compile -C build } @@ -40,3 +49,5 @@ package() { meson install -C build --destdir "$pkgdir" } + +# vim:set sw=2 sts=-1 et: Added: fix-test.diff =================================================================== --- fix-test.diff (rev 0) +++ fix-test.diff 2022-10-25 14:58:08 UTC (rev 458886) @@ -0,0 +1,13 @@ +diff --git i/tests/ephy-encodings-test.c w/tests/ephy-encodings-test.c +index a3ea7e781..4874ca33e 100644 +--- i/tests/ephy-encodings-test.c ++++ w/tests/ephy-encodings-test.c +@@ -44,7 +44,7 @@ test_ephy_encodings_create (void) + g_assert_cmpstr (ephy_encoding_get_encoding (encoding), ==, "UTF-8"); + g_assert_cmpstr (ephy_encoding_get_title (encoding), ==, "Unicode (UTF-8)"); + g_assert_cmpstr (ephy_encoding_get_title_elided (encoding), ==, "Unicode (UTF-8)"); +- g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "\311\263\307\276\307\205\305\271\310\215\306\202\306\216\311\263\311\250\306\245\305\237\001\035\035\035\035\035\035\035\035\035\035\035\001\007\002\002\002\002\002\002\007\007\007\002\001\001\346\244\273\001\346\215\264\001\346\211\243\001\346\204\235\001\346\216\257\001\346\205\217\001\346\206\212\001\343\265\233\001\343\265\242\001\346\244\273\001\346\244\231\001\346\234\257\001\343\265\247\001\345\277\241\001\343\265\243"); ++ g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "Unicode (UTF-8)"); + g_assert_cmpint (ephy_encoding_get_language_groups (encoding), ==, LG_UNICODE); + + g_object_unref (encoding);
