Date: Monday, February 20, 2023 @ 19:22:40
Author: heftig
Revision: 469298
archrelease: copy trunk to extra-x86_64
Added:
epiphany/repos/extra-x86_64/PKGBUILD
(from rev 469297, epiphany/trunk/PKGBUILD)
epiphany/repos/extra-x86_64/fix-test.diff
(from rev 469297, epiphany/trunk/fix-test.diff)
Deleted:
epiphany/repos/extra-x86_64/PKGBUILD
epiphany/repos/extra-x86_64/fix-test.diff
---------------+
PKGBUILD | 127 ++++++++++++++++++++++++++++++++------------------------
fix-test.diff | 26 +++++------
2 files changed, 87 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-20 19:22:29 UTC (rev 469297)
+++ PKGBUILD 2023-02-20 19:22:40 UTC (rev 469298)
@@ -1,53 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Jan de Groot <[email protected]>
-
-pkgname=epiphany
-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
- 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=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
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-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
- meson compile -C build
-}
-
-check() {
- dbus-run-session xvfb-run -s '-nolisten local' \
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: epiphany/repos/extra-x86_64/PKGBUILD (from rev 469297,
epiphany/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-02-20 19:22:40 UTC (rev 469298)
@@ -0,0 +1,74 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+
+pkgname=epiphany
+pkgver=43.1
+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=(
+ gcr
+ icu
+ libarchive
+ libdazzle
+ libhandy
+ libportal-gtk3
+ libsoup3
+ webkit2gtk-4.1
+)
+makedepends=(
+ docbook-xml
+ git
+ gobject-introspection
+ lsb-release
+ meson
+ startup-notification
+ yelp-tools
+)
+checkdepends=(
+ aspell
+ hspell
+ hunspell
+ libvoikko
+ nuspell
+ xorg-server-xvfb
+)
+groups=(gnome)
+_commit=e21c2e68f34fcf23ca560088479e13c9929a4c36 # tags/43.1^0
+source=(
+ "git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit";
+ fix-test.diff
+)
+b2sums=('SKIP'
+
'05121ff5f759ec637a718c9b39406f9a384227a312d69f6dc74e73fde8351689d588a30dddea3cfe0a6edb094fdcf5382eb5ff725bb2adfccdff87ab3cf4c953')
+
+pkgver() {
+ cd epiphany
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+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
+ meson compile -C build
+}
+
+check() {
+ dbus-run-session xvfb-run -s '-nolisten local' \
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: fix-test.diff
===================================================================
--- fix-test.diff 2023-02-20 19:22:29 UTC (rev 469297)
+++ fix-test.diff 2023-02-20 19:22:40 UTC (rev 469298)
@@ -1,13 +0,0 @@
-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);
Copied: epiphany/repos/extra-x86_64/fix-test.diff (from rev 469297,
epiphany/trunk/fix-test.diff)
===================================================================
--- fix-test.diff (rev 0)
+++ fix-test.diff 2023-02-20 19:22:40 UTC (rev 469298)
@@ -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);
