From 5e736824157fbecb791919f3306e23a1721496cc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 29 Mar 2010 05:48:25 +0000 Subject: [PATCH] Add fix from upstream for building with non-GNU nroff #309635 by Pun. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/man-db/ChangeLog | 6 +- sys-apps/man-db/Manifest | 11 ++- .../files/man-db-2.5.7-non-gnu-nroff.patch | 97 +++++++++++++++++++ sys-apps/man-db/man-db-2.5.7.ebuild | 6 +- 4 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 sys-apps/man-db/files/man-db-2.5.7-non-gnu-nroff.patch diff --git a/sys-apps/man-db/ChangeLog b/sys-apps/man-db/ChangeLog index 6cde51a01bdc..534b18f9287c 100644 --- a/sys-apps/man-db/ChangeLog +++ b/sys-apps/man-db/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/man-db # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.11 2010/03/07 05:01:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/ChangeLog,v 1.12 2010/03/29 05:48:25 vapier Exp $ + + 29 Mar 2010; Mike Frysinger man-db-2.5.7.ebuild, + +files/man-db-2.5.7-non-gnu-nroff.patch: + Add fix from upstream for building with non-GNU nroff #309635 by Pun. *man-db-2.5.7 (07 Mar 2010) diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 6a3d2eebacab..c5a232097380 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -2,16 +2,17 @@ Hash: SHA256 AUX man-db-2.5.6-fix-no-groff.patch 3820 RMD160 1d7ec461d4dec75da532d6050f75aefefa85d87f SHA1 4a43e76227d685ceda9e986739dd757d07b46b1a SHA256 dbf4a3b94266128807036540b482fb2425c9bf1f02daef3ddc9042bd854cdca3 +AUX man-db-2.5.7-non-gnu-nroff.patch 2556 RMD160 b9f3c730a96698f9084853530e84930c70c74a16 SHA1 44c4860ee5c61041bb1a8a4077918d87c7fac3b8 SHA256 0a68657921910721e3de8ca72c6bcfd5c5b110d179c1619584c12ce218027b43 DIST man-db-2.5.6.tar.gz 2094209 RMD160 fe1cb5ea2aa8bded99ad16591873a1043cd68125 SHA1 e8799313afb31976f9c7a4e34bc4498293a6fef8 SHA256 14e3daf8727f98035cb250d6e4caaf720225c14996377aa7bf8f00248b7f5633 DIST man-db-2.5.7.tar.gz 2173870 RMD160 cb16d1395dbabc16e4b835cb2abc481695dcca55 SHA1 dd5f7f2f2fa93bcf4221cda189b94a8acdce346c SHA256 e41d4831860c9de85ad21928a542e8f8f1735bcf277f2bc455366397eaa7463e EBUILD man-db-2.5.6.ebuild 1313 RMD160 11363d704f876097bbd7aa166bdd9f8eef1e0d92 SHA1 34496744eb675c4929b92df41ac7d03195a3556c SHA256 8bc00f800655a4c80a57936d435dca60722e60246e2698523b2b490bf6103831 -EBUILD man-db-2.5.7.ebuild 1216 RMD160 2c790129c06e510f685ab2429e53271e234fb781 SHA1 ebda3f1efe469ae69ef0a90915bc978ca3b9c389 SHA256 fa51b99ea5e13313533830a7210c0e0142bbc81ab194cefc75f4652ca7417ea4 -MISC ChangeLog 1889 RMD160 8247fb422e49842751e28af05c62255a81cdb8d0 SHA1 4347582626b48d6f1176df56113cc10c1e1e04b2 SHA256 d907e2d8b42b1aee842cb47bd449eb2d3fb546b24136363fc11cd5dab088a98d +EBUILD man-db-2.5.7.ebuild 1290 RMD160 4d8eed698056b65ea9d50f1f79fff5dfc3627278 SHA1 874f45353cdc89c4adcb174c417758318d963aa6 SHA256 4988c305322486b6302c1cbcbae278b064bf84bd0130b2a92f273c0ea7226f26 +MISC ChangeLog 2076 RMD160 224c8fe3a0442d3458d1cde01f63c08986e68745 SHA1 16ed00b296d15c5750a8b08fdbd845e6e26e16f7 SHA256 e1ff57046cdd059591f1da7e837cb05310854e864cdc4b61ec0671e3f7946d16 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAkuTMz0ACgkQTwhj9JtAlp4PmwD/SwRY/0yDL1UC/AlfUw4E7Gs4 -qnmFfZxyxMr9CGOL7o4A/jTidoXBSXDNOcnsfb0AxrCG8Wzktj4+0rGyGJW33OvP -=/9gh +iF4EAREIAAYFAkuwPycACgkQTwhj9JtAlp5hnAEAuiEIb0MsQfAjDdKkh+7qOm+k +1v9t2tqA1OWcULmngkQA/157IRyNGH3W+plVY/TYNmoAfSKjlMR2O9MPmZZym4O4 +=ev51 -----END PGP SIGNATURE----- diff --git a/sys-apps/man-db/files/man-db-2.5.7-non-gnu-nroff.patch b/sys-apps/man-db/files/man-db-2.5.7-non-gnu-nroff.patch new file mode 100644 index 000000000000..4e93c44363f4 --- /dev/null +++ b/sys-apps/man-db/files/man-db-2.5.7-non-gnu-nroff.patch @@ -0,0 +1,97 @@ +fix from upstream for building w/out GNU nroff + +http://bugs.gentoo.org/309635 + +Wed Mar 24 11:04:46 GMT 2010 Colin Watson + + Fix build regression when GNU_NROFF is undefined (Savannah bug + #29318). + + * src/man.c (add_col): New function, split out from + make_display_command. + (make_roff_command): Reinstate tbl/col logic here, as by the time + we get to make_display_command we've forgotten whether tbl was + used. + (make_display_command): Remove tbl/col logic, useless here. Use + add_col. + +=== modified file 'src/man.c' +--- src/man.c 2010-03-21 22:05:16 +0000 ++++ src/man.c 2010-03-24 11:07:23 +0000 +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -1406,6 +1407,26 @@ + return get_locale_charset (); + } + ++static void add_col (pipeline *p, const char *locale_charset, ...) ++{ ++ command *cmd; ++ va_list argv; ++ char *col_locale; ++ ++ cmd = command_new (COL); ++ va_start (argv, locale_charset); ++ command_argv (cmd, argv); ++ va_end (argv); ++ ++ col_locale = find_charset_locale (locale_charset); ++ if (col_locale) { ++ command_setenv (cmd, "LC_CTYPE", col_locale); ++ free (col_locale); ++ } ++ ++ pipeline_command (p, cmd); ++} ++ + /* Return pipeline to format file to stdout. */ + static pipeline *make_roff_command (const char *dir, const char *file, + pipeline *decomp, const char *dbfilters, +@@ -1699,6 +1720,11 @@ + !isatty (STDOUT_FILENO)) + /* we'll run col later, but prepare for it */ + setenv ("GROFF_NO_SGR", "1", 1); ++#ifndef GNU_NROFF ++ /* tbl needs col */ ++ else if (using_tbl && !troff && *COL) ++ add_col (p, locale_charset, NULL); ++#endif /* GNU_NROFF */ + } + } else { + /* use external formatter script, it takes arguments +@@ -1851,27 +1877,9 @@ + */ + const char *man_keep_formatting = + getenv ("MAN_KEEP_FORMATTING"); +- command *colcmd = NULL; + if ((!man_keep_formatting || !*man_keep_formatting) && + !isatty (STDOUT_FILENO)) +- colcmd = command_new_args ( +- COL, "-b", "-p", "-x", NULL); +-#ifndef GNU_NROFF +- /* tbl needs col */ +- else if (using_tbl && !troff && *COL) +- colcmd = command_new (COL); +-#endif /* GNU_NROFF */ +- +- if (colcmd) { +- char *col_locale = +- find_charset_locale (locale_charset); +- if (col_locale) { +- command_setenv (colcmd, "LC_CTYPE", +- col_locale); +- free (col_locale); +- } +- pipeline_command (p, colcmd); +- } ++ add_col (p, locale_charset, "-b", "-p", "-x", NULL); + } + + if (ascii) { + diff --git a/sys-apps/man-db/man-db-2.5.7.ebuild b/sys-apps/man-db/man-db-2.5.7.ebuild index f493aadff147..dcd1f6f9b57c 100644 --- a/sys-apps/man-db/man-db-2.5.7.ebuild +++ b/sys-apps/man-db/man-db-2.5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.5.7.ebuild,v 1.1 2010/03/07 05:01:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-db/man-db-2.5.7.ebuild,v 1.2 2010/03/29 05:48:25 vapier Exp $ EAPI="2" @@ -29,6 +29,10 @@ pkg_setup() { enewuser man 13 -1 /usr/share/man man } +src_prepare() { + epatch "${FILESDIR}"/${P}-non-gnu-nroff.patch #309635 +} + src_configure() { local db="gdbm" use berkdb && ! use gdbm && db="db" -- 2.26.2