[gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/

[Nirbheek Chauhan]

commit:     ac57e7aac285837744e6f7c67236f7c1e92cb07b
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri May 27 07:20:09 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 18:10:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac57e7aa

gnome-extra/yelp: 3.0.2 → 3.0.3 + sys-apps/man compatibility

* Add a patch for compatibility with sys-apps/man (without this patch,
  yelp only worked with sys-apps/man-db); see upstream bug 648854
* Remove patches that have been applied upstream.

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...ication-Remove-C-style-comment-bug-648771.patch |   25 ----
 ...2-Fix-untranslated-UI-elements-bug-648840.patch |   28 -----
 ...reakage-caused-by-the-fix-to-https-bugzil.patch |   26 -----
 .../yelp/files/yelp-3.0.3-man-compatibility.patch  |  117 ++++++++++++++++++++
 .../yelp/{yelp-3.0.2.ebuild => yelp-3.0.3.ebuild}  |    5 +-
 5 files changed, 120 insertions(+), 81 deletions(-)

diff --git a/gnome-extra/yelp/files/0001-yelp-application-Remove-C-style-comment-bug-648771.patch b/gnome-extra/yelp/files/0001-yelp-application-Remove-C-style-comment-bug-648771.patch
deleted file mode 100644
index 798faa9..0000000
--- a/gnome-extra/yelp/files/0001-yelp-application-Remove-C-style-comment-bug-648771.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a1e49faa0b4873c3f3c5b949ebe96186dc2e2813 Mon Sep 17 00:00:00 2001
-From: Shaun McCance <shaunm@×××××.org>
-Date: Wed, 27 Apr 2011 11:18:49 -0400
-Subject: [PATCH 1/3] yelp-application: Remove C++-style comment, bug #648771
-
----
- src/yelp-application.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/yelp-application.c b/src/yelp-application.c
-index ddf5a19..94f13ae 100644
---- a/src/yelp-application.c
-+++ b/src/yelp-application.c
-@@ -350,7 +350,7 @@ yelp_application_new (void)
-     return app;
- }
- 
--// consumes the uri
-+/* consumes the uri */
- static void
- open_uri (YelpApplication *app,
-           YelpUri         *uri,
--- 
-1.7.5.rc3
-

diff --git a/gnome-extra/yelp/files/0002-Fix-untranslated-UI-elements-bug-648840.patch b/gnome-extra/yelp/files/0002-Fix-untranslated-UI-elements-bug-648840.patch
deleted file mode 100644
index 099c582..0000000
--- a/gnome-extra/yelp/files/0002-Fix-untranslated-UI-elements-bug-648840.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b2d172d904c1cbd67ac227241d9e15caba2c866f Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@××××××.com>
-Date: Thu, 28 Apr 2011 09:40:52 -0400
-Subject: [PATCH 2/3] Fix untranslated UI elements, bug #648840
-
----
- src/yelp.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/yelp.c b/src/yelp.c
-index e5726aa..5c37b2a 100644
---- a/src/yelp.c
-+++ b/src/yelp.c
-@@ -38,6 +38,11 @@ main (int argc, char **argv)
-     g_thread_init (NULL);
-     g_type_init ();
- 
-+    setlocale (LC_ALL, "");
-+    textdomain (GETTEXT_PACKAGE);
-+    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+
-     app = yelp_application_new ();
- 
-     return g_application_run (G_APPLICATION (app), argc, argv);
--- 
-1.7.5.rc3
-

diff --git a/gnome-extra/yelp/files/0003-Fix-build-breakage-caused-by-the-fix-to-https-bugzil.patch b/gnome-extra/yelp/files/0003-Fix-build-breakage-caused-by-the-fix-to-https-bugzil.patch
deleted file mode 100644
index d65b74a..0000000
--- a/gnome-extra/yelp/files/0003-Fix-build-breakage-caused-by-the-fix-to-https-bugzil.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5ba4aefb6d0c8b292d59833963070383cb539168 Mon Sep 17 00:00:00 2001
-From: Gabor Kelemen <kelemeng@×××××.hu>
-Date: Fri, 29 Apr 2011 10:10:35 +0200
-Subject: [PATCH 3/3] Fix build breakage caused by the fix to
- https://bugzilla.gnome.org/show_bug.cgi?id=648840
-
----
- src/yelp.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/yelp.c b/src/yelp.c
-index 5c37b2a..6cf425b 100644
---- a/src/yelp.c
-+++ b/src/yelp.c
-@@ -24,6 +24,8 @@
- #include <config.h>
- #endif
- 
-+#include <locale.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
--- 
-1.7.5.rc3
-

diff --git a/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
new file mode 100644
index 0000000..b57591c
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch
@@ -0,0 +1,117 @@
+From 7e181e8d74f7e67b8b3acb8524fc85157ed39c8e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@×××××.com>
+Date: Sun, 1 May 2011 22:52:14 -0400
+Subject: [PATCH] Enable compatibility with traditional man (#648854)
+
+As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs
+"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format
+of the man page. However, the only implementation of man that accepts
+these options is man-db (used by Debian, Fedora, SUSE & Ubuntu).
+The traditional Linux man used by other distros and man implementations
+on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options
+for outputting groff intermediate format.
+Therefore, on systems that do not use man-db, we need to manually
+uncompress the nroff source file and feed it to groff. This is best done
+using a small shell script (/usr/libexec/yelp-groff), both for for
+clarity and for ease of modification on systems with weird man setups.
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@×××××.com>
+---
+ libyelp/Makefile.am       |    2 +
+ libyelp/yelp-groff        |   49 +++++++++++++++++++++++++++++++++++++++++++++
+ libyelp/yelp-man-parser.c |    4 +-
+ 3 files changed, 53 insertions(+), 2 deletions(-)
+ create mode 100755 libyelp/yelp-groff
+
+diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
+index a4dd68b..5d55bf1 100644
+--- a/libyelp/Makefile.am
++++ b/libyelp/Makefile.am
+@@ -1,4 +1,5 @@
+ lib_LTLIBRARIES = libyelp.la
++libexec_SCRIPTS = yelp-groff
+ 
+ libyelp_la_SOURCES =                \
+ 	yelp-bookmarks.c            \
+@@ -49,6 +50,7 @@ endif
+ libyelp_la_CFLAGS =                             \
+ 	$(YELP_CFLAGS)                          \
+ 	-DDATADIR=\""$(datadir)"\"              \
++	-DLIBEXECDIR=\"$(libexecdir)\"           \
+ 	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
+ 
+ libyelp_la_LIBADD = $(YELP_LIBS)
+diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff
+new file mode 100755
+index 0000000..5348024
+--- /dev/null
++++ b/libyelp/yelp-groff
+@@ -0,0 +1,49 @@
++#!/bin/sh
++#
++# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@×××××.com>
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of the
++# License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public
++# License along with this program; if not, write to the
++# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
++#
++###
++#
++# Process the requested compressed source nroff file and output groff
++# intermediate format.
++#
++
++filename=$1
++
++if [ -z ${filename} ] ; then
++    echo "Usage: yelp-groff [FILE]" >&2
++    echo "Process a man FILE and output groff intermediate format."
++    exit 1
++fi
++
++# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
++man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
++
++# Otherwise, manually uncompress the file ...
++cat="cat"
++case ${filename} in
++    *.bz2)      cat="bzip2 -c -d" ;;
++    *.gz)       cat="gunzip -c" ;;
++    *.lzma)     cat="unlzma -c -d" ;;
++    *.xz)       cat="unxz -c" ;;
++    *.Z)        cat="zcat" ;;
++esac
++
++# ... and run groff to get the intermediate format; preprocess with tbl
++# unless MANROFFSEQ is defined.
++${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
+diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
+index 4001d38..9818803 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -371,9 +371,9 @@ get_troff (gchar *path, GError **error)
+ {
+     gint stdout;
+     GError *err = NULL;
+-    gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", NULL, NULL };
++    gchar *argv[] = { LIBEXECDIR "/yelp-groff", NULL, NULL };
+ 
+-    argv[4] = path;
++    argv[1] = path;
+ 
+     if (!g_spawn_async_with_pipes (NULL, argv, NULL,
+                                    G_SPAWN_SEARCH_PATH, NULL, NULL,
+-- 
+1.7.5.rc3
+

diff --git a/gnome-extra/yelp/yelp-3.0.2.ebuild b/gnome-extra/yelp/yelp-3.0.3.ebuild
similarity index 87%
rename from gnome-extra/yelp/yelp-3.0.2.ebuild
rename to gnome-extra/yelp/yelp-3.0.3.ebuild
index 96cd8bf..4503d28 100644
--- a/gnome-extra/yelp/yelp-3.0.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.0.3.ebuild
@@ -47,6 +47,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix various issues fixed upstream since 3.0.2 release
-	epatch "${FILESDIR}"/*.patch
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	epatch "${FILESDIR}/${PN}-3.0.3-man-compatibility.patch"
 }