Accepting request 377289 from GNOME:Factory
Update to 3.20.0 (forwarded request 376992 from dimstar) OBS-URL: https://build.opensuse.org/request/show/377289 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=117
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c505ba99dd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185
|
||||
size 1412224
|
||||
3
file-roller-3.20.0.tar.xz
Normal file
3
file-roller-3.20.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:185a99b2fc6bcfa21988af36c70def4c519931443015accff40db6ef3f4aa5a8
|
||||
size 1428896
|
||||
@ -1,40 +0,0 @@
|
||||
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));
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 21 20:32:40 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.20.0:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 15 10:41:04 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.19.91:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 15 21:13:53 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.19.90:
|
||||
+ Updated translations.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 19 12:33:04 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 3.19.1:
|
||||
+ New features and user visible changes:
|
||||
- Added support for .click packages (bgo#752133).
|
||||
- Use a message dialog to show the result of an extraction
|
||||
(bgo#748428).
|
||||
- Modernized the 'update files' dialog.
|
||||
- Removed the quit button from the confirmation dialog.
|
||||
- Make Nauitlus select the extracted file.
|
||||
+ Bugs fixed:
|
||||
- Only show the menubar when the shell shows the menubar
|
||||
(bgo#730291).
|
||||
- libarchive: correctly extract sparse files (bgo#747091).
|
||||
- Updated MimeType in org.gnome.FileRoller.desktop
|
||||
(bgo#747639).
|
||||
- Fix documentation typos (bgo#758814).
|
||||
- Error extracting files using file-roller with unar with the
|
||||
character [ (bgo#755580).
|
||||
- Stop mis-treating p7zip 15.09 as pre-4.55 (bgo#757793).
|
||||
- Add a configure environment variable to select the cpio path.
|
||||
- Appdata: added kudos.
|
||||
- Removed deprecated widgets from .ui files.
|
||||
- Added support for the official debian package mime type.
|
||||
- Fixed message dialog showing a (null) string.
|
||||
- Fixed memory leaks: bgo#752476, bgo#752476, bgo#752476,
|
||||
bgo#752476, bgo#752476, bgo#752476, bgo#752476, bgo#752476.
|
||||
+ Updated translations.
|
||||
- Drop file-roller-extract-sparse-file.patch: fixed upstream.
|
||||
- Suggest p7zip instead of recommending it.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 24 12:06:25 UTC 2015 - zaitor@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package file-roller
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,19 +17,17 @@
|
||||
|
||||
|
||||
Name: file-roller
|
||||
Version: 3.16.4
|
||||
Version: 3.20.0
|
||||
Release: 0
|
||||
Summary: An Archive Manager for GNOME
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Archiving/Compression
|
||||
Url: http://fileroller.sourceforge.net
|
||||
Source: http://download.gnome.org/sources/file-roller/3.16/%{name}-%{version}.tar.xz
|
||||
Source: http://download.gnome.org/sources/file-roller/3.20/%{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
|
||||
# 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
|
||||
# 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
|
||||
BuildRequires: dbus-1
|
||||
BuildRequires: fdupes
|
||||
@ -53,7 +51,6 @@ Requires: gzip
|
||||
Requires: rpm
|
||||
Requires: unzip
|
||||
# Formats that we likely want to support by default
|
||||
Recommends: p7zip
|
||||
Recommends: unrar
|
||||
Recommends: xz
|
||||
Recommends: zip
|
||||
@ -61,6 +58,7 @@ Recommends: zip
|
||||
Suggests: lha
|
||||
Suggests: lzip
|
||||
Suggests: lzop
|
||||
Suggests: p7zip
|
||||
Suggests: rzip
|
||||
Suggests: zoo
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -100,7 +98,6 @@ This package contains a plugin to integrate File Roller into Nautilus.
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
translation-update-upstream
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user