diff --git a/_service b/_service deleted file mode 100644 index 525a9fe..0000000 --- a/_service +++ /dev/null @@ -1,19 +0,0 @@ - - - - https://gitlab.gnome.org/GNOME/file-roller.git - git - @PARENT_TAG@+@TAG_OFFSET@ - refs/tags/3.42.0 - (.*)\+0 - \1 - - - - *.tar - xz - - - - - diff --git a/file-roller-3.4-change-archiver-priority.patch b/file-roller-3.4-change-archiver-priority.patch index efd6997..37c69b4 100644 --- a/file-roller-3.4-change-archiver-priority.patch +++ b/file-roller-3.4-change-archiver-priority.patch @@ -1,8 +1,8 @@ -Index: file-roller-3.31.92/src/fr-init.c +Index: file-roller-43.alpha/src/fr-init.c =================================================================== ---- file-roller-3.31.92.orig/src/fr-init.c -+++ file-roller-3.31.92/src/fr-init.c -@@ -374,6 +374,7 @@ register_archives (void) +--- file-roller-43.alpha.orig/src/fr-init.c ++++ file-roller-43.alpha/src/fr-init.c +@@ -345,6 +345,7 @@ register_archives (void) register_archive (fr_command_tar_get_type ()); register_archive (fr_command_cfile_get_type ()); @@ -10,7 +10,7 @@ Index: file-roller-3.31.92/src/fr-init.c register_archive (fr_command_7z_get_type ()); register_archive (fr_command_dpkg_get_type ()); -@@ -389,7 +390,6 @@ register_archives (void) +@@ -360,7 +361,6 @@ register_archives (void) register_archive (fr_command_rpm_get_type ()); register_archive (fr_command_unsquashfs_get_type ()); register_archive (fr_command_unstuff_get_type ()); diff --git a/file-roller-3.42.0.obscpio b/file-roller-3.42.0.obscpio deleted file mode 100644 index b6f885f..0000000 --- a/file-roller-3.42.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2acf66d7d79f16ece35fb4911b8e46ea37772273c51ea96ad2b04bc4d38c43e7 -size 7764493 diff --git a/file-roller-43.0.tar.xz b/file-roller-43.0.tar.xz new file mode 100644 index 0000000..60dabd9 --- /dev/null +++ b/file-roller-43.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1 +size 894308 diff --git a/file-roller-ignore-unrar-if-wrapper.patch b/file-roller-ignore-unrar-if-wrapper.patch index e1b437c..d05eed6 100644 --- a/file-roller-ignore-unrar-if-wrapper.patch +++ b/file-roller-ignore-unrar-if-wrapper.patch @@ -1,8 +1,8 @@ -Index: file-roller-3.32.0/src/fr-command-rar.c +Index: file-roller-43.alpha/src/fr-command-rar.c =================================================================== ---- file-roller-3.32.0.orig/src/fr-command-rar.c 2019-03-11 23:00:45.000000000 +0100 -+++ file-roller-3.32.0/src/fr-command-rar.c 2019-03-14 20:21:40.103871799 +0100 -@@ -775,6 +775,39 @@ fr_command_rar_get_mime_types (FrArchive +--- file-roller-43.alpha.orig/src/fr-command-rar.c ++++ file-roller-43.alpha/src/fr-command-rar.c +@@ -766,6 +766,39 @@ fr_command_rar_get_mime_types (FrArchive return rar_mime_type; } @@ -40,9 +40,9 @@ Index: file-roller-3.32.0/src/fr-command-rar.c + return ret; +} - static FrArchiveCap + static FrArchiveCaps fr_command_rar_get_capabilities (FrArchive *archive, -@@ -786,7 +819,7 @@ fr_command_rar_get_capabilities (FrArchi +@@ -777,7 +810,7 @@ fr_command_rar_get_capabilities (FrArchi capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES | FR_ARCHIVE_CAN_ENCRYPT | FR_ARCHIVE_CAN_ENCRYPT_HEADER; if (_g_program_is_available ("rar", check_command)) capabilities |= FR_ARCHIVE_CAN_READ_WRITE | FR_ARCHIVE_CAN_CREATE_VOLUMES; diff --git a/file-roller-pkg-match.patch b/file-roller-pkg-match.patch index db2491c..68989d3 100644 --- a/file-roller-pkg-match.patch +++ b/file-roller-pkg-match.patch @@ -1,23 +1,11 @@ -Index: file-roller-3.32.0/data/packages.match -=================================================================== ---- file-roller-3.32.0.orig/data/packages.match 2019-03-11 23:00:44.000000000 +0100 -+++ file-roller-3.32.0/data/packages.match 2019-03-14 20:21:39.939870131 +0100 -@@ -7,15 +7,15 @@ cpio= +--- file-roller-43.alpha-orig/data/packages.match 2022-08-18 22:17:26.000000000 +0200 ++++ file-roller-43.alpha/data/packages.match 2022-08-20 15:08:13.767734154 +0200 +@@ -10,7 +10,7 @@ dpkg= genisoimage= gzip= -lha= +lha=lhasa lrzip= + lz4= lzip= - lzma= - lzop= - ncompress= - p7zip= --p7zip-full= --p7zip-rar= -+p7zip-full=p7zip -+p7zip-rar=p7zip - rar= - rpm= - rzip= diff --git a/file-roller.changes b/file-roller.changes index bd50893..a4e4755 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Sun Sep 18 08:48:28 UTC 2022 - Bjørn Lie + +- Update to version 43.0: + + New features and user visible changes: Add read-only support + for Apple’s `dmg` image format through 7-zip. + + Bugs fixed: Prevent libarchive backend from writing endless + padding when extracting RAR archives. + + Other changes: Various source code clean-ups. + + Updated translations. + +------------------------------------------------------------------- +Sat Aug 20 11:20:51 UTC 2022 - bjorn.lie@gmail.com + +- Update to version 43.alpha: + + New features and user visible changes: + - Support `7zz` and `7zzs` programs from the official 7-Zip + project. Distros will want to adjust the + `data/packages.match` file. + - Add a mnemonic to Extract button. + - Make password field reveal icon consistent with other GNOME + apps. + - Nautilus extension now supports extracting multiple archives + simultaneously with “Archive to…”. + - Add context menu item to navigate to a file from search. + + Bugs fixed: + - Fix RAR decompression support in 7-Zip backend. + - Fix opening RAR archives with encrypted headers. + + Other changes: + - Port Nautilus extension to Nautilus 43. + - Various code clean-ups. + - Slightly modernized Meson code. + - Use portal-based APIs for opening files, adding dependency on + libportal and libportal-gtk3. + - Add support for building internal API docs using gi-docgen. + - Do not hide File-Roller icon in the KDE app laucher. + - Remove dependency on libnotify. + + Updated translations. +- Switch back to upstream tarball, drop service. +- Drop pkgconfig(libnotify) BuildRequires: No longer needed. +- Replace pkgconfig(libnautilus-extension) with + pkgconfig(libnautilus-extension-4) BuildRequires following + upstream changes. +- Add desktop-file-utils, pkgconfig(libportal), + pkgconfig(libportal-gtk3) and pkgconfig(gtk4) BuildRequires, new + dependencies. +- Rebase patches with quilt. +- Add back lhasa and arj Suggests. + ------------------------------------------------------------------- Sun Mar 20 09:16:38 UTC 2022 - Bjørn Lie diff --git a/file-roller.obsinfo b/file-roller.obsinfo deleted file mode 100644 index ba74e00..0000000 --- a/file-roller.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: file-roller -version: 3.42.0 -mtime: 1647766707 -commit: f6f1798376cb9b64ee865d354f1c330ea3e56bcd diff --git a/file-roller.spec b/file-roller.spec index 29c31c4..d3cee5e 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -17,15 +17,13 @@ Name: file-roller -Version: 3.42.0 +Version: 43.0 Release: 0 Summary: An Archive Manager for GNOME License: GPL-2.0-or-later Group: Productivity/Archiving/Compression URL: https://wiki.gnome.org/Apps/FileRoller -# Disabled as we are using a git checkout via source service -#Source0: https://download.gnome.org/sources/file-roller/3.40/%%{name}-%%{version}.tar.xz -Source0: %{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/file-roller/43/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE file-roller-3.4-change-archiver-priority.patch bnc#767386 gankov@opensuse.org -- Give unzip a higher priority than 7z when unpackging zip files. Gives better results for non-latin charsets. Patch0: file-roller-3.4-change-archiver-priority.patch @@ -33,9 +31,10 @@ Patch0: file-roller-3.4-change-archiver-priority.patch Patch1: file-roller-pkg-match.patch # PATCH-FIX-OPENSUSE file-roller-ignore-unrar-if-wrapper.patch bsc#1072118 mgorse@suse.com -- if unrar is a wrapper script for unar, then ignore it, and use unar instead. Patch2: file-roller-ignore-unrar-if-wrapper.patch -# Needed for directory ownership +# Needed for directory ownership BuildRequires: dbus-1 +BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: file-devel BuildRequires: meson >= 0.50 @@ -47,8 +46,9 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(json-glib-1.0) >= 0.14.0 BuildRequires: pkgconfig(libarchive) >= 3.0.0 BuildRequires: pkgconfig(libhandy-1) >= 1.5 -BuildRequires: pkgconfig(libnautilus-extension) -BuildRequires: pkgconfig(libnotify) >= 0.4.3 +BuildRequires: pkgconfig(libnautilus-extension-4) +BuildRequires: pkgconfig(libportal) +BuildRequires: pkgconfig(libportal-gtk3) # Formats that we likely want to support by default Recommends: bzip2 Recommends: 7zip @@ -64,11 +64,11 @@ Suggests: lzip Suggests: lzop Suggests: rzip Suggests: zoo +Suggests: lhasa +Suggests: arj # FIXME: Formats for which we don't have packages. Some are free software that # we could package. -#Suggests: lha #Suggests: lrzip -#Suggests: arj #Suggests: ncompress #Suggests: rar #Suggests: theunarchiver @@ -85,6 +85,7 @@ contained in the archive, and extract files from the archive. %package -n nautilus-file-roller Summary: File-roller extension for Nautilus Group: Productivity/Archiving/Compression +BuildRequires: pkgconfig(gtk4) Requires: %{name} = %{version} Requires: nautilus @@ -126,7 +127,7 @@ contained in the archive, and extract files from the archive. %{_datadir}/glib-2.0/schemas/org.gnome.FileRoller.gschema.xml %files -n nautilus-file-roller -%{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so +%{_libdir}/nautilus/extensions-4/libnautilus-fileroller.so %files lang -f %{name}.lang