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

ryonakano · web-flow · commit 56ed5740eb23 · 2025-05-19T08:17:09.000-07:00
diff --git 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
@@ -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
diff --git 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
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg3"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3" />
+  <g
+     transform="translate(-613 171)"
+     id="g3"
+     style="fill:#555761">
+    <path
+       color="#000"
+       d="M614.49-161.037a1.5 1.5 0 0 0-1.478 1.521v2.995a1.5 1.5 0 1 0 3 0v-2.995a1.5 1.5 0 0 0-1.522-1.521z"
+       fill="#666"
+       font-family="sans-serif"
+       font-weight="400"
+       overflow="visible"
+       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;fill:#555761"
+       white-space="normal"
+       id="path1" />
+    <path
+       color="#000"
+       d="M614.492-169.021a.5.5 0 0 0-.492.507V-161a.5.5 0 1 0 1 0v-7.514a.5.5 0 0 0-.508-.507z"
+       fill="#666"
+       font-family="sans-serif"
+       font-weight="400"
+       overflow="visible"
+       style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;fill:#555761"
+       white-space="normal"
+       id="path2" />
+    <path
+       d="M621.47-168c-1.047 1-4.323 1.055-6.69 1l.058 1s.468-.047.496.014c.456 1.009 1.482 2.408 3.666 2.408 2.062 0 2.5-1.922 2.5-1.922s.596 1.89 2.5 1.89c3.51 0 4-3.39 4-3.39-2.602.148-5.443 0-6.53-1zm-2.938 2c.959.008 1.468.5 1.468.5s-.198.5-1.375.5c-1.123 0-1.625-.688-1.625-.688s.96-.317 1.532-.312zm5.937 0c.571-.005 1.531.313 1.531.313s-.408.687-1.625.687c-1.145 0-1.375-.5-1.375-.5s.51-.492 1.47-.5z"
+       fill="#666"
+       id="path3"
+       style="fill:#555761" />
+  </g>
+</svg>
diff --git a/fix-startup-crash.patch 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
@@ -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,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",
diff --git 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");
    }
  

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ icon_names = [`
`27`	`27`	`'ephy-permission-location-symbolic.svg',`
`28`	`28`	`'ephy-permission-microphone-symbolic.svg',`
`29`	`29`	`'ephy-permission-notifications-symbolic.svg',`
`30`		`- 'ephy-starred-symbolic.svg'`
	`30`	`+ 'ephy-starred-symbolic.svg',`
	`31`	`+ 'preferences-system-privacy-symbolic.svg'`
`31`	`32`	`]`
`32`	`33`
`33`	`34`	`foreach icon_name : icon_names`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"app-id": "org.gnome.Epiphany",`
`3`	`3`	`"runtime": "io.elementary.Platform",`
`4`		`- "runtime-version": "8.1",`
	`4`	`+ "runtime-version": "8.2",`
`5`	`5`	`"sdk": "io.elementary.Sdk",`
`6`	`6`	`"command": "epiphany",`
`7`	`7`	`"finish-args": [`
`@@ -25,16 +25,16 @@`
`25`	`25`	`"sources": [`
`26`	`26`	`{`
`27`	`27`	`"type": "archive",`
`28`		`- "url": "https://download.gnome.org/sources/epiphany/46/epiphany-46.5.tar.xz",`
`29`		`- "sha256": "b9c7dae15d038519bf189f440eacd8c27e5abfba39ce05e9c95823a9d6396311",`
	`28`	`+ "url": "https://download.gnome.org/sources/epiphany/48/epiphany-48.3.tar.xz",`
	`29`	`+ "sha256": "da2953e7e2b73bf7473c0a33979104d79362795295eaa0a2a38ea188537daf13",`
`30`	`30`	`"x-checker-data": {`
`31`	`31`	`"type": "gnome",`
`32`	`32`	`"name": "epiphany"`
`33`	`33`	`}`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`"type": "patch",`
`37`		`- "path": "bookmarks-row.patch"`
	`37`	`+ "path": "fix-startup-crash.patch"`
`38`	`38`	`},`
`39`	`39`	`{`
`40`	`40`	`"type": "patch",`