diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /gnome-extra/yelp | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'gnome-extra/yelp')
-rw-r--r-- | gnome-extra/yelp/Manifest | 4 | ||||
-rw-r--r-- | gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch | 117 | ||||
-rw-r--r-- | gnome-extra/yelp/metadata.xml | 8 | ||||
-rw-r--r-- | gnome-extra/yelp/yelp-3.22.0.ebuild | 57 |
4 files changed, 186 insertions, 0 deletions
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest new file mode 100644 index 000000000000..22fc52ff438b --- /dev/null +++ b/gnome-extra/yelp/Manifest @@ -0,0 +1,4 @@ +AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d +DIST yelp-3.22.0.tar.xz 1383500 BLAKE2B f3422c0e8370f42ce73a27d0336d6def61e8d43d9736946e65e579548cbcf9b52afacbdcaf0e8b8733dfe1dc0d0efd53ff6d73377c4e5bbaf2106b8cc42b10a7 SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32 +EBUILD yelp-3.22.0.ebuild 1192 BLAKE2B 84234d94a25ce188f6377cc5dec1c130fbb2bb9f2cfa3878f4ae058341554892c586505b45e21ebfc57ab6f69bf0dc601f5c0b63865f0e7adafbb2535c67c6e2 SHA512 4e05de732fd5beaab9c997caddd7abfe68af62b74a2bfade825bc28e39f7c67b35bbac4e169ce38a3d771bcd87fc8c5d91c609b80da3318da9bc600da906a47f +MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 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 000000000000..b756b67462bc --- /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 + diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-extra/yelp/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/gnome-extra/yelp/yelp-3.22.0.ebuild b/gnome-extra/yelp/yelp-3.22.0.ebuild new file mode 100644 index 000000000000..1a32c72c41fa --- /dev/null +++ b/gnome-extra/yelp/yelp-3.22.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools gnome2 + +DESCRIPTION="Help browser for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Yelp" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~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/adwaita-icon-theme +" +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 + eapply "${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 +} |