Accepting request 791401 from GNOME:Factory
Add upstream patch OBS-URL: https://build.opensuse.org/request/show/791401 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file-roller?expand=0&rev=146
This commit is contained in:
commit
e016b6e649
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 3 05:56:16 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
- Add gcc-fno-common-fix.patch in order to fix boo#1160390.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 15 19:05:28 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -31,6 +31,8 @@ Patch0: file-roller-3.4-change-archiver-priority.patch
|
||||
Patch1: file-roller-pkg-match.patch
|
||||
# PATCH-FIX-OPENSUSE file-roller-ignore-unrar-if-wrapper.patch bsc#1072118 mgorse@suse.com -- if unrar is a wrapper script for unar, then ignore it, and use unar instead.
|
||||
Patch2: file-roller-ignore-unrar-if-wrapper.patch
|
||||
# PATCH-FIX-UPSTREAM gcc-fno-common-fix.patch boo#1160390 -- Fix build with fno-common
|
||||
Patch3: gcc-fno-common-fix.patch
|
||||
|
||||
# Needed for directory ownership
|
||||
BuildRequires: dbus-1
|
||||
@ -87,6 +89,7 @@ contained in the archive, and extract files from the archive.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
translation-update-upstream po %{name}
|
||||
|
||||
%build
|
||||
|
12
gcc-fno-common-fix.patch
Normal file
12
gcc-fno-common-fix.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/fr-application.c b/src/fr-application.c
|
||||
index c148c4f..00ebe55 100644
|
||||
--- a/src/fr-application.c
|
||||
+++ b/src/fr-application.c
|
||||
@@ -42,7 +42,6 @@
|
||||
#define SERVICE_TIMEOUT 10
|
||||
|
||||
|
||||
-gint ForceDirectoryCreation;
|
||||
static char **remaining_args;
|
||||
static char *arg_add_to = NULL;
|
||||
static int arg_add = FALSE;
|
Loading…
Reference in New Issue
Block a user