From f00e98b9dfcbdf22006de5bdb1b5cb598b82e66f Mon Sep 17 00:00:00 2001 From: elementaryBot Date: Mon, 30 Jun 2025 00:25:02 +0000 Subject: [PATCH 1/2] epiphany: Update epiphany-48.3.tar.xz to 48.5 --- org.gnome.epiphany.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 2fcb0cf..1754838 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -25,8 +25,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/epiphany/48/epiphany-48.3.tar.xz", - "sha256": "da2953e7e2b73bf7473c0a33979104d79362795295eaa0a2a38ea188537daf13", + "url": "https://download.gnome.org/sources/epiphany/48/epiphany-48.5.tar.xz", + "sha256": "0f66552ad6593c7952a3ddee5bf515656c8c434871076d9f1a91a7af9346b1b4", "x-checker-data": { "type": "gnome", "name": "epiphany" From 7c8071ad2a51e406a4a1c7e1f502fb17bc5c2162 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 30 Jun 2025 21:33:12 +0900 Subject: [PATCH 2/2] Fix build --- fix-startup-crash.patch | 31 ------------------------------- org.gnome.epiphany.json | 4 ---- overview-button.patch | 10 ++++------ 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 fix-startup-crash.patch diff --git a/fix-startup-crash.patch b/fix-startup-crash.patch deleted file mode 100644 index e040800..0000000 --- a/fix-startup-crash.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/ephy-shell.c b/src/ephy-shell.c -index 20eb9b7f4..9a3bcb661 100644 ---- a/src/ephy-shell.c -+++ b/src/ephy-shell.c -@@ -574,6 +574,14 @@ ephy_shell_startup (GApplication *application) - EphyEmbedShellMode mode; - GAction *action; - -+#ifdef USE_GRANITE -+ /* Apply elementary stylesheet instead of default Adwaita stylesheet. -+ * This needs to be before calling the parent startup() to work. -+ */ -+ if (is_desktop_pantheon ()) -+ granite_init (); -+#endif -+ - G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); - - #if USE_GRANITE -@@ -944,11 +952,6 @@ ephy_shell_init (EphyShell *shell) - ephy_shell->startup_finished = FALSE; - g_object_add_weak_pointer (G_OBJECT (ephy_shell), - (gpointer *)ptr); -- --#ifdef USE_GRANITE -- if (is_desktop_pantheon ()) -- granite_init (); --#endif - } - - static void diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 1754838..a48d471 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -32,10 +32,6 @@ "name": "epiphany" } }, - { - "type": "patch", - "path": "fix-startup-crash.patch" - }, { "type": "patch", "path": "downloads-flat.patch" diff --git a/overview-button.patch b/overview-button.patch index 74b1ecd..57eb2df 100644 --- a/overview-button.patch +++ b/overview-button.patch @@ -1,14 +1,12 @@ diff --git a/src/ephy-action-bar-end.c b/src/ephy-action-bar-end.c -index 88e194841..75186fa73 100644 +index 0269b2cb0..75186fa73 100644 --- a/src/ephy-action-bar-end.c +++ b/src/ephy-action-bar-end.c -@@ -320,8 +320,9 @@ ephy_action_bar_end_init (EphyActionBarEnd *action_bar_end) - if (is_desktop_pantheon ()) { +@@ -321,7 +321,8 @@ ephy_action_bar_end_init (EphyActionBarEnd *action_bar_end) gtk_button_set_icon_name (GTK_BUTTON (action_bar_end->bookmarks_button), "user-bookmarks"); -- gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (action_bar_end->overview_button), -- "view-grid"); -+ gtk_button_set_icon_name (GTK_BUTTON (action_bar_end->overview_button), + gtk_button_set_icon_name (GTK_BUTTON (action_bar_end->overview_button), +- "view-grid"); + "adw-tab-overview-symbolic"); + gtk_widget_remove_css_class (action_bar_end->overview_button, "toolbar-button"); }