| 1 |
commit: 686ef9403d90e7d356a2593edfdce4abfeca22a9 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Sep 28 04:08:48 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Sep 28 04:12:31 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=686ef940 |
| 7 |
|
| 8 |
gnome-extra/yelp: 3.1.3 → 3.2.0 |
| 9 |
|
| 10 |
Bump (fixes html and txt document resolving) and add an upstream patch |
| 11 |
to fix g_error_new usage. |
| 12 |
|
| 13 |
--- |
| 14 |
.../yelp/files/yelp-3.2.0-format-string.patch | 21 ++++++++++++++++++++ |
| 15 |
.../yelp/{yelp-3.1.3.ebuild => yelp-3.2.0.ebuild} | 3 ++ |
| 16 |
2 files changed, 24 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-extra/yelp/files/yelp-3.2.0-format-string.patch b/gnome-extra/yelp/files/yelp-3.2.0-format-string.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..fcdd4af |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-extra/yelp/files/yelp-3.2.0-format-string.patch |
| 23 |
@@ -0,0 +1,21 @@ |
| 24 |
+From d9d6f06bcd90ccab5a7f10cc3f505afb2994e2dd Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Dexter Morgan <dmorganec@×××××.com> |
| 26 |
+Date: Mon, 26 Sep 2011 22:27:38 +0000 |
| 27 |
+Subject: fix format string |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c |
| 31 |
+index 3c75642..25b0f0c 100644 |
| 32 |
+--- a/libyelp/yelp-man-parser.c |
| 33 |
++++ b/libyelp/yelp-man-parser.c |
| 34 |
+@@ -380,7 +380,7 @@ get_troff (gchar *path, GError **error) |
| 35 |
+ NULL, NULL, &ystdout, NULL, &err)) { |
| 36 |
+ /* We failed to run the man program. Return a "Huh?" error. */ |
| 37 |
+ *error = g_error_new (YELP_ERROR, YELP_ERROR_UNKNOWN, |
| 38 |
+- err->message); |
| 39 |
++ "%s", err->message); |
| 40 |
+ g_error_free (err); |
| 41 |
+ return NULL; |
| 42 |
+ } |
| 43 |
+-- |
| 44 |
+cgit v0.9.0.2 |
| 45 |
|
| 46 |
diff --git a/gnome-extra/yelp/yelp-3.1.3.ebuild b/gnome-extra/yelp/yelp-3.2.0.ebuild |
| 47 |
similarity index 92% |
| 48 |
rename from gnome-extra/yelp/yelp-3.1.3.ebuild |
| 49 |
rename to gnome-extra/yelp/yelp-3.2.0.ebuild |
| 50 |
index 2b5bee6..a2ca6c8 100644 |
| 51 |
--- a/gnome-extra/yelp/yelp-3.1.3.ebuild |
| 52 |
+++ b/gnome-extra/yelp/yelp-3.2.0.ebuild |
| 53 |
@@ -49,6 +49,9 @@ pkg_setup() { |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
+ # Upstream patch to fix g_error_new usage, will be in next release |
| 58 |
+ epatch "${FILESDIR}/${P}-format-string.patch" |
| 59 |
+ |
| 60 |
# Fix compatibility with Gentoo's sys-apps/man |
| 61 |
# https://bugzilla.gnome.org/show_bug.cgi?id=648854 |
| 62 |
epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch" |
Archives