public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/, www-client/epiphany/files/, www-client/epiphany/
@ 2022-10-03  3:28 Matt Turner
  0 siblings, 0 replies; only message in thread
From: Matt Turner @ 2022-10-03  3:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ab9f43e43f1418371fb764b332e86cb6b48cfaf7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 03:12:52 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 03:26:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9f43e4

www-client/epiphany: Version bump to 43.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 profiles/package.mask                              |  1 +
 www-client/epiphany/Manifest                       |  1 +
 www-client/epiphany/epiphany-43.0.ebuild           | 85 ++++++++++++++++++++++
 ...t-tests-Set-locale-for-the-encodings-test.patch | 44 +++++++++++
 4 files changed, 131 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 24e86564e8f4..9a691e46647d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -438,6 +438,7 @@ net-libs/uhttpmock:1.0
 net-libs/webkit-gtk:4.1
 sci-geosciences/geocode-glib:2
 >=sci-geosciences/gnome-maps-43
+>=www-client/epiphany-43
 >=x11-wm/mutter-43
 
 # Thomas Deutschmann <whissi@gentoo.org> (2021-09-07)

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 7df110f3d6fc..0d2127edb3cc 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1 +1,2 @@
 DIST epiphany-42.4.tar.xz 6107820 BLAKE2B 7ab18ac6d8eceb3577ef53c761e26a64291219311f2d6d82ed13ce6746767b83124faf28c9627056938351a05e5d6aff50eb95eb4dec10ce8847123fb5775b36 SHA512 55153078bc460cc5a0bc17bb8d12fd5ed6495cd2415e128ec0b4917b07a4d2fe1fb74e871c033aaef43c89c125d79ad37e99ea2fa2ada07fbcdf09603129ae47
+DIST epiphany-43.0.tar.xz 3890284 BLAKE2B 74a463030bea6489dc05c975fa885ba3e06a3c552f18d29b0579121cf3b04f73fe3c76a6057d9d941f4361732ea1029cd7abb235969ca4f649964e5f909ea2d1 SHA512 56e65c2b3868447b88b89dc97c9d63c4ef1b174334eda15c6ad6b11a38963457df01a6024109ddfaf67730c691e5d68d37abb779604d4719dbc19950d18fe426

diff --git a/www-client/epiphany/epiphany-43.0.ebuild b/www-client/epiphany/epiphany-43.0.ebuild
new file mode 100644
index 000000000000..407f55a1e1ee
--- /dev/null
+++ b/www-client/epiphany/epiphany-43.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:0=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=dev-libs/glib-2.67.4:2
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.24.0:3
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.6
+	app-arch/libarchive:=
+	>=dev-libs/libdazzle-3.37.1
+	>=gui-libs/libhandy-1.5.0:1=
+	>=app-crypt/libsecret-0.19
+	>=net-libs/libsoup-2.99.4:3.0
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/nettle-3.4:=
+	>=dev-libs/libportal-0.6:0=[gtk]
+	>=dev-db/sqlite-3.22:3
+	>=net-libs/webkit-gtk-2.37.1:4.1=
+
+	dev-libs/gmp:0=
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# appstream-glib needed for appdata.xml gettext translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-Revert-tests-Set-locale-for-the-encodings-test.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
+		# is commented out upstream anyway
+		-Dnetwork_tests=disabled
+		-Dtech_preview=false
+		$(meson_feature test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version net-libs/webkit-gtk:4.1[jpeg2k]; then
+		ewarn "Your net-libs/webkit-gtk:4.1 is built without USE=jpeg2k."
+		ewarn "Various image galleries/managers may be broken."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

diff --git a/www-client/epiphany/files/43.0-Revert-tests-Set-locale-for-the-encodings-test.patch b/www-client/epiphany/files/43.0-Revert-tests-Set-locale-for-the-encodings-test.patch
new file mode 100644
index 000000000000..973735712f36
--- /dev/null
+++ b/www-client/epiphany/files/43.0-Revert-tests-Set-locale-for-the-encodings-test.patch
@@ -0,0 +1,44 @@
+https://gitlab.gnome.org/GNOME/epiphany/-/issues/1842
+
+From 3fdab3173f64f8a8778ddc7f99167489f72c9eb0 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 2 Oct 2022 23:24:40 -0400
+Subject: [PATCH] Revert "tests: Set locale for the encodings test"
+
+This reverts commit e54889f2aaae3f647dbdfdd7b40b8d43d19e7889.
+---
+ tests/ephy-encodings-test.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
+index a3ea7e781..a6bf38ab9 100644
+--- a/tests/ephy-encodings-test.c
++++ b/tests/ephy-encodings-test.c
+@@ -28,7 +28,6 @@
+ #include "ephy-shell.h"
+ 
+ #include <gtk/gtk.h>
+-#include <locale.h>
+ 
+ /* TODO: don't hardcode the number of encodings in ephy-encodings.c here! */
+ #define NUM_ENCODINGS 78
+@@ -44,7 +43,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);
+@@ -80,7 +79,6 @@ main (int   argc,
+   int ret;
+ 
+   gtk_test_init (&argc, &argv);
+-  setlocale (LC_ALL, "");
+ 
+   ephy_debug_init ();
+ 
+-- 
+2.35.1
+


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2022-10-03  3:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-03  3:28 [gentoo-commits] repo/gentoo:master commit in: profiles/, www-client/epiphany/files/, www-client/epiphany/ Matt Turner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox