Update to epiphany-42.1.

This commit is contained in:
ajacoutot 2022-04-13 09:23:49 +00:00
parent e66bafb16e
commit e63e5e4624
5 changed files with 81 additions and 28 deletions

View File

@ -1,8 +1,7 @@
COMMENT= GNOME web browser based on webkit
GNOME_PROJECT= epiphany
GNOME_VERSION= 41.3
REVISION= 1
GNOME_VERSION= 42.1
CATEGORIES= www
@ -12,9 +11,9 @@ MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += archive atk-1.0 c cairo dazzle-1.0 gcr-base-3 gcr-ui-3 gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp gobject-2.0 gtk-3
WANTLIB += handy-1 hogweed intl javascriptcoregtk-4.0 json-glib-1.0
WANTLIB += archive atk-1.0 c cairo dazzle-1.0 gcr-base-3 gcr-ui-3
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp gobject-2.0
WANTLIB += gtk-3 handy-1 hogweed intl javascriptcoregtk-4.0 json-glib-1.0
WANTLIB += m nettle pango-1.0 secret-1 soup-2.4 sqlite3 webkit2gtk-4.0
WANTLIB += xml2

View File

@ -1,2 +1,2 @@
SHA256 (epiphany-41.3.tar.xz) = ugEmjuVPMY39rC4B66OKP8lpQMHL9kDtJhOuKfi8ua0=
SIZE (epiphany-41.3.tar.xz) = 6153540
SHA256 (epiphany-42.1.tar.xz) = aKzDxcYpF/G0ORaltGvsE29bMH8DqtpY23QMeLED8Dg=
SIZE (epiphany-42.1.tar.xz) = 6098392

View File

@ -1,21 +0,0 @@
Fix build with meson >= 0.60.0
Index: data/meson.build
--- data/meson.build.orig
+++ 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',

View File

@ -0,0 +1,45 @@
../epiphany-42.1/lib/safe-browsing/ephy-gsb-service.c:121:45: warning: format specifies type 'long' but the argument has type 'gint64' (aka 'long long') [-Wformat]
../epiphany-42.1/lib/safe-browsing/ephy-gsb-service.c:170:48: warning: format specifies type 'long' but the argument has type 'gint64' (aka 'long long') [-Wformat]
../epiphany-42.1/lib/safe-browsing/ephy-gsb-service.c:591:10: warning: format specifies type 'long' but the argument has type 'long long' [-Wformat]
../epiphany-42.1/lib/safe-browsing/ephy-gsb-service.c:597:10: warning: format specifies type 'long' but the argument has type 'long long' [-Wformat]
Index: lib/safe-browsing/ephy-gsb-service.c
--- lib/safe-browsing/ephy-gsb-service.c.orig
+++ lib/safe-browsing/ephy-gsb-service.c
@@ -118,7 +118,7 @@ ephy_gsb_service_update_back_off_mode (EphyGSBService
ephy_gsb_storage_set_metadata (self->storage, "back_off_exit_time", self->back_off_exit_time);
ephy_gsb_storage_set_metadata (self->storage, "back_off_num_fails", self->back_off_num_fails);
- LOG ("Set back-off mode for %ld seconds", duration);
+ LOG ("Set back-off mode for %lld seconds", duration);
}
static inline void
@@ -167,7 +167,7 @@ ephy_gsb_service_schedule_update (EphyGSBService *self
self);
g_source_set_name_by_id (self->source_id, "[epiphany] gsb_service_update");
- LOG ("Next update scheduled in %ld seconds", interval);
+ LOG ("Next update scheduled in %lld seconds", interval);
}
static gboolean
@@ -587,13 +587,13 @@ ephy_gsb_service_update_full_hashes_in_thread (UpdateF
g_mutex_lock (&data->mutex);
if (self->next_full_hashes_time > CURRENT_TIME) {
- LOG ("Cannot send fullHashes:find request. Requests are restricted for %ld seconds",
+ LOG ("Cannot send fullHashes:find request. Requests are restricted for %lld seconds",
self->next_full_hashes_time - CURRENT_TIME);
goto unlock;
}
if (ephy_gsb_service_is_back_off_mode (self)) {
- LOG ("Cannot send fullHashes:find request. Back-off mode is enabled for %ld seconds",
+ LOG ("Cannot send fullHashes:find request. Back-off mode is enabled for %lld seconds",
self->back_off_exit_time - CURRENT_TIME);
goto unlock;
}

View File

@ -589,6 +589,36 @@ share/help/sv/epiphany/pref-mouse-gestures.page
share/help/sv/epiphany/pref-passwords.page
share/help/sv/epiphany/prob-restore-closed-page.page
share/help/sv/epiphany/proxy.page
share/help/tr/
share/help/tr/epiphany/
share/help/tr/epiphany/browse-local.page
share/help/tr/epiphany/browse-private.page
share/help/tr/epiphany/browse-tab.page
share/help/tr/epiphany/browse-web.page
share/help/tr/epiphany/browse-webapps-del.page
share/help/tr/epiphany/browse-webapps.page
share/help/tr/epiphany/cert.page
share/help/tr/epiphany/cookies.xml
share/help/tr/epiphany/data-cookies.page
share/help/tr/epiphany/data-passwords.page
share/help/tr/epiphany/data-personal-data.page
share/help/tr/epiphany/history-delete.page
share/help/tr/epiphany/history.page
share/help/tr/epiphany/index.page
share/help/tr/epiphany/introduction.page
share/help/tr/epiphany/legal.xml
share/help/tr/epiphany/media/
share/help/tr/epiphany/media/epiphany-plain-3-36.png
share/help/tr/epiphany/media/epiphany-private-3-36.png
share/help/tr/epiphany/media/org.gnome.Epiphany.svg
share/help/tr/epiphany/pref-cookies.page
share/help/tr/epiphany/pref-css.page
share/help/tr/epiphany/pref-downloads.page
share/help/tr/epiphany/pref-font.page
share/help/tr/epiphany/pref-mouse-gestures.page
share/help/tr/epiphany/pref-passwords.page
share/help/tr/epiphany/prob-restore-closed-page.page
share/help/tr/epiphany/proxy.page
share/help/uk/
share/help/uk/epiphany/
share/help/uk/epiphany/browse-local.page