fix(perry-ui-gtk4): webview.rs against webkit6 0.4 / glib 0.20 (v0.5.864)

Real fixes for the 3 compile errors v0.5.851/863 worked around:

1. `error.code()` on `&gtk4::glib::Error` — glib 0.20 dropped the
   public `code()` accessor. Use `ToGlibPtr` to reach the raw GError
   and read the i32 code field directly.
2. `CookieManager::delete_all_cookies` removed in webkit6 0.4.
   Replaced with `WebsiteDataManager::clear(COOKIES, Duration::ZERO,
   ...)` which is the supported clear-all-since-epoch API.
3. `webview.settings()` ambiguous between `WidgetExt::settings` and
   `WebViewExt::settings`. Fully qualify to `WebViewExt::settings`.

Re-enables:
- The doc-tests ubuntu-24.04 / perry-ui-gtk4 matrix entry (disabled v0.5.851)
- The release-packages `-p perry-ui-gtk4` build step (disabled v0.5.863)

Linux release tarballs will once again ship libperry_ui_gtk4.a.

Author: proggeramlug

.github/workflows/release-packages.yml

@@ -280,19 +280,9 @@ jobs:
             done
           done
 
-      # perry-ui-gtk4 build temporarily disabled (v0.5.863): three real
-      # compile errors in crates/perry-ui-gtk4/src/widgets/webview.rs against
-      # the gtk4-rs 0.9 / webkit6 0.4 API on ubuntu-24.04+ runners — `glib::Error::code`
-      # private, `CookieManager::delete_all_cookies` missing, multiple-applicable
-      # items in scope. Tests-workflow doc-tests-gtk4 entry is also disabled
-      # (v0.5.851). Tracked separately; re-enable when webview.rs is fixed.
-      # Until then the Linux release tarballs ship without libperry_ui_gtk4.a,
-      # so `perry compile --target linux-gtk4` won't link on those bottles —
-      # but the perry CLI itself ships fine for all Linux users that don't
-      # use perry/ui.
-      # - name: Build UI library (Linux glibc)
-      #   if: runner.os == 'Linux' && !endsWith(matrix.target, '-musl')
-      #   run: cargo build --release --target ${{ matrix.target }} -p perry-ui-gtk4
+      - name: Build UI library (Linux glibc)
+        if: runner.os == 'Linux' && !endsWith(matrix.target, '-musl')
+        run: cargo build --release --target ${{ matrix.target }} -p perry-ui-gtk4
 
       - name: Build UI library (Windows)
         if: runner.os == 'Windows'

.github/workflows/test.yml

@@ -638,21 +638,15 @@ jobs:
             cmd_xcompile_advisory: "./scripts/run_doc_tests.sh --verbose --xcompile-only"
             # Baseline captured from a clean CI run of 24723671119 (900x970).
             gallery_advisory: false
-          # ubuntu-24.04 doc-tests for perry-ui-gtk4 temporarily disabled:
-          # crates/perry-ui-gtk4/src/widgets/webview.rs has compile errors
-          # against the gtk4-rs/glib-rs/webkit6 API surface on noble runners
-          # (`glib::Error::code` private, `CookieManager::delete_all_cookies`
-          # missing). Tracked separately; re-enable once webview.rs builds
-          # cleanly against the apt-installed system gtk4 / libwebkitgtk-6.0
-          # libraries. macOS and Windows doc-tests still gate the release.
-          # - os: ubuntu-24.04
-          #   ui_backend: perry-ui-gtk4
-          #   shell: bash
-          #   cmd_exclude_gallery: "xvfb-run -a ./scripts/run_doc_tests.sh --verbose --skip-xcompile --filter-exclude ui/gallery.ts"
-          #   cmd_gallery: "xvfb-run -a ./scripts/run_doc_tests.sh --verbose --skip-xcompile --filter ui/gallery.ts"
-          #   cmd_xcompile_blocking: "./scripts/run_doc_tests.sh --verbose --xcompile-only --xcompile-only-target=web --xcompile-only-target=wasm --xcompile-only-target=ios-simulator"
-          #   cmd_xcompile_advisory: "./scripts/run_doc_tests.sh --verbose --xcompile-only"
-          #   gallery_advisory: false
+          - os: ubuntu-24.04
+            ui_backend: perry-ui-gtk4
+            shell: bash
+            cmd_exclude_gallery: "xvfb-run -a ./scripts/run_doc_tests.sh --verbose --skip-xcompile --filter-exclude ui/gallery.ts"
+            cmd_gallery: "xvfb-run -a ./scripts/run_doc_tests.sh --verbose --skip-xcompile --filter ui/gallery.ts"
+            cmd_xcompile_blocking: "./scripts/run_doc_tests.sh --verbose --xcompile-only --xcompile-only-target=web --xcompile-only-target=wasm --xcompile-only-target=ios-simulator"
+            cmd_xcompile_advisory: "./scripts/run_doc_tests.sh --verbose --xcompile-only"
+            # Baseline captured under Xvfb (900x1024).
+            gallery_advisory: false
           # windows-2022 doc-tests for perry-ui-windows temporarily disabled:
           # 30+ doc-test snippets COMPILE_FAIL on the Windows runner with
           # perry exit 1 (mix of platform-banner gaps and #463-unimplemented

crates/perry-ui-gtk4/src/widgets/webview.rs

@@ -220,7 +220,13 @@ fn install_signal_handlers(handle: i64, webview: &webkit6::WebView) {
         if on_error == 0.0 {
             return false;
         }
-        let code = error.code() as f64;
+        // glib::Error doesn't expose `code()` in glib 0.20+; reach into the
+        // underlying GError struct via ToGlibPtr to read the raw i32 code.
+        let code = unsafe {
+            use gtk4::glib::translate::ToGlibPtr;
+            let ptr: *const gtk4::glib::ffi::GError = error.to_glib_none().0;
+            (*ptr).code as f64
+        };
         let msg = error.message().to_string();
         let msg_nb = nanbox_str(&msg);
         let closure_ptr = unsafe { js_nanbox_get_pointer(on_error) } as *const u8;
@@ -309,10 +315,17 @@ pub fn clear_cookies(handle: i64) {
     WEBVIEW_STATES.with(|s| {
         if let Some(st) = s.borrow().get(&handle) {
             if let Some(session) = st.webview.network_session() {
-                let cookie_mgr = session.cookie_manager();
-                if let Some(mgr) = cookie_mgr {
+                // webkit6 0.4 removed CookieManager::delete_all_cookies in
+                // favor of WebsiteDataManager::clear with a type bitmask.
+                // COOKIES bitflag + duration 0 = "all cookies since epoch".
+                if let Some(dm) = session.website_data_manager() {
                     let cancellable: Option<&gtk4::gio::Cancellable> = None;
-                    mgr.delete_all_cookies(cancellable, |_| {});
+                    dm.clear(
+                        webkit6::WebsiteDataTypes::COOKIES,
+                        std::time::Duration::ZERO,
+                        cancellable,
+                        |_| {},
+                    );
                 }
             }
         }
@@ -323,7 +336,9 @@ pub fn set_user_agent(handle: i64, ua_ptr: *const u8) {
     let ua = str_from_header(ua_ptr).to_string();
     WEBVIEW_STATES.with(|s| {
         if let Some(st) = s.borrow().get(&handle) {
-            if let Some(settings) = st.webview.settings() {
+            // WidgetExt::settings and WebViewExt::settings collide — fully
+            // qualify to the WebView one.
+            if let Some(settings) = webkit6::prelude::WebViewExt::settings(&st.webview) {
                 settings.set_user_agent(Some(&ua));
             }
         }