1 |
commit: 88e03c00aba960ab4b8d6abb32a336d34ae16a91 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 5 08:34:30 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 5 08:34:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=88e03c00 |
7 |
|
8 |
www-client/epiphany-9999: sync in fixes from main tree |
9 |
|
10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
11 |
|
12 |
www-client/epiphany/epiphany-9999.ebuild | 29 +++++++------- |
13 |
.../files/epiphany-3.14.0-unittest-2.patch | 45 ---------------------- |
14 |
2 files changed, 14 insertions(+), 60 deletions(-) |
15 |
|
16 |
diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild |
17 |
index 4ee03e5d..0cfc5875 100644 |
18 |
--- a/www-client/epiphany/epiphany-9999.ebuild |
19 |
+++ b/www-client/epiphany/epiphany-9999.ebuild |
20 |
@@ -2,7 +2,6 @@ |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
EAPI=6 |
24 |
-GNOME2_LA_PUNT="yes" |
25 |
|
26 |
inherit gnome-meson virtualx |
27 |
if [[ ${PV} = 9999 ]]; then |
28 |
@@ -24,54 +23,54 @@ else |
29 |
fi |
30 |
|
31 |
COMMON_DEPEND=" |
32 |
- >=dev-libs/glib-2.52.0:2[dbus] |
33 |
- >=dev-libs/json-glib-1.2.4 |
34 |
+ >=dev-libs/glib-2.52.0:2 |
35 |
>=x11-libs/gtk+-3.22.13:3 |
36 |
+ >=dev-libs/nettle-3.2:= |
37 |
>=net-libs/webkit-gtk-2.17.4:4= |
38 |
>=x11-libs/cairo-1.2 |
39 |
>=app-crypt/gcr-3.5.5:=[gtk] |
40 |
>=x11-libs/gdk-pixbuf-2.36.5:2 |
41 |
>=gnome-base/gnome-desktop-2.91.2:3= |
42 |
dev-libs/icu:= |
43 |
- >=x11-libs/libnotify-0.5.1:= |
44 |
+ >=app-text/iso-codes-0.35 |
45 |
+ >=dev-libs/json-glib-1.2.4 |
46 |
+ >=x11-libs/libnotify-0.5.1 |
47 |
>=app-crypt/libsecret-0.14 |
48 |
>=net-libs/libsoup-2.48:2.4 |
49 |
>=dev-libs/libxml2-2.6.12:2 |
50 |
>=dev-libs/libxslt-1.1.7 |
51 |
- >=dev-libs/nettle-3.2 |
52 |
dev-db/sqlite:3 |
53 |
- dev-libs/gmp:0 |
54 |
- >=app-text/iso-codes-0.35 |
55 |
+ dev-libs/gmp:0= |
56 |
>=gnome-base/gsettings-desktop-schemas-0.0.1 |
57 |
" |
58 |
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works |
59 |
RDEPEND="${COMMON_DEPEND} |
60 |
x11-themes/adwaita-icon-theme |
61 |
- !www-client/epiphany-extensions |
62 |
" |
63 |
# paxctl needed for bug #407085 |
64 |
DEPEND="${COMMON_DEPEND} |
65 |
app-text/yelp-tools |
66 |
- dev-libs/appstream-glib |
67 |
+ dev-util/gdbus-codegen |
68 |
sys-apps/paxctl |
69 |
>=sys-devel/gettext-0.19.8 |
70 |
virtual/pkgconfig |
71 |
" |
72 |
|
73 |
PATCHES=( |
74 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=751593 |
75 |
- "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch |
76 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=751591 |
77 |
+ # ephy-file-helpers tests are currently disabled due to https://gitlab.gnome.org/GNOME/epiphany/issues/419 |
78 |
+ # So this patch is currently without effect. Retest with PORTAGE_TMPDIR=/var/tmp once re-enabled upstream. |
79 |
+ #"${FILESDIR}"/${PN}-3.16.0-unittest-1.patch |
80 |
) |
81 |
|
82 |
-# FIXME: it seems it can't use newer libhttpseverywhere |
83 |
src_configure() { |
84 |
+ # https_everywhere removed in 3.28 |
85 |
gnome-meson_src_configure \ |
86 |
+ -Ddeveloper_mode=false \ |
87 |
-Ddistributor_name=Gentoo \ |
88 |
-Dhttps_everywhere=false \ |
89 |
$(meson_use test unit_tests) |
90 |
} |
91 |
|
92 |
src_test() { |
93 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die |
94 |
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test |
95 |
+ virtx meson_src_test |
96 |
} |
97 |
|
98 |
diff --git a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch b/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch |
99 |
deleted file mode 100644 |
100 |
index 36dcb30c..00000000 |
101 |
--- a/www-client/epiphany/files/epiphany-3.14.0-unittest-2.patch |
102 |
+++ /dev/null |
103 |
@@ -1,45 +0,0 @@ |
104 |
-From 3d2ca8dfb33f9dd658293d14d6b75983d1d2f57d Mon Sep 17 00:00:00 2001 |
105 |
-From: Gilles Dartiguelongue <eva@g.o> |
106 |
-Date: Sun, 19 Oct 2014 23:06:29 +0200 |
107 |
-Subject: [PATCH 3/3] Disable broken tests |
108 |
- |
109 |
-Not the first time these are failing even though issue was reported |
110 |
-upstream. |
111 |
---- |
112 |
- tests/ephy-file-helpers-test.c | 4 ++-- |
113 |
- tests/ephy-migration-test.c | 4 ++-- |
114 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
115 |
- |
116 |
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c |
117 |
-index bdf7455..718fa29 100644 |
118 |
---- a/tests/ephy-file-helpers-test.c |
119 |
-+++ b/tests/ephy-file-helpers-test.c |
120 |
-@@ -341,8 +341,8 @@ main (int argc, char *argv[]) |
121 |
- g_test_add_func ("/lib/ephy-file-helpers/get_downloads_dir", |
122 |
- test_ephy_file_get_downloads_dir); |
123 |
- |
124 |
-- g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir", |
125 |
-- test_ephy_file_create_delete_dir); |
126 |
-+ /*g_test_add_func ("/lib/ephy-file-helpers/create_delete_dir", |
127 |
-+ test_ephy_file_create_delete_dir);*/ |
128 |
- |
129 |
- g_test_add_func ("/lib/ephy-file-helpers/desktop_dir", |
130 |
- test_ephy_file_desktop_dir); |
131 |
-diff --git a/tests/ephy-migration-test.c b/tests/ephy-migration-test.c |
132 |
-index fab9ee7..64cdd65 100644 |
133 |
---- a/tests/ephy-migration-test.c |
134 |
-+++ b/tests/ephy-migration-test.c |
135 |
-@@ -65,8 +65,8 @@ main (int argc, char *argv[]) |
136 |
- |
137 |
- g_test_add_func ("/lib/ephy-profile-utils/do_migration_simple", |
138 |
- test_do_migration_simple); |
139 |
-- g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid", |
140 |
-- test_do_migration_invalid); |
141 |
-+ /*g_test_add_func ("/lib/ephy-profile-utils/do_migration_invalid", |
142 |
-+ test_do_migration_invalid);*/ |
143 |
- |
144 |
- return g_test_run (); |
145 |
- } |
146 |
--- |
147 |
-2.1.2 |
148 |
- |