* [PR PATCH] file-roller: update to 44
@ 2024-03-31 21:38 chrysos349
2024-04-10 12:10 ` [PR PATCH] [Updated] " chrysos349
2024-04-14 22:51 ` [PR PATCH] [Merged]: file-roller: update to 44.1 oreo639
0 siblings, 2 replies; 3+ messages in thread
From: chrysos349 @ 2024-03-31 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages file-roller
https://github.com/void-linux/void-packages/pull/49637
file-roller: update to 44
@Gottox
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49637.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-roller-49637.patch --]
[-- Type: text/x-diff, Size: 4266 bytes --]
From 13db8d045d840761b78da67dd6cbad98b95edfee Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 1 Apr 2024 00:36:39 +0300
Subject: [PATCH] file-roller: update to 44
---
.../patches/fix-7zip-asking-password.patch | 65 -------------------
srcpkgs/file-roller/template | 10 +--
2 files changed, 5 insertions(+), 70 deletions(-)
delete mode 100644 srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
diff --git a/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch b/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
deleted file mode 100644
index b5ffb81892e573..00000000000000
--- a/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-7zip: ask password if the command returns with status 255
-see https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 87e247b3..a3b6b2f2 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -556,6 +556,9 @@ fr_command_7z_handle_error (FrCommand *command,
- /* ignore warnings */
- fr_error_clear_gerror (error);
- }
-+ if (error->status == 255) {
-+ fr_error_take_gerror (error, g_error_new_literal (FR_ERROR, FR_ERROR_ASK_PASSWORD, ""));
-+ }
- else {
- GList *scan;
-
-diff --git a/src/fr-process.c b/src/fr-process.c
-index d81768cc..6523247a 100644
---- a/src/fr-process.c
-+++ b/src/fr-process.c
-@@ -838,7 +838,7 @@ check_child (gpointer data)
- {
- GList *scan;
-
-- g_print ("** ERROR **\n");
-+ g_print ("** ERROR [1] **\n");
- g_print ("%s\n", exec_data->error->gerror->message);
- for (scan = process->err.raw; scan; scan = scan->next)
- g_print ("%s\n", (char *)scan->data);
-@@ -849,10 +849,11 @@ check_child (gpointer data)
- }
- else if (exec_data->error == NULL) {
- if (WIFEXITED (status)) {
-- if (WEXITSTATUS (status) == 255) {
-+ /*if (WEXITSTATUS (status) == 255) {
- exec_data->error = fr_error_new (FR_ERROR_COMMAND_NOT_FOUND, 0, NULL);
- }
-- else if (WEXITSTATUS (status) != 0) {
-+ else*/
-+ if (WEXITSTATUS (status) != 0) {
- exec_data->error = fr_error_new (FR_ERROR_COMMAND_ERROR, WEXITSTATUS (status), NULL);
- }
- }
-@@ -903,7 +904,7 @@ check_child (gpointer data)
- {
- GList *scan;
-
-- g_print ("** ERROR **\n");
-+ g_print ("** ERROR [2] : (status: %d) (type: %d) **\n", exec_data->error->status, exec_data->error->type);
- for (scan = process->err.raw; scan; scan = scan->next)
- g_print ("%s\n", (char *)scan->data);
- }
-diff --git a/src/fr-window.c b/src/fr-window.c
-index 65d7bbe2..3dd7ae90 100644
---- a/src/fr-window.c
-+++ b/src/fr-window.c
-@@ -2882,6 +2882,7 @@ _handle_archive_operation_error (FrWindow *window,
- details = _("Command not found.");
- break;
- case FR_ERROR_EXITED_ABNORMALLY:
-+ case FR_ERROR_COMMAND_ERROR:
- details = _("Command exited abnormally.");
- break;
- case FR_ERROR_SPAWN:
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index acdccb95d994b7..aeb7ca9b9827c5 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,12 +1,12 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=43.1
+version=44
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
- gtk-update-icon-cache"
-makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
+ gtk-update-icon-cache cpio"
+makedepends="libadwaita-devel libarchive-devel libportal-gtk4-devel
+ nautilus-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
-checksum=84994023997293beb345d9793db8f5f0bbb41faa155c6ffb48328f203957ad08
+checksum=5b1c0e6a2e7de75392bd424550c1e5643dd1cf6c333fb1ed6a76419a29507aa4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] file-roller: update to 44
2024-03-31 21:38 [PR PATCH] file-roller: update to 44 chrysos349
@ 2024-04-10 12:10 ` chrysos349
2024-04-14 22:51 ` [PR PATCH] [Merged]: file-roller: update to 44.1 oreo639
1 sibling, 0 replies; 3+ messages in thread
From: chrysos349 @ 2024-04-10 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages file-roller
https://github.com/void-linux/void-packages/pull/49637
file-roller: update to 44
@Gottox
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/49637.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-roller-49637.patch --]
[-- Type: text/x-diff, Size: 4270 bytes --]
From 50ae49167fea1735d14ed5f0a0a02e7582aacf65 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Mon, 1 Apr 2024 00:36:39 +0300
Subject: [PATCH] file-roller: update to 44.1
---
.../patches/fix-7zip-asking-password.patch | 65 -------------------
srcpkgs/file-roller/template | 10 +--
2 files changed, 5 insertions(+), 70 deletions(-)
delete mode 100644 srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
diff --git a/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch b/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
deleted file mode 100644
index b5ffb81892e573..00000000000000
--- a/srcpkgs/file-roller/patches/fix-7zip-asking-password.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-7zip: ask password if the command returns with status 255
-see https://github.com/GNOME/file-roller/commit/844f6fbbef2a616f4bf1eb877710f55bced71d62
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index 87e247b3..a3b6b2f2 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -556,6 +556,9 @@ fr_command_7z_handle_error (FrCommand *command,
- /* ignore warnings */
- fr_error_clear_gerror (error);
- }
-+ if (error->status == 255) {
-+ fr_error_take_gerror (error, g_error_new_literal (FR_ERROR, FR_ERROR_ASK_PASSWORD, ""));
-+ }
- else {
- GList *scan;
-
-diff --git a/src/fr-process.c b/src/fr-process.c
-index d81768cc..6523247a 100644
---- a/src/fr-process.c
-+++ b/src/fr-process.c
-@@ -838,7 +838,7 @@ check_child (gpointer data)
- {
- GList *scan;
-
-- g_print ("** ERROR **\n");
-+ g_print ("** ERROR [1] **\n");
- g_print ("%s\n", exec_data->error->gerror->message);
- for (scan = process->err.raw; scan; scan = scan->next)
- g_print ("%s\n", (char *)scan->data);
-@@ -849,10 +849,11 @@ check_child (gpointer data)
- }
- else if (exec_data->error == NULL) {
- if (WIFEXITED (status)) {
-- if (WEXITSTATUS (status) == 255) {
-+ /*if (WEXITSTATUS (status) == 255) {
- exec_data->error = fr_error_new (FR_ERROR_COMMAND_NOT_FOUND, 0, NULL);
- }
-- else if (WEXITSTATUS (status) != 0) {
-+ else*/
-+ if (WEXITSTATUS (status) != 0) {
- exec_data->error = fr_error_new (FR_ERROR_COMMAND_ERROR, WEXITSTATUS (status), NULL);
- }
- }
-@@ -903,7 +904,7 @@ check_child (gpointer data)
- {
- GList *scan;
-
-- g_print ("** ERROR **\n");
-+ g_print ("** ERROR [2] : (status: %d) (type: %d) **\n", exec_data->error->status, exec_data->error->type);
- for (scan = process->err.raw; scan; scan = scan->next)
- g_print ("%s\n", (char *)scan->data);
- }
-diff --git a/src/fr-window.c b/src/fr-window.c
-index 65d7bbe2..3dd7ae90 100644
---- a/src/fr-window.c
-+++ b/src/fr-window.c
-@@ -2882,6 +2882,7 @@ _handle_archive_operation_error (FrWindow *window,
- details = _("Command not found.");
- break;
- case FR_ERROR_EXITED_ABNORMALLY:
-+ case FR_ERROR_COMMAND_ERROR:
- details = _("Command exited abnormally.");
- break;
- case FR_ERROR_SPAWN:
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index acdccb95d994b7..456818d0582d10 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,12 +1,12 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=43.1
+version=44.1
revision=1
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
- gtk-update-icon-cache"
-makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
+ gtk-update-icon-cache cpio"
+makedepends="libadwaita-devel libarchive-devel libportal-gtk4-devel
+ nautilus-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
-checksum=84994023997293beb345d9793db8f5f0bbb41faa155c6ffb48328f203957ad08
+checksum=250cf551cfcb12a670ca8adf953e0681f1c9b76ee09d9458b20203c62602c487
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: file-roller: update to 44.1
2024-03-31 21:38 [PR PATCH] file-roller: update to 44 chrysos349
2024-04-10 12:10 ` [PR PATCH] [Updated] " chrysos349
@ 2024-04-14 22:51 ` oreo639
1 sibling, 0 replies; 3+ messages in thread
From: oreo639 @ 2024-04-14 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
There's a merged pull request on the void-packages repository
file-roller: update to 44.1
https://github.com/void-linux/void-packages/pull/49637
Description:
@Gottox
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-14 22:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-31 21:38 [PR PATCH] file-roller: update to 44 chrysos349
2024-04-10 12:10 ` [PR PATCH] [Updated] " chrysos349
2024-04-14 22:51 ` [PR PATCH] [Merged]: file-roller: update to 44.1 oreo639
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).