[rpms/gnome-commander] rawhide: Upgrade gtk4/glib/vte4.

[rpms/gnome-commander] rawhide: Upgrade gtk4/glib/vte4.

[Jonathan Steffan]

A new commit has been pushed.

Repo   : rpms/gnome-commander
Branch : rawhide
Commit : 273aaff69fa2a331d68973a20d84216c3ee92666
Author : Jonathan Steffan <jsteffan@fedoraproject.org>
Date   : 2026-09-19T13:54:59-06:00
Stats  : +5/-48 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-commander/c/273aaff69fa2a331d68973a20d84216c3ee92666?branch=rawhide

Log:
Upgrade gtk4/glib/vte4.

---
diff --git a/gnome-commander-pr203-rust-gtk4-change-revert.patch b/gnome-commander-pr203-rust-gtk4-change-revert.patch
deleted file mode 100644
index 2ea17c2..0000000
--- a/gnome-commander-pr203-rust-gtk4-change-revert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-commander-2.0.3/src/application.rs.debug	2026-06-13 18:48:31.000000000 +0900
-+++ gnome-commander-2.0.3/src/application.rs	2026-08-10 00:21:50.263327176 +0900
-@@ -139,7 +139,7 @@ mod imp {
-             self.parent_shutdown();
-         }
- 
--        fn handle_local_options(&self, options: &glib::VariantDict) -> ControlFlow<glib::ExitCode> {
-+        fn handle_local_options(&self, options: &glib::VariantDict) -> glib::ExitCode {
-             let debug_flags = get_string_option(options, "debug").map(|flags| {
-                 if flags.contains('a') {
-                     "giklmnpstuvwyzx".to_owned()
---- gnome-commander-2.0.3/src/utils.rs.debug	2026-06-13 18:48:31.000000000 +0900
-+++ gnome-commander-2.0.3/src/utils.rs	2026-08-10 00:19:53.974168496 +0900
-@@ -634,14 +634,8 @@ impl GnomeCmdFileExt for gio::File {
-         };
-         let close_result = enumerator.close(cancellable);
-         result?;
--        match close_result {
--            (true, None) => Ok(vec),
--            (false, None) => Err(glib::Error::new(
--                gio::IOErrorEnum::Failed,
--                &gettext("Closing of a file enumerator failed"),
--            )),
--            (_, Some(error)) => Err(error),
--        }
-+        close_result?;
-+        Ok(vec)
-     }
- }
- 

diff --git a/gnome-commander.spec b/gnome-commander.spec
index 4475e46..5cfa907 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -47,7 +47,7 @@
 %global	fedoraver	%{fullver}%{?if_pre:~}%{!?if_pre:^}%{git_version}
 %endif
 
-%global	baserelease	2
+%global	baserelease	3
 
 Name:		gnome-commander
 # Downgrade 3 times, sorry...
@@ -72,11 +72,6 @@ Source0:	https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{v
 %if		0%{?use_gitbare}
 Source0:		%{name}-%{gittardate}T%{gittartime}.tar.gz
 %endif
-# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/331/diffs?commit_id=b7bbb1d7d792a523e7b3a58e96dadc9db4c5152e
-# As currently we use old rust-gtk4, some changes in the above MR
-# has to be reverted.
-Patch0:		gnome-commander-pr203-rust-gtk4-change-revert.patch
-
 # meson.build
 BuildRequires:	meson
 BuildRequires:	gcc
@@ -177,18 +172,6 @@ sed -i.rpath src/meson.build \
 	-e "\@rpath =@s|^.*$|rpath = '%{_libdir}/%{name}'|"
 git commit -m "tweak rpath" -a
 
-# Relax Cargo deps for vte for now
-# ... and adjust other deps
-sed -i Cargo.toml \
-	-e '\@vte =.*vte4@s|0.10.0|0.8.0|' \
-	-e '\@glib =.*@s|0.22|0.20|' \
-	-e '\@gtk =.*gtk4@s|0.11|0.9|' \
-	%{nil}
-git commit -m "relax Cargo deps" -a
-
-%patch -P0 -p1
-git commit -m "revert some rust-gtk4 related changes" -a
-
 # FIXME
 # Is there better way to archive this?
 sed -i src/meson.build \
@@ -308,6 +291,10 @@ popd
 %{_bindir}/%{name}
 
 %changelog
+* Sat Sep 19 2026 Jonathan Steffan <jonathansteffan@gmail.com> - 4:2.0.3-3
+- Build against the current rust gtk4/glib/vte4 generation (gtk4 0.11, glib 0.22,
+  vte4 0.10): drop the Cargo.toml downgrades and the rust-gtk4 revert patch
+
 * Mon Aug 10 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:2.0.3-2
 - Generate debuginfo for rust sources