diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07d6d3a..7f334e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 933b715..74e1a17 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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: diff --git a/bookmarks-row.patch b/bookmarks-row.patch deleted file mode 100644 index e037753..0000000 --- a/bookmarks-row.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/resources/style-elementary.css b/src/resources/style-elementary.css -index 610fcae84..c6ff14386 100644 ---- a/src/resources/style-elementary.css -+++ b/src/resources/style-elementary.css -@@ -75,6 +75,11 @@ popover.suggestions listview > row:selected { - background-color: alpha(currentColor, 0.15); - } - -+.bookmarks-row { -+ min-width: 250px; -+ padding: 3px; -+} -+ - /* bookmarks */ - .bookmarks-row:hover { - background: alpha(currentColor, 0.15); diff --git a/data/meson.build b/data/meson.build index 3ceb125..03d8462 100644 --- a/data/meson.build +++ b/data/meson.build @@ -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 diff --git a/data/preferences-system-privacy-symbolic.svg b/data/preferences-system-privacy-symbolic.svg new file mode 100644 index 0000000..52cbe03 --- /dev/null +++ b/data/preferences-system-privacy-symbolic.svg @@ -0,0 +1,41 @@ + + + + + + + + + diff --git a/fix-startup-crash.patch b/fix-startup-crash.patch new file mode 100644 index 0000000..e040800 --- /dev/null +++ b/fix-startup-crash.patch @@ -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 diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index e1dcebc..2fcb0cf 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -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": [ @@ -25,8 +25,8 @@ "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" @@ -34,7 +34,7 @@ }, { "type": "patch", - "path": "bookmarks-row.patch" + "path": "fix-startup-crash.patch" }, { "type": "patch", diff --git a/overview-button.patch b/overview-button.patch index c781e67..74b1ecd 100644 --- a/overview-button.patch +++ b/overview-button.patch @@ -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"); }