build(flatpak): bump GNOME runtime 3.38 & deps

build-aux/flatpak/com.github.birros.WebArchives.yml

@@ -1,6 +1,6 @@
 id: com.github.birros.WebArchives
 runtime: org.gnome.Platform
-runtime-version: '3.36'
+runtime-version: '3.38'
 sdk: org.gnome.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.node12
@@ -38,12 +38,25 @@ modules:
       - /share
     sources:
       - type: archive
-        url: https://oligarchy.co.uk/xapian/1.4.15/xapian-core-1.4.15.tar.xz
-        sha256: b168e95918a01e014fb6a6cbce26e535f80da4d4791bfa5a0e0051fcb6f950ea
+        url: https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz
+        sha256: b5eb8556dea1b0cad4167a66223522e66d670ec1eba16c7fdc844ed6b652572e
+
+  - name: zstd
+    buildsystem: meson
+    builddir: true
+    subdir: build/meson
+    config-opts:
+      - -Dbin_programs=false
+      - -Dbin_contrib=false
+    sources:
+      - type: archive
+        url: https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz
+        sha256: 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
 
   #
   # require
   #   xapian-core
+  #   zstd
   #
   - name: libzim
     buildsystem: meson
@@ -56,8 +69,8 @@ modules:
       - /lib/pkgconfig
     sources:
       - type: archive
-        url: https://github.com/openzim/libzim/archive/6.0.2.tar.gz
-        sha256: 993b6885b18e54b3df1493895e61f05e525d846f17d0d3cea57fb74f6415b457
+        url: https://github.com/openzim/libzim/archive/6.2.2.tar.gz
+        sha256: 6619035d35c9ba057c80be5758fa86922802c74aca40e5fffd40b77f0f263af2
 
   #
   # require
@@ -100,8 +113,8 @@ modules:
       - /share/vala
     sources:
       - type: archive
-        url: https://ftp.gnome.org/pub/GNOME/sources/tracker/2.3/tracker-2.3.4.tar.xz
-        sha256: 577952244ab977c78b0b88e2f63c4197eaba16e4d66bff692b7f58993e06516d
+        url: https://ftp.gnome.org/pub/GNOME/sources/tracker/2.3/tracker-2.3.6.tar.xz
+        sha256: bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2
 
   - name: libgee
     build-options:
@@ -155,8 +168,8 @@ modules:
       - /share
     sources:
       - type: archive
-        url: https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.13/libhandy-v0.0.13.tar.gz
-        sha256: 138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37
+        url: https://gitlab.gnome.org/GNOME/libhandy/-/archive/1.0.0/libhandy-1.0.0.tar.gz
+        sha256: dc1fff98cbc72a492d1adb489ee1b00e43ab4ac14c983c855ef3df435bbbda27
 
   #
   # require

meson.build

@@ -27,7 +27,7 @@ webkit_web_extension_dep = dependency('webkit2gtk-web-extension-4.0')
 tracker_dep = dependency('tracker-sparql-2.0')
 xml_dep = dependency('libxml-2.0')
 isocodes_dep = dependency('libisocodes')
-handy_dep = dependency('libhandy-0.0', version : '>=0.0.1')
+handy_dep = dependency('libhandy-1', version : '>=1.0.0')
 
 darkreader_sp = subproject('darkreader')
 darkreader_dep = darkreader_sp.get_variable('darkreader')

src/app/states/navigation-logic.vala

@@ -37,6 +37,13 @@ public class WebArchives.NavigationLogic : Object {
                 }
                 break;
             }
+            case RouteState.Route.SEARCHIN:
+            case RouteState.Route.HISTORY:
+            case RouteState.Route.BOOKMARK:
+            case RouteState.Route.SEARCH:
+            {
+                break;
+            }
         }
     }
 
@@ -64,6 +71,10 @@ public class WebArchives.NavigationLogic : Object {
                 context.route_state.route = context.route_state.last_route;
                 break;
             }
+            case RouteState.Route.HOME:
+            {
+                break;
+            }
         }
     }
 
@@ -81,6 +92,13 @@ public class WebArchives.NavigationLogic : Object {
                 context.web_view_state.go_forward ();
                 break;
             }
+            case RouteState.Route.SEARCHIN:
+            case RouteState.Route.HISTORY:
+            case RouteState.Route.BOOKMARK:
+            case RouteState.Route.SEARCH:
+            {
+                break;
+            }
         }
     }
 }

src/app/states/title-logic.vala

@@ -39,6 +39,11 @@ public class WebArchives.TitleLogic : Object {
                     context.archive_state.archive.title;
                 break;
             }
