Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package engrampa for openSUSE:Factory checked in at 2023-05-17 10:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/engrampa (Old) and /work/SRC/openSUSE:Factory/.engrampa.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "engrampa" Wed May 17 10:52:56 2023 rev:26 rq:1087302 version:1.26.1 Changes: -------- --- /work/SRC/openSUSE:Factory/engrampa/engrampa.changes 2021-08-26 23:14:53.884252279 +0200 +++ /work/SRC/openSUSE:Factory/.engrampa.new.1533/engrampa.changes 2023-05-17 10:53:19.555410315 +0200 @@ -1,0 +2,13 @@ +Mon May 15 18:48:33 UTC 2023 - Alexei Sorokin <[email protected]> + +- Update to version 1.26.1: + * fr-process: Fix memory leak. + * Fix archive file save as function. + * file-data: Fix memory leak. + * fr-window: Fix memory leak. + * dlg-package-installer: Fix memory leak. + * Update translations. +- Add engrampa-1.26.1-add-7zip-support.patch: Add new 7-zip + (7zz and 7zzs) project support (commit 6f49d2c7). + +------------------------------------------------------------------- Old: ---- engrampa-1.26.0.tar.xz New: ---- engrampa-1.26.1-add-7zip-support.patch engrampa-1.26.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ engrampa.spec ++++++ --- /var/tmp/diff_new_pack.vrCh7p/_old 2023-05-17 10:53:20.087413179 +0200 +++ /var/tmp/diff_new_pack.vrCh7p/_new 2023-05-17 10:53:20.091413200 +0200 @@ -1,7 +1,7 @@ # # spec file for package engrampa # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ %define _version 1.26 - Name: engrampa -Version: 1.26.0 +Version: 1.26.1 Release: 0 Summary: MATE Desktop archive manager License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: Productivity/Archiving/Compression URL: https://mate-desktop.org/ Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM engrampa-1.26.1-add-7zip-support.patch -- Add new 7-zip (7zz and 7zzs) project support (commit 6f49d2c7). +Patch0: engrampa-1.26.1-add-7zip-support.patch BuildRequires: caja >= %{_version} BuildRequires: hicolor-icon-theme BuildRequires: mate-common >= %{_version} @@ -41,7 +42,6 @@ Recommends: bzip2 Recommends: cpio Recommends: gzip -Recommends: p7zip Recommends: rpm Recommends: unar Recommends: unzip @@ -67,6 +67,11 @@ Obsoletes: mate-file-archiver < %{version} Obsoletes: mate-file-archiver-lang < %{version} %glib2_gsettings_schema_requires +%if 0%{?suse_version} > 1500 +Recommends: 7zip +%else +Recommends: p7zip +%endif %description Engrampa is an archive manager for the MATE Desktop Environment. @@ -90,7 +95,7 @@ archive; extract files from the archive. %prep -%setup -q +%autosetup -p1 %build NOCONFIGURE=1 mate-autogen ++++++ engrampa-1.26.1-add-7zip-support.patch ++++++ --- a/data/packages.match +++ b/data/packages.match @@ -15,9 +15,9 @@ lzma= lzop= ncompress= nomarch= -p7zip= -p7zip-full= -p7zip-rar= +7zip= +7zip-full= +7zip-rar= rar= rpm= rzip= --- a/src/fr-command-7z.c +++ b/src/fr-command-7z.c @@ -208,7 +208,15 @@ list__process_line (char *line, static void fr_command_7z_begin_command (FrCommand *comm) { - if (is_program_in_path ("7z")) + // Modern 7-Zip by the original author. + // Statically linked from a binary distribution, almost guaranteed to work. + if (is_program_in_path ("7zzs")) + fr_process_begin_command (comm->process, "7zzs"); + // Dynamically linked from either binary or source distribution. + else if (is_program_in_path ("7zz")) + fr_process_begin_command (comm->process, "7zz"); + // Legacy p7zip project. + else if (is_program_in_path ("7z")) fr_process_begin_command (comm->process, "7z"); else if (is_program_in_path ("7za")) fr_process_begin_command (comm->process, "7za"); @@ -343,8 +351,10 @@ fr_command_7z_add (FrCommand *comm, if (spd_support) fr_process_add_arg (comm->process, "-spd"); fr_process_add_arg (comm->process, "-bd"); + fr_process_add_arg (comm->process, "-bb1"); fr_process_add_arg (comm->process, "-y"); - fr_process_add_arg (comm->process, "-l"); + if (recursive) + fr_process_add_arg (comm->process, "-l"); add_password_arg (comm, comm->password, FALSE); if ((comm->password != NULL) && (*comm->password != 0) @@ -478,6 +488,7 @@ fr_command_7z_extract (FrCommand *comm, if (spd_support) fr_process_add_arg (comm->process, "-spd"); fr_process_add_arg (comm->process, "-bd"); + fr_process_add_arg (comm->process, "-bb1"); fr_process_add_arg (comm->process, "-y"); add_password_arg (comm, comm->password, FALSE); @@ -618,24 +629,28 @@ fr_command_7z_get_capabilities (FrComman FrCommandCap capabilities; capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES; - if (! is_program_available ("7za", check_command) && ! is_program_available ("7zr", check_command) && ! is_program_available ("7z", check_command)) + gboolean available_7zip = is_program_available ("7zz", check_command) || is_program_available ("7zzs", check_command); + if (! available_7zip\ + && ! is_program_available ("7za", check_command) \ + && ! is_program_available ("7zr", check_command) \ + && ! is_program_available ("7z", check_command)) return capabilities; if (is_mime_type (mime_type, "application/x-7z-compressed")) { capabilities |= FR_COMMAND_CAN_READ_WRITE | FR_COMMAND_CAN_CREATE_VOLUMES; - if (is_program_available ("7z", check_command)) + if (is_program_available ("7z", check_command) || available_7zip) capabilities |= FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER; } else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) { capabilities |= FR_COMMAND_CAN_READ_WRITE; - if (is_program_available ("7z", check_command)) + if (is_program_available ("7z", check_command) || available_7zip) capabilities |= FR_COMMAND_CAN_ENCRYPT | FR_COMMAND_CAN_ENCRYPT_HEADER; } - else if (is_program_available ("7z", check_command)) { + else if (is_program_available ("7z", check_command) || available_7zip) { if (is_mime_type (mime_type, "application/x-rar") || is_mime_type (mime_type, "application/x-cbr")) { - if (! check_command || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS) + if (! check_command || available_7zip || g_file_test ("/usr/lib/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/lib/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar29.so", G_FILE_TEST_EXISTS) || g_file_test ("/usr/libexec/p7zip/Codecs/Rar.so", G_FILE_TEST_EXISTS)) capabilities |= FR_COMMAND_CAN_READ; } @@ -674,11 +689,11 @@ fr_command_7z_get_packages (FrCommand * const char *mime_type) { if (is_mime_type (mime_type, "application/x-rar")) - return PACKAGES ("p7zip,p7zip-rar"); + return PACKAGES ("7zip,7zip-rar"); else if (is_mime_type (mime_type, "application/zip") || is_mime_type (mime_type, "application/vnd.ms-cab-compressed")) - return PACKAGES ("p7zip,p7zip-full"); + return PACKAGES ("7zip,7zip-full"); else - return PACKAGES ("p7zip"); + return PACKAGES ("7zip"); } --- a/src/fr-command-tar.c +++ b/src/fr-command-tar.c @@ -682,7 +682,8 @@ fr_command_tar_recompress (FrCommand *co fr_process_add_arg (comm->process, "a"); fr_process_add_arg (comm->process, "-bd"); fr_process_add_arg (comm->process, "-y"); - fr_process_add_arg (comm->process, "-l"); + if (g_strcmp0 (comm_tar->compress_command, "7zzs") != 0 && g_strcmp0 (comm_tar->compress_command, "7zz") != 0) + fr_process_add_arg (comm->process, "-l"); new_name = g_strconcat (c_tar->uncomp_filename, ".7z", NULL); fr_process_add_arg_concat (comm->process, new_name, NULL); @@ -1087,7 +1088,7 @@ fr_command_tar_get_capabilities (FrComma capabilities |= FR_COMMAND_CAN_READ_WRITE; } else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) { - const char *try_command[3] = { "7za", "7zr", "7z" }; + const char *try_command[5] = { "7zzs", "7zz", "7za", "7zr", "7z" }; size_t i; for (i = 0; i < G_N_ELEMENTS (try_command); i++) { @@ -1115,7 +1116,7 @@ fr_command_tar_set_mime_type (FrCommand FR_COMMAND_CLASS (parent_class)->set_mime_type (comm, mime_type); if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) { - const char *try_command[3] = { "7za", "7zr", "7z" }; + const char *try_command[5] = { "7zzs", "7zz", "7za", "7zr", "7z" }; size_t i; for (i = 0; i < G_N_ELEMENTS (try_command); i++) { @@ -1153,7 +1154,7 @@ fr_command_tar_get_packages (FrCommand else if (is_mime_type (mime_type, "application/x-lzop-compressed-tar")) return PACKAGES ("tar,lzop"); else if (is_mime_type (mime_type, "application/x-7z-compressed-tar")) - return PACKAGES ("tar,p7zip"); + return PACKAGES ("tar,7zip"); else if (is_mime_type (mime_type, "application/x-zstd-compressed-tar")) return PACKAGES ("tar,zstd"); ТолÑко в b/src: fr-command-tar.c.orig ++++++ engrampa-1.26.0.tar.xz -> engrampa-1.26.1.tar.xz ++++++ ++++ 146242 lines of diff (skipped)
