From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2C04138350 for ; Fri, 20 Mar 2020 20:15:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 399DAE0A6A; Fri, 20 Mar 2020 20:15:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1598EE0A6A for ; Fri, 20 Mar 2020 20:15:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19F9634F0C7 for ; Fri, 20 Mar 2020 20:15:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 615AB187 for ; Fri, 20 Mar 2020 20:15:14 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1584735297.5801471187c94578ce69daaee1f2fe9fda3d4256.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission-remote-gtk/files/, net-p2p/transmission-remote-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/transmission-remote-gtk/files/transmission-remote-gtk-1.4.1-gcc10-fno-common.patch net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild X-VCS-Directories: net-p2p/transmission-remote-gtk/ net-p2p/transmission-remote-gtk/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5801471187c94578ce69daaee1f2fe9fda3d4256 X-VCS-Branch: master Date: Fri, 20 Mar 2020 20:15:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f964a562-f9ae-45af-8f48-42139741bc28 X-Archives-Hash: e5c20135f9a24495ed09fbc7e3737e07 commit: 5801471187c94578ce69daaee1f2fe9fda3d4256 Author: David Seifert gentoo org> AuthorDate: Fri Mar 20 20:14:57 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Mar 20 20:14:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58014711 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 gentoo.org> ...mission-remote-gtk-1.4.1-gcc10-fno-common.patch | 24 +++++++--------------- .../transmission-remote-gtk-1.4.1.ebuild | 3 +-- 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 5cba628a07c..1c445b50854 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 -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 c769e211f47..38e770e754b 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() {