+            case RouteState.Route.SEARCHIN:
+            case RouteState.Route.SEARCH:
+            {
+                break;
+            }
         }
     }
 }

src/app/ui/content/bookmark-view.vala

@@ -9,8 +9,8 @@ public class WebArchives.BookmarkView : Gtk.Box {
         Gtk.ScrolledWindow scrolled_window = new Gtk.ScrolledWindow (null, null);
         add (scrolled_window);
 
-        Hdy.Column max_width_bin = new Hdy.Column ();
-        max_width_bin.set_maximum_width (500);
+        Hdy.Clamp max_width_bin = new Hdy.Clamp ();
+        max_width_bin.set_maximum_size (500);
         scrolled_window.add (max_width_bin);
 
         list_box = new Gtk.ListBox ();

src/app/ui/content/content.vala

@@ -63,6 +63,10 @@ public class WebArchives.Content : Gtk.Stack {
                 set_visible_child (history_view);
                 break;
             }
+            case RouteState.Route.SEARCHIN:
+            {
+                break;
+            }
         }
     }
 

src/app/ui/content/details-dialog.vala

@@ -19,8 +19,8 @@ public class WebArchives.DetailsDialog : Gtk.Dialog {
         );
         content_area.add (scrolled_window);
 
-        Hdy.Column max_width_bin = new Hdy.Column ();
-        max_width_bin.set_maximum_width (900);
+        Hdy.Clamp max_width_bin = new Hdy.Clamp ();
+        max_width_bin.set_maximum_size (900);
         scrolled_window.add (max_width_bin);
 
         grid = new Gtk.Grid ();

src/app/ui/content/history-view.vala

@@ -11,8 +11,8 @@ public class WebArchives.HistoryView : Gtk.Box {
         );
         add (scrolled_window);
 
-        Hdy.Column max_width_bin = new Hdy.Column ();
-        max_width_bin.set_maximum_width (500);
+        Hdy.Clamp max_width_bin = new Hdy.Clamp ();
+        max_width_bin.set_maximum_size (500);
         scrolled_window.add (max_width_bin);
 
         list_box = new Gtk.ListBox ();

src/app/ui/content/home-view.vala

@@ -55,8 +55,8 @@ public class WebArchives.HomeView : Gtk.Overlay {
         revealer.valign = Gtk.Align.START;
         add_overlay (revealer);
 
-        Hdy.Column notification_bar_max = new Hdy.Column ();
-        notification_bar_max.set_maximum_width (500);
+        Hdy.Clamp notification_bar_max = new Hdy.Clamp ();
+        notification_bar_max.set_maximum_size (500);
         revealer.add (notification_bar_max);
 
         NotificationBar notification_bar = new NotificationBar (
@@ -73,8 +73,8 @@ public class WebArchives.HomeView : Gtk.Overlay {
         );
         add (scrolled_window);
 
-        Hdy.Column max_width_bin = new Hdy.Column ();
-        max_width_bin.set_maximum_width (500);
+        Hdy.Clamp max_width_bin = new Hdy.Clamp ();
+        max_width_bin.set_maximum_size (500);
         max_width_bin.margin_top = 6;
         max_width_bin.margin_bottom = 6;
         max_width_bin.margin_start = 6;

src/app/ui/content/search-view.vala

@@ -14,8 +14,8 @@ public class WebArchives.SearchView : Gtk.Box {
         );
         add (scrolled_window);
 
-        Hdy.Column max_width_bin = new Hdy.Column ();
-        max_width_bin.set_maximum_width (500);
+        Hdy.Clamp max_width_bin = new Hdy.Clamp ();
+        max_width_bin.set_maximum_size (500);
         scrolled_window.add (max_width_bin);
 
         stack = new Gtk.Stack ();

src/app/ui/content/web-view.vala

@@ -60,8 +60,8 @@ class WebArchives.WebView : Gtk.Overlay {
         revealer.valign = Gtk.Align.START;
         add_overlay (revealer);
 
-        Hdy.Column notification_bar_max = new Hdy.Column ();
-        notification_bar_max.set_maximum_width (500);
+        Hdy.Clamp notification_bar_max = new Hdy.Clamp ();
+        notification_bar_max.set_maximum_size (500);
         revealer.add (notification_bar_max);
 
         notification_bar = new NotificationBar ("");
@@ -417,6 +417,12 @@ class WebArchives.WebView : Gtk.Overlay {
                     web_view.can_go_forward ();
                 break;
             }
+            case WebKit.LoadEvent.COMMITTED:
+            case WebKit.LoadEvent.STARTED:
+            case WebKit.LoadEvent.REDIRECTED:
+            {
+                break;
+            }
         }
     }