summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-03-20 21:14:57 +0100
committerDavid Seifert <soap@gentoo.org>2020-03-20 21:14:57 +0100
commit5801471187c94578ce69daaee1f2fe9fda3d4256 (patch)
treedd60873aa69dde8be3161aacc7d206ab9852809d /net-p2p
parentpackage.mask: Last-rite x11-libs/gtkglarea and media-sound/galan (diff)
downloadgentoo-5801471187c94578ce69daaee1f2fe9fda3d4256.tar.gz
gentoo-5801471187c94578ce69daaee1f2fe9fda3d4256.tar.bz2
gentoo-5801471187c94578ce69daaee1f2fe9fda3d4256.zip
net-p2p/transmission-remote-gtk: Replace with updated upstream patch
Bug: https://bugs.gentoo.org/706980 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch24
-rw-r--r--net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild3
2 files changed, 8 insertions, 19 deletions
diff --git a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
index 5cba628a07ca..1c445b508546 100644
--- a/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
+++ b/net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch
@@ -1,18 +1,17 @@
-From 617aaf628962af85bf9b44ab517fec2b6fa178f9 Mon Sep 17 00:00:00 2001
+From b20655081332847426a7d10189bb1e2369efea42 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
-Date: Tue, 10 Mar 2020 11:20:12 +0100
+Date: Fri, 20 Mar 2020 20:30:24 +0100
Subject: [PATCH] Fix building under GCC 10 / -fno-common
-* Define an enum type `TrgColumnType`, not an anonymous
- enum with an object called `TrgColumnType`.
+* Add a `typedef` to avoid defining a variable.
Bug: https://bugs.gentoo.org/706980
---
- src/trg-tree-view.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/trg-tree-view.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h
-index 435848f..363f662 100644
+index 435848f..78cd76e 100644
--- a/src/trg-tree-view.h
+++ b/src/trg-tree-view.h
@@ -51,7 +51,7 @@ GtkWidget *trg_tree_view_new(void);
@@ -20,16 +19,7 @@ index 435848f..363f662 100644
G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv);
-enum {
-+enum TrgColumnType {
++typedef enum {
TRG_COLTYPE_ICONTEXT,
TRG_COLTYPE_FILEICONTEXT,
TRG_COLTYPE_WANTED,
-@@ -65,7 +65,7 @@ enum {
- TRG_COLTYPE_PRIO,
- TRG_COLTYPE_NUMGTZERO,
- TRG_COLTYPE_NUMGTEQZERO
--} TrgColumnType;
-+};
-
- typedef struct {
- gint model_column;
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index c769e211f477..38e770e754bc 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
" # eautoreconf needs sys-devel/autoconf-archive
PATCHES=(
- # https://github.com/transmission-remote-gtk/transmission-remote-gtk/pull/92
- "${FILESDIR}"/${PN}-1.4.1-gcc10-fno-common.patch
+ "${FILESDIR}"/${PN}-1.4.1-gcc10-fno-common.patch # merged, remove on bump
)
src_configure() {