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 +++++++++++++++++++++ gnome-extra/yelp/yelp-3.20.0.ebuild | 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 <tetrom...@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 <tetrom...@gmail.com> +Signed-off-by: Ole Reifschneider <tranquil...@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 <tetrom...@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 + diff --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 +}