diff --git a/0004-fix-engrampa-Fix-decompress-files-with-garbled-chara.patch b/0004-fix-engrampa-Fix-decompress-files-with-garbled-chara.patch deleted file mode 100644 index 71937b1..0000000 --- a/0004-fix-engrampa-Fix-decompress-files-with-garbled-chara.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d4d99cd0b2791452e58242373c584c8eeebac2c4 Mon Sep 17 00:00:00 2001 -From: niko_yhc -Date: Thu, 29 Jun 2023 09:23:48 +0800 -Subject: [PATCH] fix(engrampa):Fix decompress files with garbled characters - under GB18030 encoding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复在GB18030编码下解压文件乱码 - -Fixes #7672 ---- - src/fr-window.c | 1 + - src/main.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/fr-window.c b/src/fr-window.c -index 080e06a..f7c50f7 100644 ---- a/src/fr-window.c -+++ b/src/fr-window.c -@@ -2012,6 +2012,7 @@ fr_window_update_title (FrWindow *window) - char *name; - - name = g_uri_display_basename (fr_window_get_archive_uri (window)); -+ name = g_locale_to_utf8(name, -1, NULL, NULL, NULL); - title = g_strdup_printf ("%s %s", - name, - window->archive->read_only ? _("[read only]") : ""); -diff --git a/src/main.c b/src/main.c -index a9e297d..ba45cbf 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -223,7 +223,8 @@ prepare_app (void) - char *uri; - - window = fr_window_new (); -- -+ -+ filename = g_locale_from_utf8(filename, -1, NULL, NULL, NULL); - file = g_file_new_for_commandline_arg (filename); - uri = g_file_get_uri (file); - fr_window_archive_open (FR_WINDOW (window), uri, GTK_WINDOW (window)); --- -2.27.0 - diff --git a/engrampa-1.24.1.tar.xz b/engrampa-1.24.1.tar.xz deleted file mode 100644 index 2f0998d..0000000 Binary files a/engrampa-1.24.1.tar.xz and /dev/null differ diff --git a/engrampa-1.26.2.tar.xz b/engrampa-1.26.2.tar.xz new file mode 100644 index 0000000..0a5c335 Binary files /dev/null and b/engrampa-1.26.2.tar.xz differ diff --git a/engrampa-c99.patch b/engrampa-c99.patch new file mode 100644 index 0000000..6586b58 --- /dev/null +++ b/engrampa-c99.patch @@ -0,0 +1,21 @@ +Include for strcasecmp. The _XOPEN_SOURCE macro +definition overrides _DEFAULT_SOURCE and disables the declaration +in . + +This avoids an implicit function declaration and build failures with +future compilers. + +Submitted upstream: + +diff --git a/src/file-utils.c b/src/file-utils.c +index a967cb4aad47971d..03024f32d6739bbb 100644 +--- a/src/file-utils.c ++++ b/src/file-utils.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/engrampa.spec b/engrampa.spec index e4d9fa0..548458f 100644 --- a/engrampa.spec +++ b/engrampa.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit f4611c3411c44e792f729a0780c31b0aa55fe004} @@ -13,8 +13,8 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: engrampa -Version: 1.24.1 -Release: 4 +Version: 1.26.2 +Release: 1 Summary: MATE Desktop file archiver License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -33,7 +33,7 @@ BuildRequires: json-glib-devel BuildRequires: caja-devel BuildRequires: libSM-devel -Patch1: 0004-fix-engrampa-Fix-decompress-files-with-garbled-chara.patch +Patch1: engrampa-c99.patch %description Mate File Archiver is an application for creating and viewing archives files, @@ -72,6 +72,7 @@ make %{?_smp_mflags} V=1 %install +mkdir -p %{buildroot}%{_datadir}/engrampa %{make_install} desktop-file-install \ @@ -104,6 +105,9 @@ find %{buildroot} -name "*.la" -exec rm -f {} ';' %{_datadir}/caja/extensions/libcaja-engrampa.caja-extension %changelog +* Tue Feb 27 2024 shafeipaozi - 1.26.2-1 +- update version to 1.26.2 + * Tue Feb 20 2024 peijiankang - 1.24.1-4 - Separate the content related to caja from the engrampa