From 4918fbc9dafc9d988477e43e0db518a2fbb4f967f4c58b24eaf71961aeff5b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 4 Apr 2020 17:24:40 +0000 Subject: [PATCH 1/2] Accepting request 791063 from home:marxin:branches:GNOME:Factory - Add gcc-fno-common-fix.patch in order to fix boo#1160390. OBS-URL: https://build.opensuse.org/request/show/791063 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=284 --- file-roller.changes | 5 +++++ file-roller.spec | 2 ++ gcc-fno-common-fix.patch | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gcc-fno-common-fix.patch diff --git a/file-roller.changes b/file-roller.changes index 3c2f960..03f22ce 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 3 05:56:16 UTC 2020 - Martin Liška + +- Add gcc-fno-common-fix.patch in order to fix boo#1160390. + ------------------------------------------------------------------- Sat Feb 15 19:05:28 UTC 2020 - Bjørn Lie diff --git a/file-roller.spec b/file-roller.spec index 73b4646..15c7b3c 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -31,6 +31,7 @@ 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 +Patch3: gcc-fno-common-fix.patch # Needed for directory ownership BuildRequires: dbus-1 @@ -87,6 +88,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 diff --git a/gcc-fno-common-fix.patch b/gcc-fno-common-fix.patch new file mode 100644 index 0000000..4f6bfd9 --- /dev/null +++ b/gcc-fno-common-fix.patch @@ -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; From 884140b42725d67c9d3087a5bd41355f7b52332a54730ebad16e6bb35fb9b27a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 4 Apr 2020 17:29:17 +0000 Subject: [PATCH 2/2] Tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=285 --- file-roller.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/file-roller.spec b/file-roller.spec index 15c7b3c..1dc6554 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -31,6 +31,7 @@ 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