From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-sound/gnomad/Manifest | 3 +- .../gnomad/files/gnomad-2.9.6-fno-common.patch | 56 ++++++++++++++++++++++ media-sound/gnomad/gnomad-2.9.6.ebuild | 15 ++++-- 3 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 media-sound/gnomad/files/gnomad-2.9.6-fno-common.patch (limited to 'media-sound/gnomad') diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest index 8197a50fa4c4..0e4376ad1f6b 100644 --- a/media-sound/gnomad/Manifest +++ b/media-sound/gnomad/Manifest @@ -1,3 +1,4 @@ +AUX gnomad-2.9.6-fno-common.patch 1621 BLAKE2B 7e5cffd644026bca5fe84090930535e2129be9135c1e5e97e5e4f92132026cc210321da7e0e300655c14906559888e15e4a1a13598b32831cfeeb262c199706c SHA512 97d9e3d08808a81c206ffa39bc914bc152fde781ede811ecdde3ab2257442466f4f5f792dfec6d65b9e78ed66cb07574bb036ece8895f68097e7f518b5060288 DIST gnomad2-2.9.6.tar.gz 318431 BLAKE2B 756345c1b27da5f41d46aaf2862d94a2a94cc91fece77eb5cd8428581773867a85e120e09e83337ddbf8d77a91bd7db09d50584190d9929be45bb3d94393b9eb SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 -EBUILD gnomad-2.9.6.ebuild 783 BLAKE2B 6f2c98fa67399953d55d16b7fd2f67a26fe32aa4181ce4882ac9f83eebe43645ab07c0414baa4eedf6364a091caa366c71b74ffdf2ed4d503113e184d4a7d239 SHA512 9be4ce865bf88642b565b1cc2040f13df0a195daa503e3dc3520a6ef6430d558fda9663010b74f9939050f98e94ede1a7b2227acc765ddbb979a1c4286b8672f +EBUILD gnomad-2.9.6.ebuild 833 BLAKE2B ce3d5e0bbf90b609d205bf0f111aee40fa2b88b6d30c232c56eefc83bd01150317f2f717f6470d78d2a8e9ad73d8e873659a4a0bee7fa8ffef9d4a6d5118778c SHA512 6441b7db366561bcd679a66e07004d1deec8e4460616a79c89ffd22de1952d2397510c13e78046b54daa1c6ba1c99cfc0a46368bbf86d3b91b9fb25ce90864fc MISC metadata.xml 330 BLAKE2B da9e23c768fba646f72a220e5d3d24a78d8e021660f7310bc657df6fc2ef56a6b4419149b0d2463b9ea51ae5c70795d79c23a54ef4c8fac25b1a0d41212120f4 SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386 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 000000000000..76abaa9cfa2d --- /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 fb2ee99ca369..45206c12519c 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() { -- cgit v1.2.3