| 1 |
commit: 8dfa44f37e40e4a638c8bb966346ae5b04af9c21 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 19:57:05 2016 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 19:57:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dfa44f3 |
| 7 |
|
| 8 |
net-p2p/gtk-gnutella: fix bug 577012 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../files/gtk-gnutella-1.1.9-load-symbols.patch | 31 ++++++++++++++++++++++ |
| 13 |
...a-1.1.9.ebuild => gtk-gnutella-1.1.9-r1.ebuild} | 2 ++ |
| 14 |
2 files changed, 33 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..40a6943 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.9-load-symbols.patch |
| 21 |
@@ -0,0 +1,31 @@ |
| 22 |
+From 8645df4344f22228862efb3c212e6aa7ec2c6d45 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Raphael Manfredi <Raphael_Manfredi@×××××.com> |
| 24 |
+Date: Tue, 29 Mar 2016 21:16:48 +0200 |
| 25 |
+Subject: [PATCH] symbols_load_from(): must release write lock after falling |
| 26 |
+ back to pre-computed. |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ src/lib/symbols.c | 3 ++- |
| 30 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 31 |
+ |
| 32 |
+diff --git a/src/lib/symbols.c b/src/lib/symbols.c |
| 33 |
+index 9b2e080..69796f6 100644 |
| 34 |
+--- a/src/lib/symbols.c |
| 35 |
++++ b/src/lib/symbols.c |
| 36 |
+@@ -1448,7 +1448,7 @@ symbols_load_from(symbols_t *st, const char *exe, const char *lpath) |
| 37 |
+ } |
| 38 |
+ |
| 39 |
+ if (st->garbage) |
| 40 |
+- return; /* Already went through the "done" part */ |
| 41 |
++ goto unlock; /* Already went through the "done" part */ |
| 42 |
+ |
| 43 |
+ /* FALL THROUGH */ |
| 44 |
+ } |
| 45 |
+@@ -1474,6 +1474,7 @@ symbols_load_from(symbols_t *st, const char *exe, const char *lpath) |
| 46 |
+ if (!retried && !st->indirect && st->garbage) |
| 47 |
+ goto use_pre_computed; |
| 48 |
+ |
| 49 |
++unlock: |
| 50 |
+ SYMBOLS_WRITE_UNLOCK(st); |
| 51 |
+ } |
| 52 |
+ |
| 53 |
|
| 54 |
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 |
| 55 |
similarity index 97% |
| 56 |
rename from net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild |
| 57 |
rename to net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild |
| 58 |
index 154b509..35ad927 100644 |
| 59 |
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild |
| 60 |
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9-r1.ebuild |
| 61 |
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND} |
| 62 |
virtual/pkgconfig" |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
+ epatch "${FILESDIR}/${P}-load-symbols.patch" |
| 66 |
+ |
| 67 |
strip-linguas -i po |
| 68 |
|
| 69 |
echo "# Gentoo-selected LINGUAS" > po/LINGUAS |
Archives