Skip to content

epiphany: Update epiphany-46.5.tar.xz to 48.3 #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 19, 2025
Merged

epiphany: Update epiphany-46.5.tar.xz to 48.3 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c6f1a5
epiphany: Update epiphany-46.5.tar.xz to 48.0
ryonakano Apr 20, 2025
16841df
Add symbolic privacy icon
danirabbit Apr 28, 2025
00fc7d1
Drop bookmarks patch
danirabbit Apr 29, 2025
e4d22a1
Merge remote-tracking branch 'origin/main' into ryonakano/bump-epiphany
ryonakano May 15, 2025
ff9260b
Bump Flatpak platform to 8.2
ryonakano May 15, 2025
f095430
Update ci.yml
danirabbit May 15, 2025
c0e9eb9
Update merge.yml
danirabbit May 15, 2025
6652c67
Bump epiphany to 48.3
ryonakano May 17, 2025
80c34e8
Fix startup crash
ryonakano May 17, 2025
7e9d584
Rename and simplify patch
ryonakano May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
options: --privileged

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false

container:
image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }}
image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
options: --privileged

steps:
Expand Down
16 changes: 0 additions & 16 deletions bookmarks-row.patch
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ icon_names = [
'ephy-permission-location-symbolic.svg',
'ephy-permission-microphone-symbolic.svg',
'ephy-permission-notifications-symbolic.svg',
'ephy-starred-symbolic.svg'
'ephy-starred-symbolic.svg',
'preferences-system-privacy-symbolic.svg'
]

foreach icon_name : icon_names
Expand Down
41 changes: 41 additions & 0 deletions data/preferences-system-privacy-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions fix-startup-crash.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
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
8 changes: 4 additions & 4 deletions org.gnome.epiphany.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"app-id": "org.gnome.Epiphany",
"runtime": "io.elementary.Platform",
"runtime-version": "8.1",
"runtime-version": "8.2",
"sdk": "io.elementary.Sdk",
"command": "epiphany",
"finish-args": [
Expand All @@ -25,16 +25,16 @@
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/epiphany/46/epiphany-46.5.tar.xz",
"sha256": "b9c7dae15d038519bf189f440eacd8c27e5abfba39ce05e9c95823a9d6396311",
"url": "https://download.gnome.org/sources/epiphany/48/epiphany-48.3.tar.xz",
"sha256": "da2953e7e2b73bf7473c0a33979104d79362795295eaa0a2a38ea188537daf13",
"x-checker-data": {
"type": "gnome",
"name": "epiphany"
}
},
{
"type": "patch",
"path": "bookmarks-row.patch"
"path": "fix-startup-crash.patch"
},
{
"type": "patch",
Expand Down
10 changes: 5 additions & 5 deletions overview-button.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/src/ephy-action-bar-end.c b/src/ephy-action-bar-end.c
index 20034eec7..fb0666ef3 100644
index 88e194841..75186fa73 100644
--- a/src/ephy-action-bar-end.c
+++ b/src/ephy-action-bar-end.c
@@ -298,8 +298,9 @@ ephy_action_bar_end_init (EphyActionBarEnd *action_bar_end)
@@ -320,8 +320,9 @@ ephy_action_bar_end_init (EphyActionBarEnd *action_bar_end)
if (is_desktop_pantheon ()) {
gtk_menu_button_set_icon_name (GTK_MENU_BUTTON (action_bar_end->bookmarks_button),
"user-bookmarks");
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),
+ "adw-tab-overview-symbolic");
+ "adw-tab-overview-symbolic");
+ gtk_widget_remove_css_class (action_bar_end->overview_button, "toolbar-button");
}

Expand Down
Loading