diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-19 13:22:32 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-02-19 13:22:32 +0100 |
| commit | 7b84a663dece42d8da63e229965ec3a2d873e630 (patch) | |
| tree | 0de1c8adad426001d19cd47e494501501bae58d8 /app-arch | |
| parent | app-misc/rpick: Drop 0.4.0 (diff) | |
| download | gentoo-7b84a663dece42d8da63e229965ec3a2d873e630.tar.gz gentoo-7b84a663dece42d8da63e229965ec3a2d873e630.tar.bz2 gentoo-7b84a663dece42d8da63e229965ec3a2d873e630.zip | |
app-arch/file-roller: Fix compiling against GCC 10
Bug: https://bugs.gentoo.org/706728
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/file-roller/file-roller-3.32.4.ebuild | 5 | ||||
| -rw-r--r-- | app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/app-arch/file-roller/file-roller-3.32.4.ebuild b/app-arch/file-roller/file-roller-3.32.4.ebuild index e414eeeaab81..d57a9d8778e5 100644 --- a/app-arch/file-roller/file-roller-3.32.4.ebuild +++ b/app-arch/file-roller/file-roller-3.32.4.ebuild @@ -56,6 +56,11 @@ rpm - app-arch/rpm unstuff - app-arch/stuffit zoo - app-arch/zoo" +PATCHES=( + # https://gitlab.gnome.org/GNOME/file-roller/merge_requests/31 + "${FILESDIR}"/${PN}-3.32.4-fno-common.patch +) + src_prepare() { # File providing Gentoo package names for various archivers cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die 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 new file mode 100644 index 000000000000..9239810c901d --- /dev/null +++ b/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch @@ -0,0 +1,27 @@ +From 55fa0fb287e7fb7cee336cac0a6c1a94e505dc84 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Wed, 19 Feb 2020 13:18:18 +0100 +Subject: [PATCH] Fix compiling with GCC 10 + +* GCC 10 defaults to `-fno-common`. + +Bug: https://bugs.gentoo.org/706728 +--- + src/fr-application.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/fr-application.c b/src/fr-application.c +index c148c4f9..00ebe552 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; +-- +2.25.1 + |