1 |
commit: 7b84a663dece42d8da63e229965ec3a2d873e630 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 19 12:22:32 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 19 12:22:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b84a663 |
7 |
|
8 |
app-arch/file-roller: Fix compiling against GCC 10 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/706728 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
app-arch/file-roller/file-roller-3.32.4.ebuild | 5 ++++ |
15 |
.../files/file-roller-3.32.4-fno-common.patch | 27 ++++++++++++++++++++++ |
16 |
2 files changed, 32 insertions(+) |
17 |
|
18 |
diff --git a/app-arch/file-roller/file-roller-3.32.4.ebuild b/app-arch/file-roller/file-roller-3.32.4.ebuild |
19 |
index e414eeeaab8..d57a9d8778e 100644 |
20 |
--- a/app-arch/file-roller/file-roller-3.32.4.ebuild |
21 |
+++ b/app-arch/file-roller/file-roller-3.32.4.ebuild |
22 |
@@ -56,6 +56,11 @@ rpm - app-arch/rpm |
23 |
unstuff - app-arch/stuffit |
24 |
zoo - app-arch/zoo" |
25 |
|
26 |
+PATCHES=( |
27 |
+ # https://gitlab.gnome.org/GNOME/file-roller/merge_requests/31 |
28 |
+ "${FILESDIR}"/${PN}-3.32.4-fno-common.patch |
29 |
+) |
30 |
+ |
31 |
src_prepare() { |
32 |
# File providing Gentoo package names for various archivers |
33 |
cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die |
34 |
|
35 |
diff --git a/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch b/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch |
36 |
new file mode 100644 |
37 |
index 00000000000..9239810c901 |
38 |
--- /dev/null |
39 |
+++ b/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch |
40 |
@@ -0,0 +1,27 @@ |
41 |
+From 55fa0fb287e7fb7cee336cac0a6c1a94e505dc84 Mon Sep 17 00:00:00 2001 |
42 |
+From: David Seifert <soap@g.o> |
43 |
+Date: Wed, 19 Feb 2020 13:18:18 +0100 |
44 |
+Subject: [PATCH] Fix compiling with GCC 10 |
45 |
+ |
46 |
+* GCC 10 defaults to `-fno-common`. |
47 |
+ |
48 |
+Bug: https://bugs.gentoo.org/706728 |
49 |
+--- |
50 |
+ src/fr-application.c | 1 - |
51 |
+ 1 file changed, 1 deletion(-) |
52 |
+ |
53 |
+diff --git a/src/fr-application.c b/src/fr-application.c |
54 |
+index c148c4f9..00ebe552 100644 |
55 |
+--- a/src/fr-application.c |
56 |
++++ b/src/fr-application.c |
57 |
+@@ -42,7 +42,6 @@ |
58 |
+ #define SERVICE_TIMEOUT 10 |
59 |
+ |
60 |
+ |
61 |
+-gint ForceDirectoryCreation; |
62 |
+ static char **remaining_args; |
63 |
+ static char *arg_add_to = NULL; |
64 |
+ static int arg_add = FALSE; |
65 |
+-- |
66 |
+2.25.1 |
67 |
+ |