* [gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/, www-client/epiphany/files/
@ 2022-01-25 0:49 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-25 0:49 UTC (permalink / raw
To: gentoo-commits
commit: b50b24b5fa3e06e28b5a227a845005e11c6712ff
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon Jan 24 22:08:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:49:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50b24b5
www-client/epiphany: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831923
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/epiphany/epiphany-41.3.ebuild | 1 +
.../files/41.3-fix-build-with-meson-0.61.1.patch | 35 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/www-client/epiphany/epiphany-41.3.ebuild b/www-client/epiphany/epiphany-41.3.ebuild
index f64e9c5a230e..a49751cb9e30 100644
--- a/www-client/epiphany/epiphany-41.3.ebuild
+++ b/www-client/epiphany/epiphany-41.3.ebuild
@@ -50,6 +50,7 @@ BDEPEND="
PATCHES=(
# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
"${FILESDIR}"/var-tmp-tests.patch
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
)
src_configure() {
diff --git a/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..7b521c052574
--- /dev/null
+++ b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146
+https://bugs.gentoo.org/831923
+
+From: rvalue <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 46df3fd80..eac6b8224 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop = i18n.merge_file(
+- 'desktop',
+ input: configure_file(
+ input: files('org.gnome.Epiphany.desktop.in.in'),
+ output: 'org.gnome.Epiphany.desktop.in',
+@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: files('org.gnome.Epiphany.appdata.xml.in.in'),
+ output: 'org.gnome.Epiphany.appdata.xml.in',
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/, www-client/epiphany/files/
@ 2023-01-03 14:08 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2023-01-03 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 3f615640cccc3d4b5ffbcf72b1af9c0e61b24a22
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 03:59:43 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 3 14:07:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f615640
www-client/epiphany: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
www-client/epiphany/Manifest | 1 -
www-client/epiphany/epiphany-42.4-r1.ebuild | 86 ---------------------------
www-client/epiphany/files/var-tmp-tests.patch | 13 ----
3 files changed, 100 deletions(-)
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 0d2127edb3cc..baa7ea80c408 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,2 +1 @@
-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-42.4-r1.ebuild b/www-client/epiphany/epiphany-42.4-r1.ebuild
deleted file mode 100644
index 311a5be8c69d..000000000000
--- a/www-client/epiphany/epiphany-42.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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="
- >=dev-libs/glib-2.67.4:2
- >=x11-libs/gtk+-3.24.0:3
- >=dev-libs/nettle-3.4:=
- >=net-libs/webkit-gtk-2.33.2:4=
- >=x11-libs/cairo-1.2
- >=app-crypt/gcr-3.5.5:0=[gtk]
- >=x11-libs/gdk-pixbuf-2.36.5:2
- gnome-base/gsettings-desktop-schemas
- >=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.48.0:2.4
- >=dev-libs/libxml2-2.6.12:2
- >=dev-db/sqlite-3.22:3
- 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=(
- # Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
- "${FILESDIR}"/var-tmp-tests.patch
-)
-
-src_configure() {
- local emesonargs=(
- -Ddeveloper_mode=false
- -Dlibportal=disabled
- # 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)
- -Dsoup2=enabled
- )
- 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[jpeg2k]; then
- ewarn "Your net-libs/webkit-gtk 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/var-tmp-tests.patch b/www-client/epiphany/files/var-tmp-tests.patch
deleted file mode 100644
index f2a0d97aaf96..000000000000
--- a/www-client/epiphany/files/var-tmp-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index b3139b67e..10c884ea5 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -87,7 +87,7 @@ test_ephy_file_helpers_init (void)
- if (keep_dir) {
- /* As a safety measure, only try recursive delete on paths
- * prefixed with /tmp. */
-- if (g_str_has_prefix (tmp_dir, "/tmp"))
-+ if (g_str_has_prefix (tmp_dir, "/tmp") || g_str_has_prefix (tmp_dir, "/var/tmp"))
- g_assert_true (ephy_file_delete_dir_recursively (tmp_dir, NULL));
- else
- g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/, www-client/epiphany/files/
@ 2023-05-17 21:55 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2023-05-17 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 4e1335440865bcd354f8aab016c5558d1d970f70
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 21:14:59 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 17 21:54:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e133544
www-client/epiphany: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
www-client/epiphany/Manifest | 3 -
www-client/epiphany/epiphany-43.1.ebuild | 85 ----------------------
www-client/epiphany/epiphany-44.0.ebuild | 82 ---------------------
www-client/epiphany/epiphany-44.1.ebuild | 82 ---------------------
...t-tests-Set-locale-for-the-encodings-test.patch | 44 -----------
5 files changed, 296 deletions(-)
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index fdfdc6b445d0..6749da6c8e60 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1 @@
-DIST epiphany-43.1.tar.xz 3893416 BLAKE2B 3706b89269a48c7132a8e8a1807345482d16ed87d860974e74c49f2d0bb2dd05b31f9e9c02d4675ccab2b721ffc2f62196a2ca3f3bd5cb52696cf5159465ee5b SHA512 1f54864c35f988b009b739e996dca1735f5222bf9fc5594eed3aa07d673db6f8f8870536b17985c318f39dfac79bce236118d863f9963944bc16cdaec469ca7a
-DIST epiphany-44.0.tar.xz 3991296 BLAKE2B 44f1b4b5ac9a7b78c9fdb15e8f6345c13d7381b9bfe39565d59d9d74b51540510f36bd6ba6082a724c21828e95879d37648a3352929852f4f330a92838f9aef3 SHA512 a023429ea3e9e7db01bb5e93c33489891058cc49438ff4f365b0321175b1c484c3d20dcb96bde026f416dfdfeab6bfc3719908f1ac69eb9a162c88b3afaf01e6
-DIST epiphany-44.1.tar.xz 3991788 BLAKE2B 7dfe437cee729c1799e7d9c5379f70473dd7db6ca854876edcf65e8be32ca9160861a90767f166a597a81f5abf7d5a96f63b1a147e263f15b4068784c69c99c0 SHA512 3f1736d3358d5898b04db7b57ebfe33d7becab4ebac4285ca96356e5c808bde7ee3db504da99afd34269a41741bc5b2e8d38ae5ffcbb513c585e85d9e2e46c19
DIST epiphany-44.2.tar.xz 3991788 BLAKE2B c18e3c952a1e71e498646017886caba82325e220b2682c8d804e2b5e40b7a80bc3521c0e3c098d8a24732ddf727f6b37936ffae154599a0c8c4a5aa90765f1a5 SHA512 026536a1d0a74059e9f642ddf38156f80f0c244ace6449caa0908a49daf3bcea735745050abe6f565224c73489d0ce12da2f2ac907d062ac270f24b3b045f86e
diff --git a/www-client/epiphany/epiphany-43.1.ebuild b/www-client/epiphany/epiphany-43.1.ebuild
deleted file mode 100644
index 646e6a620935..000000000000
--- a/www-client/epiphany/epiphany-43.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 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}"/43.0-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/epiphany-44.0.ebuild b/www-client/epiphany/epiphany-44.0.ebuild
deleted file mode 100644
index 53e8f0938976..000000000000
--- a/www-client/epiphany/epiphany-44.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 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.9.0:4=[gtk]
- >=x11-libs/gdk-pixbuf-2.36.5:2
- >=dev-libs/glib-2.70.0:2
- gnome-base/gsettings-desktop-schemas
- >=media-libs/gstreamer-1.0
- >=gui-libs/gtk-4.9.3:4
- >=app-text/iso-codes-0.35
- >=dev-libs/json-glib-1.6
- app-arch/libarchive:=
- >=gui-libs/libadwaita-1.3_rc: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.40.0:6=
-
- 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
-"
-
-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)
- -Dgranite=disabled
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version net-libs/webkit-gtk:6[jpeg2k]; then
- ewarn "Your net-libs/webkit-gtk:6 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/epiphany-44.1.ebuild b/www-client/epiphany/epiphany-44.1.ebuild
deleted file mode 100644
index 53e8f0938976..000000000000
--- a/www-client/epiphany/epiphany-44.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 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.9.0:4=[gtk]
- >=x11-libs/gdk-pixbuf-2.36.5:2
- >=dev-libs/glib-2.70.0:2
- gnome-base/gsettings-desktop-schemas
- >=media-libs/gstreamer-1.0
- >=gui-libs/gtk-4.9.3:4
- >=app-text/iso-codes-0.35
- >=dev-libs/json-glib-1.6
- app-arch/libarchive:=
- >=gui-libs/libadwaita-1.3_rc: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.40.0:6=
-
- 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
-"
-
-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)
- -Dgranite=disabled
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version net-libs/webkit-gtk:6[jpeg2k]; then
- ewarn "Your net-libs/webkit-gtk:6 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
deleted file mode 100644
index 973735712f36..000000000000
--- a/www-client/epiphany/files/43.0-Revert-tests-Set-locale-for-the-encodings-test.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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] 3+ messages in thread
end of thread, other threads:[~2023-05-17 21:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-25 0:49 [gentoo-commits] repo/gentoo:master commit in: www-client/epiphany/, www-client/epiphany/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-03 14:08 Matt Turner
2023-05-17 21:55 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox