* [gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/files/, net-p2p/gtk-gnutella/
@ 2016-03-29 19:57 Hans de Graaff
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2016-03-29 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 8dfa44f37e40e4a638c8bb966346ae5b04af9c21
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 19:57:05 2016 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 19:57:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfa44f3
net-p2p/gtk-gnutella: fix bug 577012
Package-Manager: portage-2.2.26
.../files/gtk-gnutella-1.1.9-load-symbols.patch | 31 ++++++++++++++++++++++
...a-1.1.9.ebuild => gtk-gnutella-1.1.9-r1.ebuild} | 2 ++
2 files changed, 33 insertions(+)
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch
new file mode 100644
index 0000000..40a6943
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch
@@ -0,0 +1,31 @@
+From 8645df4344f22228862efb3c212e6aa7ec2c6d45 Mon Sep 17 00:00:00 2001
+From: Raphael Manfredi <Raphael_Manfredi@pobox.com>
+Date: Tue, 29 Mar 2016 21:16:48 +0200
+Subject: [PATCH] symbols_load_from(): must release write lock after falling
+ back to pre-computed.
+
+---
+ src/lib/symbols.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/symbols.c b/src/lib/symbols.c
+index 9b2e080..69796f6 100644
+--- a/src/lib/symbols.c
++++ b/src/lib/symbols.c
+@@ -1448,7 +1448,7 @@ symbols_load_from(symbols_t *st, const char *exe, const char *lpath)
+ }
+
+ if (st->garbage)
+- return; /* Already went through the "done" part */
++ goto unlock; /* Already went through the "done" part */
+
+ /* FALL THROUGH */
+ }
+@@ -1474,6 +1474,7 @@ symbols_load_from(symbols_t *st, const char *exe, const char *lpath)
+ if (!retried && !st->indirect && st->garbage)
+ goto use_pre_computed;
+
++unlock:
+ SYMBOLS_WRITE_UNLOCK(st);
+ }
+
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
similarity index 97%
rename from net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
rename to net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
index 154b509..35ad927 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
+ epatch "${FILESDIR}/${P}-load-symbols.patch"
+
strip-linguas -i po
echo "# Gentoo-selected LINGUAS" > po/LINGUAS
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/files/, net-p2p/gtk-gnutella/
@ 2019-01-27 7:49 Hans de Graaff
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2019-01-27 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 7473325883667c2f6021c2c583dbb990c8ec29ec
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 07:47:45 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 07:47:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74733258
net-p2p/gtk-gnutella: fix compilation with glibc 2.28
Fixes: https://bugs.gentoo.org/669606
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/gtk-gnutella-1.1.14-statx.patch | 38 ++++++++++++++++++++++
net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild | 4 ++-
net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild | 8 +++--
3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
new file mode 100644
index 00000000000..5d455887c04
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
@@ -0,0 +1,38 @@
+diff --git a/src/lib/stats.c b/src/lib/stats.c
+index 8d0d87b8b..725986268 100644
+--- a/src/lib/stats.c
++++ b/src/lib/stats.c
+@@ -50,7 +50,7 @@ enum statx_magic { STATX_MAGIC = 0x560044e5 };
+ /**
+ * A one-dimension container (x).
+ */
+-struct statx {
++struct statistics {
+ enum statx_magic magic; /**< Magic number */
+ elist_t data; /**< Data points */
+ long n; /**< Amount of data points */
+@@ -60,7 +60,7 @@ struct statx {
+ };
+
+ static inline void
+-statx_check(const struct statx * const sx)
++statx_check(const struct statistics * const sx)
+ {
+ g_assert(sx != NULL);
+ g_assert(STATX_MAGIC == sx->magic);
+diff --git a/src/lib/stats.h b/src/lib/stats.h
+index ba876467c..2a67952e2 100644
+--- a/src/lib/stats.h
++++ b/src/lib/stats.h
+@@ -40,9 +40,9 @@
+ * One dimension statistics.
+ */
+
+-struct statx;
++struct statistics;
+
+-typedef struct statx statx_t;
++typedef struct statistics statx_t;
+
+ statx_t *statx_make(void);
+ statx_t *statx_make_nodata(void);
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
index 6dc93535b3c..0d716e9f88d 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
+ eapply "${FILESDIR}/${PN}-1.1.14-statx.patch"
+
strip-linguas -i po
echo "# Gentoo-selected LINGUAS" > po/LINGUAS
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
index 7e55b5198d1..61b7b1fcdeb 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# strip-linguas
-inherit eutils
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
IUSE="nls dbus ssl +gtk"
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
src_prepare() {
+ eapply "${FILESDIR}/${P}-statx.patch"
+
strip-linguas -i po
echo "# Gentoo-selected LINGUAS" > po/LINGUAS
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-27 7:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 19:57 [gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/files/, net-p2p/gtk-gnutella/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2019-01-27 7:49 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox