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 A96EC138359 for ; Sat, 8 Aug 2020 16:55:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E594CE0B42; Sat, 8 Aug 2020 16:55:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C2B13E0B42 for ; Sat, 8 Aug 2020 16:55:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 CF43C34F4A2 for ; Sat, 8 Aug 2020 16:55:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9046E316 for ; Sat, 8 Aug 2020 16:55:39 +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: <1596905625.128bd73938541133989777400ec00f2a7d5380dd.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gnomad/files/, media-sound/gnomad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch media-sound/gnomad/gnomad-2.9.6.ebuild X-VCS-Directories: media-sound/gnomad/files/ media-sound/gnomad/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 128bd73938541133989777400ec00f2a7d5380dd X-VCS-Branch: master Date: Sat, 8 Aug 2020 16:55:39 +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: 1f36f0db-85c7-4b1d-bdb8-27df25abd4c3 X-Archives-Hash: 4163097bfc9a1816ed3a36b86a503960 commit: 128bd73938541133989777400ec00f2a7d5380dd Author: David Seifert gentoo org> AuthorDate: Sat Aug 8 16:53:45 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Aug 8 16:53:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128bd739 media-sound/gnomad: Fix building under -fno-common Closes: https://bugs.gentoo.org/707006 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> .../gnomad/files/gnomad-2.9.6-fno-common.patch | 56 ++++++++++++++++++++++ media-sound/gnomad/gnomad-2.9.6.ebuild | 15 ++++-- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch new file mode 100644 index 00000000000..76abaa9cfa2 --- /dev/null +++ b/media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch @@ -0,0 +1,56 @@ +--- a/src/common.h ++++ b/src/common.h +@@ -130,25 +130,25 @@ + } playlist_widgets_t; + + /* Globally known widgets */ +-transfer_widgets_t transfer_widgets; +-data_widgets_t data_widgets; +-playlist_widgets_t playlist_widgets; ++extern transfer_widgets_t transfer_widgets; ++extern data_widgets_t data_widgets; ++extern playlist_widgets_t playlist_widgets; + + /* Global progress bar - not so good but... */ +-GtkWidget *progress_bar; ++extern GtkWidget *progress_bar; + + /* Global playlist selection for the popup, not good either ... */ +-GList *jukebox_playlist; +-GList *selected_target_playlists; ++extern GList *jukebox_playlist; ++extern GList *selected_target_playlists; + + /* Global lock variable for the jukebox */ +-gboolean volatile jukebox_locked; ++extern gboolean volatile jukebox_locked; + + /* Global cancellation variable for jukebox operations */ +-gboolean volatile cancel_jukebox_operation; ++extern gboolean volatile cancel_jukebox_operation; + + /* Global debug level variable (standard = 7) */ +-gint gnomad_debug; ++extern gint gnomad_debug; + + /* A proc for hiding dialog windows */ + GCallback dispose_of_dialog_window(GtkButton * button, gpointer data); +--- a/src/gnomad2.c ++++ b/src/gnomad2.c +@@ -34,6 +34,16 @@ + guint uevent_device_hooked = 0; + #endif + ++transfer_widgets_t transfer_widgets; ++data_widgets_t data_widgets; ++playlist_widgets_t playlist_widgets; ++GtkWidget *progress_bar; ++GList *jukebox_playlist; ++GList *selected_target_playlists; ++gboolean volatile jukebox_locked; ++gboolean volatile cancel_jukebox_operation; ++gint gnomad_debug; ++ + /* This one should be global really */ + GtkWidget *main_window; + diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild index fb2ee99ca36..45206c12519 100644 --- a/media-sound/gnomad/gnomad-2.9.6.ebuild +++ b/media-sound/gnomad/gnomad-2.9.6.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 MY_PN=${PN}2 MY_P=${MY_PN}-${PV} -DESCRIPTION="A GTK+ music manager and swiss army knife for the Portable Digital Entertainment (PDE) protocol" +DESCRIPTION="A GTK+ music manager for the Portable Digital Entertainment (PDE) protocol" HOMEPAGE="http://gnomad2.sourceforge.net/" SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" @@ -22,12 +22,17 @@ RDEPEND=" media-libs/libnjb media-libs/taglib >=x11-libs/gtk+-2.24:2" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" + nls? ( + dev-util/intltool + sys-devel/gettext + )" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${PN}-2.9.6-fno-common.patch ) DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated src_configure() {