Accepting request 999394 from home:iznogood

- Add epiphany-fix-nb-translation.patch: Spellfix for Norwegian
  Bokmål translation.
  https://gitlab.gnome.org/Teams/Translation/no/-/issues/8

- Add e7d53b1409dcdf983995e227fb9cfc200ed1cf87.patch: web-app: do
  not show the search suggestions settings in web app mode.

OBS-URL: https://build.opensuse.org/request/show/999394
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=373
This commit is contained in:
Bjørn Lie 2022-08-27 09:02:21 +00:00 committed by Git OBS Bridge
parent 6c677a6178
commit 9a295f9235
4 changed files with 92 additions and 0 deletions

View File

@ -0,0 +1,64 @@
From e7d53b1409dcdf983995e227fb9cfc200ed1cf87 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <cgarcia@igalia.com>
Date: Thu, 28 Jul 2022 14:25:22 +0200
Subject: [PATCH] web-app: do not show the search suggestions settings in web
app mode
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1178>
(cherry picked from commit 8d5130cb13fb9a0609ce6c9f7b826fcbc260df28)
---
src/preferences/prefs-privacy-page.c | 7 +++++++
src/resources/gtk/prefs-privacy-page.ui | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/preferences/prefs-privacy-page.c b/src/preferences/prefs-privacy-page.c
index d8caea0e9..94f95efb0 100644
--- a/src/preferences/prefs-privacy-page.c
+++ b/src/preferences/prefs-privacy-page.c
@@ -45,6 +45,7 @@ struct _PrefsPrivacyPage {
GtkWidget *enable_website_data_storage_switch;
/* Search Suggestions */
+ GtkWidget *search_suggestions_box;
GtkWidget *enable_google_search_suggestions_switch;
/* Passwords */
@@ -152,6 +153,7 @@ prefs_privacy_page_class_init (PrefsPrivacyPageClass *klass)
gtk_widget_class_bind_template_child (widget_class, PrefsPrivacyPage, enable_website_data_storage_switch);
/* Search Suggestions */
+ gtk_widget_class_bind_template_child (widget_class, PrefsPrivacyPage, search_suggestions_box);
gtk_widget_class_bind_template_child (widget_class, PrefsPrivacyPage, enable_google_search_suggestions_switch);
/* Passwords */
@@ -165,7 +167,12 @@ prefs_privacy_page_class_init (PrefsPrivacyPageClass *klass)
static void
prefs_privacy_page_init (PrefsPrivacyPage *privacy_page)
{
+ EphyEmbedShellMode mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ());
+
gtk_widget_init_template (GTK_WIDGET (privacy_page));
setup_privacy_page (privacy_page);
+
+ gtk_widget_set_visible (privacy_page->search_suggestions_box,
+ mode != EPHY_EMBED_SHELL_MODE_APPLICATION);
}
diff --git a/src/resources/gtk/prefs-privacy-page.ui b/src/resources/gtk/prefs-privacy-page.ui
index bf61d6b91..f8a5aa8b9 100644
--- a/src/resources/gtk/prefs-privacy-page.ui
+++ b/src/resources/gtk/prefs-privacy-page.ui
@@ -61,7 +61,7 @@
</object>
</child>
<child>
- <object class="HdyPreferencesGroup">
+ <object class="HdyPreferencesGroup" id="search_suggestions_box">
<property name="title" translatable="yes">Search Suggestions</property>
<property name="visible">True</property>
<child>
--
GitLab

View File

@ -0,0 +1,11 @@
--- orig-epiphany-42.4/po/nb.po 2022-08-05 21:45:01.000000000 +0200
+++ epiphany-42.4/po/nb.po 2022-08-26 13:40:31.687935716 +0200
@@ -1507,7 +1507,7 @@
#: embed/ephy-web-view.c:897
msgid "_Wait"
-msgstr "_Veng"
+msgstr "_Vent"
#: embed/ephy-web-view.c:898
msgid "_Kill"

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Aug 26 11:42:05 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add epiphany-fix-nb-translation.patch: Spellfix for Norwegian
Bokmål translation.
https://gitlab.gnome.org/Teams/Translation/no/-/issues/8
-------------------------------------------------------------------
Wed Aug 24 13:43:52 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add e7d53b1409dcdf983995e227fb9cfc200ed1cf87.patch: web-app: do
not show the search suggestions settings in web app mode.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 7 10:59:30 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Sun Aug 7 10:59:30 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -24,6 +24,10 @@ License: GPL-3.0-or-later
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
URL: https://wiki.gnome.org/Apps/Web URL: https://wiki.gnome.org/Apps/Web
Source0: https://download.gnome.org/sources/epiphany/42/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/epiphany/42/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM e7d53b1409dcdf983995e227fb9cfc200ed1cf87.patch -- web-app: do not show the search suggestions settings in web app mode
Patch0: https://gitlab.gnome.org/GNOME/epiphany/-/commit/e7d53b1409dcdf983995e227fb9cfc200ed1cf87.patch
# PATCH-FIX-UPSTREAM epiphany-fix-nb-translation.patch -- Spellfix for Norwegian Bokmål translation
Patch1: epiphany-fix-nb-translation.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: meson >= 0.47.0 BuildRequires: meson >= 0.47.0