* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2011-02-22 0:48 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-02-22 0:48 UTC (permalink / raw
To: gentoo-commits
commit: df073c94fd6be3ffefaa2965d93eb1fe1bdc12f5
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 00:48:22 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 00:48:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=df073c94
gnome-extra/yelp: fix typo in calling schema
---
.../yelp/files/yelp-2.91.90-fix-schema-typo.patch | 12 ++++++++++++
...{yelp-2.91.90.ebuild => yelp-2.91.90-r1.ebuild} | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch b/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch
new file mode 100644
index 0000000..96dfe8e
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.91.90-fix-schema-typo.patch
@@ -0,0 +1,12 @@
+diff -Naur yelp-2.91.90/src/yelp-application.c yelp-2.91.90.new/src/yelp-application.c
+--- yelp-2.91.90/src/yelp-application.c 2011-02-22 02:37:18.000000000 +0530
++++ yelp-2.91.90.new/src/yelp-application.c 2011-02-22 06:15:33.135000075 +0530
+@@ -582,7 +582,7 @@
+ priv->backend,
+ settings_path);
+ else
+- settings = g_settings_new_with_path ("org.gnome.yelp.document",
++ settings = g_settings_new_with_path ("org.gnome.yelp.documents",
+ settings_path);
+ key = g_strdup (doc_uri);
+ g_hash_table_insert (priv->docsettings, key, settings);
diff --git a/gnome-extra/yelp/yelp-2.91.90.ebuild b/gnome-extra/yelp/yelp-2.91.90-r1.ebuild
similarity index 92%
rename from gnome-extra/yelp/yelp-2.91.90.ebuild
rename to gnome-extra/yelp/yelp-2.91.90-r1.ebuild
index 1496ff9..76e9cc6 100644
--- a/gnome-extra/yelp/yelp-2.91.90.ebuild
+++ b/gnome-extra/yelp/yelp-2.91.90-r1.ebuild
@@ -5,7 +5,7 @@
EAPI="2"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="Help browser for GNOME"
HOMEPAGE="http://www.gnome.org/"
@@ -36,9 +36,11 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
-pkg_setup() {
+src_prepare() {
G2CONF="${G2CONF}
--disable-schemas-compile
--enable-bz2
$(use_enable lzma)"
+
+ epatch "${FILESDIR}/${P}-fix-schema-typo.patch"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2011-05-08 19:08 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 32382e457246746e4b41134746be0247559622f0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 19:08:33 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 19:08:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32382e45
gnome-extra/yelp: fix build and translation issues
---
| 25 +++++++++++++++++
...2-Fix-untranslated-UI-elements-bug-648840.patch | 28 ++++++++++++++++++++
...reakage-caused-by-the-fix-to-https-bugzil.patch | 26 ++++++++++++++++++
| 9 +++++-
4 files changed, 87 insertions(+), 1 deletions(-)
--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
new file mode 100644
index 0000000..798faa9
--- /dev/null
+++ b/gnome-extra/yelp/files/0001-yelp-application-Remove-C-style-comment-bug-648771.patch
@@ -0,0 +1,25 @@
+From a1e49faa0b4873c3f3c5b949ebe96186dc2e2813 Mon Sep 17 00:00:00 2001
+From: Shaun McCance <shaunm@gnome.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
new file mode 100644
index 0000000..099c582
--- /dev/null
+++ b/gnome-extra/yelp/files/0002-Fix-untranslated-UI-elements-bug-648840.patch
@@ -0,0 +1,28 @@
+From b2d172d904c1cbd67ac227241d9e15caba2c866f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.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
new file mode 100644
index 0000000..d65b74a
--- /dev/null
+++ b/gnome-extra/yelp/files/0003-Fix-build-breakage-caused-by-the-fix-to-https-bugzil.patch
@@ -0,0 +1,26 @@
+From 5ba4aefb6d0c8b292d59833963070383cb539168 Mon Sep 17 00:00:00 2001
+From: Gabor Kelemen <kelemeng@gnome.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
+
--git a/gnome-extra/yelp/yelp-3.0.2.ebuild b/gnome-extra/yelp/yelp-3.0.2.ebuild
index 5b0c55d..96cd8bf 100644
--- a/gnome-extra/yelp/yelp-3.0.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="Help browser for GNOME"
HOMEPAGE="http://www.gnome.org/"
@@ -43,3 +43,10 @@ pkg_setup() {
--enable-bz2
--enable-lzma"
}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Fix various issues fixed upstream since 3.0.2 release
+ epatch "${FILESDIR}"/*.patch
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2011-05-30 18:39 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-05-30 18:39 UTC (permalink / raw
To: gentoo-commits
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>
---
| 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@gnome.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@redhat.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@gnome.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@gmail.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@gmail.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@gmail.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"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 8f5dac3e1f73d58a02200ccfac1b8c726f94eae3
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 06:56:52 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 07:00:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8f5dac3e
gnome-extra/yelp: 3.2.0 → 3.2.1
Patch was applied upstream.
---
.../yelp/files/yelp-3.2.0-format-string.patch | 21 --------------------
.../yelp/{yelp-3.2.0.ebuild => yelp-3.2.1.ebuild} | 3 --
2 files changed, 0 insertions(+), 24 deletions(-)
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
deleted file mode 100644
index fcdd4af..0000000
--- a/gnome-extra/yelp/files/yelp-3.2.0-format-string.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d9d6f06bcd90ccab5a7f10cc3f505afb2994e2dd Mon Sep 17 00:00:00 2001
-From: Dexter Morgan <dmorganec@gmail.com>
-Date: Mon, 26 Sep 2011 22:27:38 +0000
-Subject: fix format string
-
----
-diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
-index 3c75642..25b0f0c 100644
---- a/libyelp/yelp-man-parser.c
-+++ b/libyelp/yelp-man-parser.c
-@@ -380,7 +380,7 @@ get_troff (gchar *path, GError **error)
- NULL, NULL, &ystdout, NULL, &err)) {
- /* We failed to run the man program. Return a "Huh?" error. */
- *error = g_error_new (YELP_ERROR, YELP_ERROR_UNKNOWN,
-- err->message);
-+ "%s", err->message);
- g_error_free (err);
- return NULL;
- }
---
-cgit v0.9.0.2
diff --git a/gnome-extra/yelp/yelp-3.2.0.ebuild b/gnome-extra/yelp/yelp-3.2.1.ebuild
similarity index 92%
rename from gnome-extra/yelp/yelp-3.2.0.ebuild
rename to gnome-extra/yelp/yelp-3.2.1.ebuild
index a2ca6c8..2b5bee6 100644
--- a/gnome-extra/yelp/yelp-3.2.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.2.1.ebuild
@@ -49,9 +49,6 @@ pkg_setup() {
}
src_prepare() {
- # Upstream patch to fix g_error_new usage, will be in next release
- epatch "${FILESDIR}/${P}-format-string.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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2015-05-09 15:18 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-09 15:18 UTC (permalink / raw
To: gentoo-commits
commit: dd1811b0f4183e8bea3c441bd864c26830b7a3d2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 14:00:18 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 9 15:18:07 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dd1811b0
gnome-extra/yelp: 3.14.1 → 3.16.0
.../yelp/files/yelp-3.16.0-man-compatibility.patch | 114 +++++++++++++++++++++
.../yelp/{yelp-9999.ebuild => yelp-3.16.0.ebuild} | 33 ++----
| 10 +-
3 files changed, 124 insertions(+), 33 deletions(-)
diff --git a/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch
new file mode 100644
index 0000000..9df6ef4
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch
@@ -0,0 +1,114 @@
+From fb83e8cea7e9e521599e73180ecff8f1374edb8d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.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@gmail.com>
+---
+ libyelp/Makefile.am | 2 ++
+ libyelp/yelp-groff | 49 +++++++++++++++++++++++++++++++++++++++++++++++
+ libyelp/yelp-man-parser.c | 2 +-
+ 3 files changed, 52 insertions(+), 1 deletion(-)
+ create mode 100755 libyelp/yelp-groff
+
+diff --git a/libyelp/Makefile.am b/libyelp/Makefile.am
+index 0ae9d60..0037ecd 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 \
+@@ -51,6 +52,7 @@ libyelp_la_CFLAGS = \
+ $(YELP_CFLAGS) \
+ -Wno-deprecated-declarations \
+ -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@gmail.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 46073a2..792e695 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
+ {
+ gint ystdout;
+ GError *err = NULL;
+- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
++ const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
+ gchar **my_argv;
+
+ /* g_strdupv() should accept a "const gchar **". */
+--
+2.3.6
+
diff --git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-3.16.0.ebuild
similarity index 57%
copy from gnome-extra/yelp/yelp-9999.ebuild
copy to gnome-extra/yelp/yelp-3.16.0.ebuild
index 67354f8..5d66e37 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-3.16.0.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Help browser for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
@@ -16,11 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
app-arch/bzip2:=
@@ -39,34 +32,20 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.41.0
>=sys-devel/gettext-0.17
virtual/pkgconfig
- gnome-base/gnome-common
"
-# If eautoreconf:
-# gnome-base/gnome-common
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools
- dev-util/itstool
- gnome-base/gnome-common"
-fi
src_prepare() {
# 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"
-
- [[ ${PV} != 9999 ]] && eautoreconf
-
+ epatch "${FILESDIR}"/${PN}-3.16.0-man-compatibility.patch
+ eautoreconf
gnome2_src_prepare
}
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
gnome2_src_configure \
--disable-static \
--enable-bz2 \
--enable-lzma \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
--git a/gnome-extra/yelp/yelp-9999.ebuild b/gnome-extra/yelp/yelp-9999.ebuild
index 67354f8..2d7f3a8 100644
--- a/gnome-extra/yelp/yelp-9999.ebuild
+++ b/gnome-extra/yelp/yelp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
@@ -39,7 +39,6 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.41.0
>=sys-devel/gettext-0.17
virtual/pkgconfig
- gnome-base/gnome-common
"
# If eautoreconf:
# gnome-base/gnome-common
@@ -47,14 +46,13 @@ DEPEND="${RDEPEND}
if [[ ${PV} = 9999 ]]; then
DEPEND="${DEPEND}
app-text/yelp-tools
- dev-util/itstool
- gnome-base/gnome-common"
+ dev-util/itstool"
fi
src_prepare() {
# 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"
+ epatch "${FILESDIR}"/${PN}-3.16.0-man-compatibility.patch
[[ ${PV} != 9999 ]] && eautoreconf
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/
@ 2016-03-27 21:24 Ole Reifschneider
0 siblings, 0 replies; 6+ messages in thread
From: Ole Reifschneider @ 2016-03-27 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 5a1ca17b922368498440bb9346726a75ae89f4f0
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 23:49:23 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 21:05:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5a1ca17b
gnome-extra/yelp: Bump version to 3.20.0
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../yelp/files/yelp-3.20.0-man-compatibility.patch | 117 +++++++++++++++++++++
| 58 ++++++++++
2 files changed, 175 insertions(+)
diff --git a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
new file mode 100644
index 0000000..b756b67
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
@@ -0,0 +1,117 @@
+From b7f00d9fc5f4c948b3b412fa22488517e71a2987 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sun, 27 Mar 2016 17:11:59 +0200
+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@gmail.com>
+Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
+---
+ Makefile.am | 2 ++
+ libyelp/yelp-groff | 49 +++++++++++++++++++++++++++++++++++++++++++++++
+ libyelp/yelp-man-parser.c | 2 +-
+ 3 files changed, 52 insertions(+), 1 deletion(-)
+ create mode 100755 libyelp/yelp-groff
+
+diff --git a/Makefile.am b/Makefile.am
+index 30eba2c..b87f2b2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,6 +6,7 @@ BUILT_SOURCES = \
+ $(nodist_libyelp_libyelp_la_SOURCES)
+
+ lib_LTLIBRARIES = libyelp/libyelp.la
++libexec_SCRIPTS = libyelp/yelp-groff
+
+ libyelp_libyelp_la_SOURCES = \
+ libyelp/yelp-bookmarks.c \
+@@ -58,6 +59,7 @@ libyelp_libyelp_la_CFLAGS = \
+
+ libyelp_libyelp_la_CPPFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
++ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" \
+ -DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\" \
+ -I$(top_builddir)/libyelp
+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@gmail.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 46073a2..792e695 100644
+--- a/libyelp/yelp-man-parser.c
++++ b/libyelp/yelp-man-parser.c
+@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
+ {
+ gint ystdout;
+ GError *err = NULL;
+- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
++ const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
+ gchar **my_argv;
+
+ /* g_strdupv() should accept a "const gchar **". */
+--
+2.7.4
+
--git a/gnome-extra/yelp/yelp-3.20.0.ebuild b/gnome-extra/yelp/yelp-3.20.0.ebuild
new file mode 100644
index 0000000..67d18c9
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.20.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ app-arch/bzip2:=
+ >=app-arch/xz-utils-4.9:=
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libxml2-2.6.5:2
+ >=dev-libs/libxslt-1.1.4
+ >=gnome-extra/yelp-xsl-3.12
+ >=net-libs/webkit-gtk-2.7.2:4
+ >=x11-libs/gtk+-3.13.3:3
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.41.0
+ dev-util/itstool
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Fix compatibility with Gentoo's sys-apps/man
+ # https://bugzilla.gnome.org/show_bug.cgi?id=648854
+ epatch "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-bz2 \
+ --enable-lzma
+}
+
+src_install() {
+ gnome2_src_install
+ exeinto /usr/libexec/
+ doexe "${S}"/libyelp/yelp-groff
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-27 21:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-27 21:24 [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp/, gnome-extra/yelp/files/ Ole Reifschneider
-- strict thread matches above, loose matches on Subject: below --
2015-05-09 15:18 Gilles Dartiguelongue
2011-10-18 7:37 Alexandre Restovtsev
2011-05-30 18:39 Nirbheek Chauhan
2011-05-08 19:08 Gilles Dartiguelongue
2011-02-22 0:48 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox