pool/file-roller
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 341128 from GNOME:Next

Browse Source 
Add patch that we got offered a long time ago, got rejected for missing patch-tags, then fixed in subbers branch, but never subbed after fixing, I did it for him/her

OBS-URL: https://build.opensuse.org/request/show/341128
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=209
This commit is contained in:
Dominique Leuenberger 2015-10-28 15:44:00 +00:00 committed by Git OBS Bridge
parent e0d672fb76
commit a95b38d83a
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
file-roller-extract-sparse-file.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 9a11e45..83b9ade 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -582,7 +582,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
const char *relative_path;
GFile *file;
GFile *parent;
- GOutputStream *ostream;
+ struct archive *ext;
const void *buffer;
size_t buffer_size;
int64_t offset;
@@ -777,16 +777,21 @@ extract_archive_thread (GSimpleAsyncResult *result,
break;
case AE_IFREG:
- ostream = (GOutputStream *) g_file_replace (file, NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, cancellable, &load_data->error);
- if (ostream == NULL)
+ ext = archive_write_disk_new();
+ if (ext == NULL)
break;
+ archive_write_disk_set_options(ext, ARCHIVE_EXTRACT_TIME|ARCHIVE_EXTRACT_PERM|ARCHIVE_EXTRACT_ACL|ARCHIVE_EXTRACT_FFLAGS);
+ archive_write_disk_set_standard_lookup(ext);
+ archive_entry_set_pathname(entry, g_file_get_path(file));
+ archive_write_header(ext, entry);
while ((r = archive_read_data_block (a, &buffer, &buffer_size, &offset)) == ARCHIVE_OK) {
- if (g_output_stream_write (ostream, buffer, buffer_size, cancellable, &load_data->error) == -1)
+ if ((r = archive_write_data_block(ext, buffer, buffer_size, offset)) < ARCHIVE_OK)
break;
fr_archive_progress_inc_completed_bytes (load_data->archive, buffer_size);
}
- _g_object_unref (ostream);
+ archive_write_close(ext);
+ archive_write_free (ext);
if (r != ARCHIVE_EOF)
load_data->error = _g_error_new_from_archive_error (archive_error_string (a));

6
file-roller.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 24 12:06:25 UTC 2015 - zaitor@opensuse.org
- Add patch: file-roller-extract-sparse-file.patch: Fix extraction
of sparse file (bsc#923449, bgo#747091).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 11:12:54 UTC 2015 - zaitor@opensuse.org Tue Sep 1 11:12:54 UTC 2015 - zaitor@opensuse.org

3
file-roller.spec
View File

@ -28,6 +28,8 @@ Source: http://download.gnome.org/sources/file-roller/3.16/%{name}-%{ver
Patch0: file-roller-3.4-change-archiver-priority.patch Patch0: file-roller-3.4-change-archiver-priority.patch
# PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK. # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 dimstar@opensuse.org -- List package match names for automatic installation using PK.
Patch1: file-roller-pkg-match.patch Patch1: file-roller-pkg-match.patch
# PATCH-FIX-UPSTREAM file-roller-extract-sparse-file.patch bsc#923449 bgo#747091 tyang@suse.com -- file-roller does not extract file correctly
Patch2: file-roller-extract-sparse-file.patch
# Needed for directory ownership # Needed for directory ownership
BuildRequires: dbus-1 BuildRequires: dbus-1
BuildRequires: fdupes BuildRequires: fdupes
@ -98,6 +100,7 @@ This package contains a plugin to integrate File Roller into Nautilus.
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1 %patch1 -p1
%patch2 -p1
translation-update-upstream translation-update-upstream
%build %build