Bump gtk version 0.15 -> 0.16 (#851)

* Update to gtk 0.16 and webkit2gtk 4.1

* chore: update dependencies to fit gtk 0.16

* fix(example): menu should create after event loop created (gtk::init)

* chore: add changelog

* chore: update Cargo dependencies version

* Update CI

* Update README.md

Co-authored-by: Wu Yu Wei <[email protected]>

Author: pewsheen

.changes/bump-gtk-version.md

@@ -0,0 +1,5 @@
+---
+"wry": minor
+---
+
+**Breaking Change:** Bump webkit2gtk to 0.19. This will use webkit2gtk-4.1 as dependency from now on. Also Bump gtk version: 0.15 -> 0.16.

.changes/config.json

@@ -10,7 +10,7 @@
       "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p'",
       "prepublish": [
         "sudo apt-get update",
-        "sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0 libayatana-appindicator3-dev",
+        "sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.1 libayatana-appindicator3-dev",
         "cargo install cargo-audit --features=fix",
         {
           "command": "cargo generate-lockfile",

.github/workflows/bench.yml

@@ -46,7 +46,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libgtksourceview-3.0-dev libayatana-appindicator3-dev xvfb
+          sudo apt-get install -y webkit2gtk-4.1 libgtksourceview-3.0-dev libayatana-appindicator3-dev xvfb
           wget https://github.com/sharkdp/hyperfine/releases/download/v1.11.0/hyperfine_1.11.0_amd64.deb
           sudo dpkg -i hyperfine_1.11.0_amd64.deb
           pip install memory_profiler

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
         if: contains(matrix.platform.target, 'gnu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0 libgtksourceview-3.0-dev libayatana-appindicator3-dev
+          sudo apt-get install -y webkit2gtk-4.1 libgtksourceview-3.0-dev libayatana-appindicator3-dev
 
       - name: install webview2 (windows only)
         if: contains(matrix.platform.target, 'windows')

Cargo.toml

@@ -41,7 +41,7 @@ serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
 url = "2.3"
-tao = { version = "0.16.0", default-features = false, features = [ "serde" ] }
+tao = { version = "0.17.0", default-features = false, features = [ "serde" ] }
 http = "0.2.8"
 
 [dev-dependencies]
@@ -51,13 +51,13 @@ dirs = "4.0.0"
 base64 = "0.13.1"
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] }
-webkit2gtk-sys = "0.18"
-gio = "0.15"
-glib = "0.15"
-gtk = "0.15"
-gdk = "0.15"
-soup2 = "0.2"
+webkit2gtk = { version = "0.19.1", features = [ "v2_38" ] }
+webkit2gtk-sys = "0.19.1"
+gio = "0.16"
+glib = "0.16"
+gtk = "0.16"
+gdk = "0.16"
+soup3 = "0.3"
 
 [target."cfg(target_os = \"windows\")".dependencies]
 webview2-com = "0.19.1"

README.md

@@ -80,7 +80,7 @@ Tao uses [gtk-rs](https://gtk-rs.org/) and its related libraries for window crea
 #### Arch Linux / Manjaro:
 
 ```bash
-sudo pacman -S webkit2gtk
+sudo pacman -S webkit2gtk-4.1
 sudo pacman -S libappindicator-gtk3 # For tray feature
 ```
 
@@ -89,7 +89,7 @@ The `libayatana-indicator` package can be installed from the Arch User Repositor
 #### Debian / Ubuntu:
 
 ```bash
-sudo apt install libwebkit2gtk-4.0-dev
+sudo apt install libwebkit2gtk-4.1-dev
 # For tray feature, choose one of following package
 sudo apt install libayatana-appindicator3-dev
 sudo apt install libappindicator3-dev
@@ -98,7 +98,7 @@ sudo apt install libappindicator3-dev
 #### Fedora
 
 ```bash
-sudo dnf install gtk3-devel webkit2gtk3-devel
+sudo dnf install gtk3-devel webkit2gtk4.1-devel
 # For tray feature
 sudo dnf install libappindicator-gtk3-devel
 ```

examples/menu.rs

@@ -23,6 +23,8 @@ fn main() -> wry::Result<()> {
     webview::WebViewBuilder,
   };
 
+  let event_loop = EventLoop::new();
+
   let mut menu = MenuBar::new();
   let mut file_menu = MenuBar::new();
   file_menu.add_native_item(tao::menu::MenuItem::Cut);
@@ -45,7 +47,6 @@ fn main() -> wry::Result<()> {
   );
   menu.add_submenu("File", true, file_menu);
 
-  let event_loop = EventLoop::new();
   let window = WindowBuilder::new()
     .with_title("Custom Protocol")
     .with_menu(menu)