From dacdd3f1c43955fc7b1e219ecbf4f77078a93398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 15 Nov 2023 09:10:55 -0800 Subject: [PATCH 1/8] Update to 45.1 --- 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 b02fc34..5626349 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -48,8 +48,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/epiphany/44/epiphany-44.6.tar.xz", - "sha256": "5335dd573581db61e126d854dc16ae519657a5b8790789a47d25e43e17cd3a43", + "url": "https://download.gnome.org/sources/epiphany/45/epiphany-45.1.tar.xz", + "sha256": "7c994ef34ecd60e915de331ee123c08938f9623cefada6d50b99e3c9c5ad8135", "x-checker-data": { "type": "gnome", "name": "epiphany" From cf81cd78fa09bab587cbdf393b1cd04fa2b4ebc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 15 Nov 2023 09:12:25 -0800 Subject: [PATCH 2/8] Temporarily use daily platform --- org.gnome.epiphany.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 5626349..03e113c 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": "7.2", + "runtime-version": "daily", "sdk": "io.elementary.Sdk", "command": "epiphany", "finish-args": [ From 95f8bf40f4a50cd11c0498b1acf7c49351fd72f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 15 Nov 2023 09:19:27 -0800 Subject: [PATCH 3/8] Remove UI icons bundled in platform --- data/adw-expander-arrow-symbolic.svg | 30 ---------------------- data/adw-tab-counter-symbolic.svg | 1 - data/adw-tab-icon-missing-symbolic.svg | 1 - data/adw-tab-overflow-symbolic.svg | 1 - data/adw-tab-unpin-symbolic.svg | 6 ----- data/list-drag-handle-symbolic.svg | 15 ----------- data/meson.build | 35 -------------------------- data/selection-mode-symbolic.svg | 7 ------ 8 files changed, 96 deletions(-) delete mode 100644 data/adw-expander-arrow-symbolic.svg delete mode 100644 data/adw-tab-counter-symbolic.svg delete mode 100644 data/adw-tab-icon-missing-symbolic.svg delete mode 100644 data/adw-tab-overflow-symbolic.svg delete mode 100644 data/adw-tab-unpin-symbolic.svg delete mode 100644 data/list-drag-handle-symbolic.svg delete mode 100644 data/selection-mode-symbolic.svg diff --git a/data/adw-expander-arrow-symbolic.svg b/data/adw-expander-arrow-symbolic.svg deleted file mode 100644 index 9bc1b48..0000000 --- a/data/adw-expander-arrow-symbolic.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/adw-tab-counter-symbolic.svg b/data/adw-tab-counter-symbolic.svg deleted file mode 100644 index 3ad5d18..0000000 --- a/data/adw-tab-counter-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/adw-tab-icon-missing-symbolic.svg b/data/adw-tab-icon-missing-symbolic.svg deleted file mode 100644 index 778eb43..0000000 --- a/data/adw-tab-icon-missing-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/adw-tab-overflow-symbolic.svg b/data/adw-tab-overflow-symbolic.svg deleted file mode 100644 index 2f89e9a..0000000 --- a/data/adw-tab-overflow-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/adw-tab-unpin-symbolic.svg b/data/adw-tab-unpin-symbolic.svg deleted file mode 100644 index e5c3fe2..0000000 --- a/data/adw-tab-unpin-symbolic.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/data/list-drag-handle-symbolic.svg b/data/list-drag-handle-symbolic.svg deleted file mode 100644 index c93ddc0..0000000 --- a/data/list-drag-handle-symbolic.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/data/meson.build b/data/meson.build index e54c651..268d07b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -13,41 +13,6 @@ foreach i : icon_sizes ) endforeach -install_data( - 'adw-expander-arrow-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'actions' / 'symbolic', -) - -install_data( - 'list-drag-handle-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'actions' / 'symbolic', -) - -install_data( - 'selection-mode-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'actions' / 'symbolic', -) - -install_data( - 'adw-tab-counter-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) - -install_data( - 'adw-tab-icon-missing-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) - -install_data( - 'adw-tab-overflow-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) - -install_data( - 'adw-tab-unpin-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) - install_data( 'ephy-non-starred-symbolic.svg', install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', diff --git a/data/selection-mode-symbolic.svg b/data/selection-mode-symbolic.svg deleted file mode 100644 index ef23c03..0000000 --- a/data/selection-mode-symbolic.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From 1b13bdad3980e84991f4eb80d6d545cdb99fc6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 18 Nov 2023 08:43:17 -0800 Subject: [PATCH 4/8] Patch download button, add icons --- data/ephy-audio-muted-symbolic.svg | 25 ++++++++++++ data/ephy-audio-playing-symbolic.svg | 15 +++++++ data/ephy-bookmark-tag-symbolic.svg | 15 +++++++ data/ephy-download-done-symbolic.svg | 15 +++++++ data/ephy-download-symbolic.svg | 15 +++++++ data/ephy-open-link-symbolic.svg | 39 +++++++++++++++++++ data/ephy-permission-camera-symbolic.svg | 7 ++++ data/ephy-permission-generic-symbolic.svg | 6 +++ data/ephy-permission-location-symbolic.svg | 29 ++++++++++++++ data/ephy-permission-microphone-symbolic.svg | 6 +++ ...ephy-permission-notifications-symbolic.svg | 6 +++ data/meson.build | 27 +++++++++---- downloads-flat.patch | 12 ++++++ navigation-buttons.patch | 13 ------- org.gnome.epiphany.json | 4 ++ 15 files changed, 214 insertions(+), 20 deletions(-) create mode 100644 data/ephy-audio-muted-symbolic.svg create mode 100644 data/ephy-audio-playing-symbolic.svg create mode 100644 data/ephy-bookmark-tag-symbolic.svg create mode 100644 data/ephy-download-done-symbolic.svg create mode 100644 data/ephy-download-symbolic.svg create mode 100644 data/ephy-open-link-symbolic.svg create mode 100644 data/ephy-permission-camera-symbolic.svg create mode 100644 data/ephy-permission-generic-symbolic.svg create mode 100644 data/ephy-permission-location-symbolic.svg create mode 100644 data/ephy-permission-microphone-symbolic.svg create mode 100644 data/ephy-permission-notifications-symbolic.svg create mode 100644 downloads-flat.patch delete mode 100644 navigation-buttons.patch diff --git a/data/ephy-audio-muted-symbolic.svg b/data/ephy-audio-muted-symbolic.svg new file mode 100644 index 0000000..e442d4a --- /dev/null +++ b/data/ephy-audio-muted-symbolic.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/data/ephy-audio-playing-symbolic.svg b/data/ephy-audio-playing-symbolic.svg new file mode 100644 index 0000000..7898852 --- /dev/null +++ b/data/ephy-audio-playing-symbolic.svg @@ -0,0 +1,15 @@ + + + + + diff --git a/data/ephy-bookmark-tag-symbolic.svg b/data/ephy-bookmark-tag-symbolic.svg new file mode 100644 index 0000000..d5fdef0 --- /dev/null +++ b/data/ephy-bookmark-tag-symbolic.svg @@ -0,0 +1,15 @@ + + + + + diff --git a/data/ephy-download-done-symbolic.svg b/data/ephy-download-done-symbolic.svg new file mode 100644 index 0000000..effc8d0 --- /dev/null +++ b/data/ephy-download-done-symbolic.svg @@ -0,0 +1,15 @@ + + + + + diff --git a/data/ephy-download-symbolic.svg b/data/ephy-download-symbolic.svg new file mode 100644 index 0000000..cfe2080 --- /dev/null +++ b/data/ephy-download-symbolic.svg @@ -0,0 +1,15 @@ + + + + + diff --git a/data/ephy-open-link-symbolic.svg b/data/ephy-open-link-symbolic.svg new file mode 100644 index 0000000..ea28579 --- /dev/null +++ b/data/ephy-open-link-symbolic.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/data/ephy-permission-camera-symbolic.svg b/data/ephy-permission-camera-symbolic.svg new file mode 100644 index 0000000..5c63405 --- /dev/null +++ b/data/ephy-permission-camera-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/ephy-permission-generic-symbolic.svg b/data/ephy-permission-generic-symbolic.svg new file mode 100644 index 0000000..334c005 --- /dev/null +++ b/data/ephy-permission-generic-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/ephy-permission-location-symbolic.svg b/data/ephy-permission-location-symbolic.svg new file mode 100644 index 0000000..44f0295 --- /dev/null +++ b/data/ephy-permission-location-symbolic.svg @@ -0,0 +1,29 @@ + + + + + + image/svg+xml + + + + + + + diff --git a/data/ephy-permission-microphone-symbolic.svg b/data/ephy-permission-microphone-symbolic.svg new file mode 100644 index 0000000..053d25d --- /dev/null +++ b/data/ephy-permission-microphone-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/ephy-permission-notifications-symbolic.svg b/data/ephy-permission-notifications-symbolic.svg new file mode 100644 index 0000000..fcf7bc3 --- /dev/null +++ b/data/ephy-permission-notifications-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/meson.build b/data/meson.build index 268d07b..f0dad59 100644 --- a/data/meson.build +++ b/data/meson.build @@ -13,12 +13,25 @@ foreach i : icon_sizes ) endforeach -install_data( +icon_names = [ + 'ephy-audio-muted-symbolic.svg', + 'ephy-audio-playing-symbolic.svg', + 'ephy-bookmark-tag-symbolic.svg', + 'ephy-download-done-symbolic.svg', + 'ephy-download-symbolic.svg', 'ephy-non-starred-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) + 'ephy-open-link-symbolic.svg', + 'ephy-permission-camera-symbolic.svg', + 'ephy-permission-generic-symbolic.svg', + 'ephy-permission-location-symbolic.svg', + 'ephy-permission-microphone-symbolic.svg', + 'ephy-permission-notifications-symbolic.svg', + 'ephy-starred-symbolic.svg' +] -install_data( - 'ephy-starred-symbolic.svg', - install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', -) +foreach icon_name : icon_names + install_data( + icon_name, + install_dir: get_option('datadir') / 'icons' / 'elementary' / 'status' / 'symbolic', + ) +endforeach diff --git a/downloads-flat.patch b/downloads-flat.patch new file mode 100644 index 0000000..39de97d --- /dev/null +++ b/downloads-flat.patch @@ -0,0 +1,12 @@ +diff --git a/src/resources/gtk/action-bar-end.ui b/src/resources/gtk/action-bar-end.ui +index b5d601fc2..7ed0cca4c 100644 +--- a/src/resources/gtk/action-bar-end.ui ++++ b/src/resources/gtk/action-bar-end.ui +@@ -7,6 +7,7 @@ + crossfade + + ++ False + + Downloads + True diff --git a/navigation-buttons.patch b/navigation-buttons.patch deleted file mode 100644 index 08f1889..0000000 --- a/navigation-buttons.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui -index e604b9601..2bfe244d5 100644 ---- a/src/resources/gtk/action-bar-start.ui -+++ b/src/resources/gtk/action-bar-start.ui -@@ -7,7 +7,6 @@ - True - horizontal - - - diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 03e113c..a3acade 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -54,6 +54,10 @@ "type": "gnome", "name": "epiphany" } + }, + { + "type": "patch", + "path": "downloads-flat.patch" } ], "cleanup": [ From cd624fd958c4da1912b33c12d39cf854e241b0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 18 Nov 2023 09:23:57 -0800 Subject: [PATCH 5/8] Add overview button patch and bookmarks menu patch --- bookmarks-row.patch | 16 ++++++++++++++ data/adw-tab-overview-symbolic.svg | 34 ++++++++++++++++++++++++++++++ data/meson.build | 1 + org.gnome.epiphany.json | 8 +++++++ overview-button.patch | 16 ++++++++++++++ 5 files changed, 75 insertions(+) create mode 100644 bookmarks-row.patch create mode 100644 data/adw-tab-overview-symbolic.svg create mode 100644 overview-button.patch diff --git a/bookmarks-row.patch b/bookmarks-row.patch new file mode 100644 index 0000000..e037753 --- /dev/null +++ b/bookmarks-row.patch @@ -0,0 +1,16 @@ +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/adw-tab-overview-symbolic.svg b/data/adw-tab-overview-symbolic.svg new file mode 100644 index 0000000..edc9150 --- /dev/null +++ b/data/adw-tab-overview-symbolic.svg @@ -0,0 +1,34 @@ + + diff --git a/data/meson.build b/data/meson.build index f0dad59..3ceb125 100644 --- a/data/meson.build +++ b/data/meson.build @@ -14,6 +14,7 @@ foreach i : icon_sizes endforeach icon_names = [ + 'adw-tab-overview-symbolic.svg', 'ephy-audio-muted-symbolic.svg', 'ephy-audio-playing-symbolic.svg', 'ephy-bookmark-tag-symbolic.svg', diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index a3acade..033658e 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -55,9 +55,17 @@ "name": "epiphany" } }, + { + "type": "patch", + "path": "bookmarks-row.patch" + }, { "type": "patch", "path": "downloads-flat.patch" + }, + { + "type": "patch", + "path": "overview-button.patch" } ], "cleanup": [ diff --git a/overview-button.patch b/overview-button.patch new file mode 100644 index 0000000..c781e67 --- /dev/null +++ b/overview-button.patch @@ -0,0 +1,16 @@ +diff --git a/src/ephy-action-bar-end.c b/src/ephy-action-bar-end.c +index 20034eec7..fb0666ef3 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) + if (is_desktop_pantheon ()) { + gtk_menu_button_set_icon_name (GTK_MENU_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"); ++ gtk_widget_remove_css_class (action_bar_end->overview_button, "toolbar-button"); + } + + gtk_widget_set_visible (action_bar_end->overview_button, From 7f8643bd967c3ec33e3450cd68f9151d23fd8000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 18 Nov 2023 10:53:16 -0800 Subject: [PATCH 6/8] Update org.gnome.epiphany.json --- org.gnome.epiphany.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 033658e..ab900b1 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": "daily", + "runtime-version": "7.3", "sdk": "io.elementary.Sdk", "command": "epiphany", "finish-args": [ From ba64b84e0601e5ac552dee4dfb52248024f80044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 18 Nov 2023 10:53:43 -0800 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84c8136..2b42b01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:7.2-${{ matrix.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:7.3-${{ matrix.arch }} options: --privileged steps: From 62000d70b2f447cf61cc0684eabbc0d40b7902f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 18 Nov 2023 10:53:57 -0800 Subject: [PATCH 8/8] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 97d7472..013485c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:7.2-${{ matrix.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:7.3-${{ matrix.arch }} options: --privileged steps: