diff --git a/file-roller-44.alpha-pointer-types.patch b/file-roller-44.alpha-pointer-types.patch new file mode 100644 index 0000000..da01a5d --- /dev/null +++ b/file-roller-44.alpha-pointer-types.patch @@ -0,0 +1,37 @@ +From b4a579c05c95eff70987357043c672fe7520d226 Mon Sep 17 00:00:00 2001 +From: David King +Date: Mon, 19 Feb 2024 13:43:10 +0000 +Subject: [PATCH] window: Fix incompatible pointer types + +https://gitlab.gnome.org/GNOME/file-roller/-/issues/225 +--- + src/fr-window.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/fr-window.c b/src/fr-window.c +index eb1f5bd1..657ceb0d 100644 +--- a/src/fr-window.c ++++ b/src/fr-window.c +@@ -4735,8 +4735,8 @@ fr_window_construct (FrWindow *window) + + private->filter_entry = gtk_search_entry_new (); + gtk_widget_set_hexpand (private->filter_entry, TRUE); +- AdwClamp *filter_entry_limiter = adw_clamp_new (); +- adw_clamp_set_child (filter_entry_limiter, private->filter_entry); ++ GtkWidget *filter_entry_limiter = adw_clamp_new (); ++ adw_clamp_set_child (ADW_CLAMP (filter_entry_limiter), private->filter_entry); + g_signal_connect (GTK_SEARCH_ENTRY (private->filter_entry), + "search-changed", + G_CALLBACK (filter_entry_search_changed_cb), +@@ -4860,7 +4860,7 @@ fr_window_construct (FrWindow *window) + adw_button_content_set_use_underline (ADW_BUTTON_CONTENT (content), true); + gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "win.extract-all-by-default"); + gtk_button_set_child (GTK_BUTTON (button), content); +- gtk_widget_set_tooltip_text (GTK_BUTTON (button), _("Extract Files")); ++ gtk_widget_set_tooltip_text (button, _("Extract Files")); + gtk_size_group_add_widget (header_bar_size_group, button); + gtk_header_bar_pack_start (GTK_HEADER_BAR (private->headerbar), button); + +-- +2.43.2 + diff --git a/file-roller.spec b/file-roller.spec index 1e7f281..ebddbe7 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,28 +1,30 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: file-roller -Version: 43.1 -Release: 3%{?dist} +Version: 44~alpha +Release: 1%{?dist} Summary: Tool for viewing and creating archives License: GPLv2+ URL: https://wiki.gnome.org/Apps/FileRoller -Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{tarball_version}.tar.xz +# https://gitlab.gnome.org/GNOME/file-roller/-/issues/225 +Patch: file-roller-44.alpha-pointer-types.patch BuildRequires: meson BuildRequires: gcc BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(libadwaita-1) %if 0%{?flatpak} %else BuildRequires: pkgconfig(libnautilus-extension-4) %endif BuildRequires: pkgconfig(libportal) -BuildRequires: pkgconfig(libportal-gtk3) +BuildRequires: pkgconfig(libportal-gtk4) BuildRequires: file-devel BuildRequires: (/usr/bin/gcpio or /usr/bin/cpio) BuildRequires: gettext @@ -64,7 +66,7 @@ or directories. %find_lang %{name} --with-gnome %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.FileRoller.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.FileRoller.desktop %files -f %{name}.lang @@ -79,7 +81,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.FileRoller. %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml %{_datadir}/icons/hicolor/scalable/apps/org.gnome.FileRoller*.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.FileRoller-symbolic.svg -%{_datadir}/metainfo/org.gnome.FileRoller.appdata.xml +%{_metainfodir}/org.gnome.FileRoller.appdata.xml %if 0%{?flatpak} %else @@ -88,6 +90,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.FileRoller. %endif %changelog +* Mon Feb 19 2024 David King - 44~alpha-1 +- Update to 44.alpha + * Wed Jan 24 2024 Fedora Release Engineering - 43.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index e1a8e50..d5fa0fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (file-roller-43.1.tar.xz) = 444467c2bf9c2aa885fad5119069232ea92872c1f08fc7cd517e2e64faef924f0b4a9195acbe042e535588ccd86b5147afa041f9ea355f480507c3743a2bb934 +SHA512 (file-roller-44.alpha.tar.xz) = 3df956384cc915f857ffe15483b8f7202c66b5d9c089b3019370f25bc7455f0cd04ab74279e2e8be8a488426358f8f6fae0db21992271210c547fb94fb2710bf