news-flash-gtk: Migrate to using webkit2gtk-4.1

x11-packages/news-flash-gtk/build.sh

@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="A modern feed reader designed for the GNOME desktop"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/patchedsoul/news-flash/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bc4ce6aa7cd26409d5d9a7ffa539214c9907c7b263eb88f46d8bbab7546fd323
-TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libhandy-0.0, libsqlite, libxml2, openssl-1.1, pango, webkit2gtk"
+TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libcairo, libhandy-0.0, libsqlite, libxml2, openssl-1.1, pango, webkit2gtk-4.1"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
@@ -14,6 +15,17 @@ termux_step_pre_configure() {
 
 	TERMUX_RUST_VERSION=1.52.1
 	termux_setup_rust
+	: "${CARGO_HOME:=$HOME/.cargo}"
+	export CARGO_HOME
+
+	cargo fetch --target $CARGO_TARGET_NAME
+
+	local p=$TERMUX_PKG_BUILDER_DIR/webkit2gtk-sys.diff
+	local d
+	for d in $CARGO_HOME/registry/src/github.com-*/webkit2gtk-sys-*; do
+		echo "Applying $(basename ${p}) to $(basename ${d})"
+		patch --silent -p1 -d ${d} < ${p} || :
+	done
 
 	export RUSTC_BOOTSTRAP=1
 	export GETTEXT_DIR=$TERMUX_PREFIX

x11-packages/news-flash-gtk/webkit2gtk-sys.diff

@@ -0,0 +1,35 @@
+--- a/Gir.toml
++++ b/Gir.toml
+@@ -3,7 +3,7 @@
+ work_mode = "sys"
+ min_cfg_version="2.4"
+ library = "WebKit2"
+-version = "4.0"
++version = "4.1"
+ single_version_file = "."
+ target_path = "."
+ 
+--- a/build.rs
++++ b/build.rs
+@@ -29,8 +29,8 @@
+ 
+ #[cfg(not(feature = "dox"))]
+ fn find() -> Result<(), Error> {
+-    let package_name = "webkit2gtk-4.0";
+-    let shared_libs = ["webkit2gtk-4.0", "javascriptcoregtk-4.0"];
++    let package_name = "webkit2gtk-4.1";
++    let shared_libs = ["webkit2gtk-4.1", "javascriptcoregtk-4.1"];
+     let version = if cfg!(feature = "v2_28") {
+         "2.28"
+     } else if cfg!(feature = "v2_26") {
+--- a/tests/abi.rs
++++ b/tests/abi.rs
+@@ -14,7 +14,7 @@
+ use tempfile::Builder;
+ use webkit2gtk_sys::*;
+ 
+-static PACKAGES: &[&str] = &["webkit2gtk-4.0"];
++static PACKAGES: &[&str] = &["webkit2gtk-4.1"];
+ 
+ #[derive(Clone, Debug)]
+ struct Compiler {