From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/file-roller/files/, app-arch/file-roller/
Date: Wed, 19 Feb 2020 12:22:50 +0000 (UTC) [thread overview]
Message-ID: <1582114952.7b84a663dece42d8da63e229965ec3a2d873e630.soap@gentoo> (raw)
commit: 7b84a663dece42d8da63e229965ec3a2d873e630
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 12:22:32 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 12:22:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b84a663
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 <AT> gentoo.org>
app-arch/file-roller/file-roller-3.32.4.ebuild | 5 ++++
.../files/file-roller-3.32.4-fno-common.patch | 27 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
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 e414eeeaab8..d57a9d8778e 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 00000000000..9239810c901
--- /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
+
next reply other threads:[~2020-02-19 12:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 12:22 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-08 13:52 [gentoo-commits] repo/gentoo:master commit in: app-arch/file-roller/files/, app-arch/file-roller/ Pacho Ramos
2019-12-08 20:27 Mart Raudsepp
2019-10-20 18:21 Mart Raudsepp
2016-06-24 20:06 Pacho Ramos
2016-04-17 11:13 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1582114952.7b84a663dece42d8da63e229965ec3a2d873e630.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox