From 656bdb89611f8b2559cbdcaf1021db638f1f9ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 6 Mar 2023 14:05:26 -0800 Subject: [PATCH 1/9] Bump to 44 --- org.gnome.epiphany.json | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 54b3af9..f59cc6d 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -16,22 +16,11 @@ "--own-name=org.gnome.Epiphany.WebAppProvider" ], "modules" : [ - { - "name" : "libdazzle", - "buildsystem" : "meson", - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git", - "tag" : "3.44.0" - } - ] - }, { "name" : "libportal", "buildsystem" : "meson", "config-opts" : [ - "-Dbackends=gtk3", + "-Dbackends=gtk4", "-Dintrospection=false", "-Ddocs=false" ], @@ -44,19 +33,17 @@ ] }, { - "name": "epiphany", - "buildsystem": "meson", + "name" : "epiphany", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "-Dgranite=enabled" + ], "sources" : [ { "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/epiphany.git", - "tag" : "43.0", - "commit" : "e5882e2b1fa040fbe6494ee9808591046a6eafa5", "disable-shallow-clone" : true - }, - { - "type" : "patch", - "path" : "navigation-buttons.patch" } ], "cleanup": [ From f34769e0c8be390026a127a06e24debfe4d710dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 15:28:28 -0700 Subject: [PATCH 2/9] Add missing icons --- 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 | 47 +++++++++++++++++++++ data/meson.build | 30 ++++++++++++++ org.gnome.epiphany.json | 56 ++++++++++++++++++++++++-- 8 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 data/adw-expander-arrow-symbolic.svg create mode 100644 data/adw-tab-counter-symbolic.svg create mode 100644 data/adw-tab-icon-missing-symbolic.svg create mode 100644 data/adw-tab-overflow-symbolic.svg create mode 100644 data/adw-tab-unpin-symbolic.svg create mode 100644 data/list-drag-handle-symbolic.svg diff --git a/data/adw-expander-arrow-symbolic.svg b/data/adw-expander-arrow-symbolic.svg new file mode 100644 index 0000000..9bc1b48 --- /dev/null +++ b/data/adw-expander-arrow-symbolic.svg @@ -0,0 +1,30 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/data/adw-tab-counter-symbolic.svg b/data/adw-tab-counter-symbolic.svg new file mode 100644 index 0000000..3ad5d18 --- /dev/null +++ b/data/adw-tab-counter-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/adw-tab-icon-missing-symbolic.svg b/data/adw-tab-icon-missing-symbolic.svg new file mode 100644 index 0000000..778eb43 --- /dev/null +++ b/data/adw-tab-icon-missing-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/adw-tab-overflow-symbolic.svg b/data/adw-tab-overflow-symbolic.svg new file mode 100644 index 0000000..2f89e9a --- /dev/null +++ b/data/adw-tab-overflow-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/adw-tab-unpin-symbolic.svg b/data/adw-tab-unpin-symbolic.svg new file mode 100644 index 0000000..e5c3fe2 --- /dev/null +++ b/data/adw-tab-unpin-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/data/list-drag-handle-symbolic.svg b/data/list-drag-handle-symbolic.svg new file mode 100644 index 0000000..74ce654 --- /dev/null +++ b/data/list-drag-handle-symbolic.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/data/meson.build b/data/meson.build index 268d07b..c434bf3 100644 --- a/data/meson.build +++ b/data/meson.build @@ -13,6 +13,36 @@ 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( + '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/org.gnome.epiphany.json b/org.gnome.epiphany.json index f59cc6d..501fc10 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -1,8 +1,8 @@ { "app-id" : "org.gnome.Epiphany", - "runtime" : "io.elementary.Platform", - "runtime-version" : "7.1", - "sdk" : "io.elementary.Sdk", + "runtime" : "org.gnome.Platform", + "runtime-version" : "master", + "sdk" : "org.gnome.Sdk", "command" : "epiphany", "finish-args" : [ "--device=dri", @@ -32,6 +32,56 @@ } ] }, + { + "name": "elementary-stylesheet", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://github.com/elementary/stylesheet.git", + "branch": "boxed-list" + } + ], + "modules": [ + { + "name": "sassc", + "buildsystem" : "meson", + "cleanup": [ "*" ], + "sources": [ + { + "type": "git", + "url" : "https://github.com/lazka/sassc.git", + "branch" : "meson" + } + ], + "modules": [ + { + "name": "libsass", + "buildsystem" : "meson", + "cleanup": [ "*" ], + "sources": [ + { + "type": "git", + "url" : "https://github.com/lazka/libsass.git", + "branch" : "meson" + } + ] + } + ] + } + ] + }, + { + "name": "granite", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://github.com/elementary/granite.git", + "branch": "main" + } + ] + }, { "name" : "epiphany", "buildsystem" : "meson", From 5541be9161a0a2bf94cc99a6f77b61a7f51b34f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 17:53:34 -0700 Subject: [PATCH 3/9] Add more missing icons --- data/list-drag-handle-symbolic.svg | 38 +++--------------------------- data/meson.build | 5 ++++ data/selection-mode-symbolic.svg | 7 ++++++ org.gnome.epiphany.json | 5 ++-- 4 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 data/selection-mode-symbolic.svg diff --git a/data/list-drag-handle-symbolic.svg b/data/list-drag-handle-symbolic.svg index 74ce654..c93ddc0 100644 --- a/data/list-drag-handle-symbolic.svg +++ b/data/list-drag-handle-symbolic.svg @@ -8,40 +8,8 @@ xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - + style="fill:#555761;stroke-width:2.5798;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;stop-color:#000000;opacity:0.5" + d="M 6 3 A 1 1 0 0 0 5 4 A 1 1 0 0 0 6 5 A 1 1 0 0 0 7 4 A 1 1 0 0 0 6 3 z M 10 3 A 1 1 0 0 0 9 4 A 1 1 0 0 0 10 5 A 1 1 0 0 0 11 4 A 1 1 0 0 0 10 3 z M 6 7 A 1 1 0 0 0 5 8 A 1 1 0 0 0 6 9 A 1 1 0 0 0 7 8 A 1 1 0 0 0 6 7 z M 10 7 A 1 1 0 0 0 9 8 A 1 1 0 0 0 10 9 A 1 1 0 0 0 11 8 A 1 1 0 0 0 10 7 z M 6 11 A 1 1 0 0 0 5 12 A 1 1 0 0 0 6 13 A 1 1 0 0 0 7 12 A 1 1 0 0 0 6 11 z M 10 11 A 1 1 0 0 0 9 12 A 1 1 0 0 0 10 13 A 1 1 0 0 0 11 12 A 1 1 0 0 0 10 11 z " /> diff --git a/data/meson.build b/data/meson.build index c434bf3..e54c651 100644 --- a/data/meson.build +++ b/data/meson.build @@ -23,6 +23,11 @@ install_data( 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', diff --git a/data/selection-mode-symbolic.svg b/data/selection-mode-symbolic.svg new file mode 100644 index 0000000..ef23c03 --- /dev/null +++ b/data/selection-mode-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 501fc10..8569ec9 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -37,9 +37,8 @@ "buildsystem": "meson", "sources": [ { - "type": "git", - "url": "https://github.com/elementary/stylesheet.git", - "branch": "boxed-list" + "type": "dir", + "path": "/home/dani/Projects/stylesheet" } ], "modules": [ From f3337689bdffcfd456d8ed00396d5e88e2ba6bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 23 Mar 2023 16:11:20 -0700 Subject: [PATCH 4/9] Switch to daily elementary platform --- org.gnome.epiphany.json | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 8569ec9..bc63b06 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -1,8 +1,8 @@ { "app-id" : "org.gnome.Epiphany", - "runtime" : "org.gnome.Platform", - "runtime-version" : "master", - "sdk" : "org.gnome.Sdk", + "runtime" : "io.elementary.Platform", + "runtime-version" : "daily", + "sdk" : "io.elementary.Sdk", "command" : "epiphany", "finish-args" : [ "--device=dri", @@ -37,8 +37,9 @@ "buildsystem": "meson", "sources": [ { - "type": "dir", - "path": "/home/dani/Projects/stylesheet" + "type": "git", + "url" : "https://github.com/elementary/stylesheet.git", + "branch" : "master" } ], "modules": [ @@ -70,17 +71,6 @@ } ] }, - { - "name": "granite", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://github.com/elementary/granite.git", - "branch": "main" - } - ] - }, { "name" : "epiphany", "buildsystem" : "meson", From 27a139c94093915a7f834deb5be449116a2af689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 23 Mar 2023 16:16:27 -0700 Subject: [PATCH 5/9] Update org.gnome.epiphany.json --- org.gnome.epiphany.json | 118 ++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 42 deletions(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index bc63b06..456eb1b 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -1,10 +1,10 @@ { - "app-id" : "org.gnome.Epiphany", - "runtime" : "io.elementary.Platform", - "runtime-version" : "daily", - "sdk" : "io.elementary.Sdk", - "command" : "epiphany", - "finish-args" : [ + "app-id": "org.gnome.Epiphany", + "runtime": "io.elementary.Platform", + "runtime-version": "daily", + "sdk": "io.elementary.Sdk", + "command": "epiphany", + "finish-args": [ "--device=dri", "--filesystem=xdg-download", "--share=ipc", @@ -12,58 +12,67 @@ "--socket=fallback-x11", "--socket=pulseaudio", "--socket=wayland", - "--system-talk-name=org.freedesktop.GeoClue2", - "--own-name=org.gnome.Epiphany.WebAppProvider" + "--system-talk-name=org.freedesktop.GeoClue2" ], - "modules" : [ - { - "name" : "libportal", - "buildsystem" : "meson", - "config-opts" : [ - "-Dbackends=gtk4", - "-Dintrospection=false", - "-Ddocs=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", - "tag" : "0.6" - } - ] - }, + "modules": [ { "name": "elementary-stylesheet", "buildsystem": "meson", "sources": [ { "type": "git", - "url" : "https://github.com/elementary/stylesheet.git", + "url": "https://github.com/elementary/stylesheet.git", "branch" : "master" } ], "modules": [ { "name": "sassc", - "buildsystem" : "meson", - "cleanup": [ "*" ], + "cleanup": [ + "*" + ], "sources": [ { "type": "git", - "url" : "https://github.com/lazka/sassc.git", - "branch" : "meson" + "url": "https://github.com/sass/sassc.git", + "tag": "3.6.2", + "x-checker-data": { + "type": "git", + "tag-pattern": "^([\\d.]+)$" + }, + "commit": "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -si" + ] } ], "modules": [ { "name": "libsass", - "buildsystem" : "meson", - "cleanup": [ "*" ], + "cleanup": [ + "*" + ], "sources": [ { "type": "git", - "url" : "https://github.com/lazka/libsass.git", - "branch" : "meson" + "url": "https://github.com/sass/libsass.git", + "tag": "3.6.5", + "x-checker-data": { + "type": "git", + "tag-pattern": "^([\\d.]+)$" + }, + "commit": "f6afdbb9288d20d1257122e71d88e53348a53af3" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -si" + ] } ] } @@ -72,17 +81,42 @@ ] }, { - "name" : "epiphany", - "buildsystem" : "meson", - "builddir" : true, - "config-opts" : [ + "name": "libportal", + "buildsystem": "meson", + "config-opts": [ + "-Dbackends=gtk4", + "-Dintrospection=false", + "-Ddocs=false" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz", + "sha256": "88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566", + "x-checker-data": { + "type": "json", + "url": "https://api.github.com/repos/flatpak/libportal/releases/latest", + "version-query": ".tag_name", + "url-query": ".assets[] | select(.name==\"libportal-\" + $version + \".tar.xz\") | .browser_download_url" + } + } + ] + }, + { + "name": "epiphany", + "buildsystem": "meson", + "config-opts": [ "-Dgranite=enabled" ], - "sources" : [ + "sources": [ { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/epiphany.git", - "disable-shallow-clone" : true + "type": "archive", + "url": "https://download.gnome.org/sources/epiphany/44/epiphany-44.0.tar.xz", + "sha256": "aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1", + "x-checker-data": { + "type": "gnome", + "name": "epiphany" + } } ], "cleanup": [ From 03e54c99378e1ce773bab464a4bb7f16ce448ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sun, 26 Mar 2023 18:46:06 -0700 Subject: [PATCH 6/9] 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 7b903c2..2f9b2f1 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.1-${{ matrix.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:daily-${{ matrix.arch }} options: --privileged steps: From 858c1e7d2d83ff65905ac364003071a3a86f1a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 28 Mar 2023 17:11:36 -0700 Subject: [PATCH 7/9] Update org.gnome.epiphany.json --- org.gnome.epiphany.json | 65 ----------------------------------------- 1 file changed, 65 deletions(-) diff --git a/org.gnome.epiphany.json b/org.gnome.epiphany.json index 456eb1b..a79a327 100644 --- a/org.gnome.epiphany.json +++ b/org.gnome.epiphany.json @@ -15,71 +15,6 @@ "--system-talk-name=org.freedesktop.GeoClue2" ], "modules": [ - { - "name": "elementary-stylesheet", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://github.com/elementary/stylesheet.git", - "branch" : "master" - } - ], - "modules": [ - { - "name": "sassc", - "cleanup": [ - "*" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/sass/sassc.git", - "tag": "3.6.2", - "x-checker-data": { - "type": "git", - "tag-pattern": "^([\\d.]+)$" - }, - "commit": "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "autoreconf -si" - ] - } - ], - "modules": [ - { - "name": "libsass", - "cleanup": [ - "*" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/sass/libsass.git", - "tag": "3.6.5", - "x-checker-data": { - "type": "git", - "tag-pattern": "^([\\d.]+)$" - }, - "commit": "f6afdbb9288d20d1257122e71d88e53348a53af3" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "autoreconf -si" - ] - } - ] - } - ] - } - ] - }, { "name": "libportal", "buildsystem": "meson", From 927e4b12011e3ab9bcef2437684e60b7d0ecd6bf Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Sat, 1 Apr 2023 17:52:09 +0100 Subject: [PATCH 8/9] 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 a79a327..401f3bb 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.2", "sdk": "io.elementary.Sdk", "command": "epiphany", "finish-args": [ From 624989b8b242d26dab5e65d6b1fc173f11d7b919 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Sat, 1 Apr 2023 18:36:09 +0100 Subject: [PATCH 9/9] 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 2f9b2f1..fe0d67f 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:daily-${{ matrix.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:7.2-${{ matrix.arch }} options: --privileged steps: