From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JzELz-0007fl-Ap for garchives@archives.gentoo.org; Thu, 22 May 2008 17:13:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8502E0429; Thu, 22 May 2008 17:13:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 81D01E0429 for ; Thu, 22 May 2008 17:13:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 3EF5D6636B for ; Thu, 22 May 2008 17:13:18 +0000 (UTC) Received: from pva by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JzELt-000200-9p for gentoo-commits@lists.gentoo.org; Thu, 22 May 2008 17:13:17 +0000 From: "Peter Volkov (pva)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pva@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-text/docbook2X/files: docbook2X-0.8.8-preprocessor_declaration_syntax.patch docbook2X-0.8.8-error_on_missing_refentry.patch docbook2X-0.8.8-filename_whitespace_handling.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: docbook2X-0.8.8-preprocessor_declaration_syntax.patch docbook2X-0.8.8-error_on_missing_refentry.patch docbook2X-0.8.8-filename_whitespace_handling.patch X-VCS-Directories: app-text/docbook2X/files X-VCS-Committer: pva X-VCS-Committer-Name: Peter Volkov Content-Type: text/plain; charset=utf8 Message-Id: Sender: Peter Volkov Date: Thu, 22 May 2008 17:13:17 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3be44a40-53db-4391-a7e7-ce992096c230 X-Archives-Hash: 886386fd70ad97b4147d9ee5cf6312fb pva 08/05/22 17:13:17 Added: =20 docbook2X-0.8.8-preprocessor_declaration_syntax.p= atch docbook2X-0.8.8-error_on_missing_refentry.patch docbook2X-0.8.8-filename_whitespace_handling.patc= h Log: Some patches from debian (read patches for description). Updated deps: = 1. they required at build time too, 2. fixed bug #223071, thank Mike Weis= sman for report and hint to fix. (Portage version: 2.1.4.4) Revision Changes Path 1.1 app-text/docbook2X/files/docbook2X-0.8.8-preprocesso= r_declaration_syntax.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch?rev=3D1.1&vi= ew=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch?rev=3D1.1&co= ntent-type=3Dtext/plain Index: docbook2X-0.8.8-preprocessor_declaration_syntax.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D #! /bin/sh /usr/share/dpatch/dpatch-run ## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <= cjwatson@debian.org>. ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Conventionally, preprocessor declarations should start with ## DP: '\" ## DP: rather than ## DP: .\" ## DP: Current man-db only supports the first (and recommended) syntax.= So ## DP: Colin Watson provided this patch to fix docbook2x. ## DP: ## DP: ## DP: @DPATCH@ diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl --- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200 +++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100 @@ -342,6 +342,25 @@ $self->{line_start} =3D 1; } =20 +# +# Print a comment in the output, without causing a break. +# Params: comment - the comment text. =20 +# May use any characters; they need not be escaped. +# +sub comment_nobreak +{ + my ($self, $comment) =3D @_; + $self->write("\n") unless $self->{line_start}; + + foreach my $line (split(/\n/, $comment)) { + $self->write('\'\" '); + $self->write($line); + $self->write("\n"); + } + + $self->{line_start} =3D 1; +} + =20 # # Use a roff "escape" i.e. commands embedded in text starting with \ @@ -510,16 +529,20 @@ =20 $self->{'adjust-stack'} =3D [ 'b' ]; =20 - $self->{rw}->comment($elem->attr('preprocessors')) - if($elem->attr('preprocessors') ne ''); - + my $preprocessors =3D $elem->attr('preprocessors'); # I've dug through the Internet to see if there was any # standard way to specify encoding with man pages. # The following seems to be a reasonable proposal: # my $encoding =3D $self->{options}->{'encoding'}; $encoding =3D~ s#//TRANSLIT$##i; - $self->{rw}->comment("-*- coding: $encoding -*-"); + $encoding =3D "-*- coding: $encoding -*-"; + if ($preprocessors eq '') { + $preprocessors =3D $encoding; + } else { + $preprocessors =3D "$preprocessors $encoding"; + } + $self->{rw}->comment_nobreak($preprocessors); =20 # Define escapes for switching to and from monospace fonts (groff on= ly) $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC}); diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_m= anxml.xsl --- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +02= 00 +++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +010= 0 @@ -528,7 +528,7 @@ - .\" -*- coding: + '\" -*- coding: -*- @@ -538,7 +538,7 @@ - .\" -*- coding: + '\" -*- coding: -*- 1.1 app-text/docbook2X/files/docbook2X-0.8.8-error_on_mi= ssing_refentry.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-error_on_missing_refentry.patch?rev=3D1.1&view=3Dm= arkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-error_on_missing_refentry.patch?rev=3D1.1&content-= type=3Dtext/plain Index: docbook2X-0.8.8-error_on_missing_refentry.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D #! /bin/sh /usr/share/dpatch/dpatch-run ## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: If there is no refentry element, the manpage stylesheets silently ## DP: "ignores" this. It has been requested to print at least a ## DP: warning. ## DP: ## DP: ## DP: @DPATCH@ diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl --- trunk~/xslt/man/docbook.xsl 2006-04-11 21:00:19.000000000 +0200 +++ trunk/xslt/man/docbook.xsl 2008-02-05 03:31:48.000000000 +0100 @@ -111,11 +111,15 @@ - - + + + + + WARNING: Sorry, but I cannot find a refentry element i= n your source! + 1.1 app-text/docbook2X/files/docbook2X-0.8.8-filename_wh= itespace_handling.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-filename_whitespace_handling.patch?rev=3D1.1&view=3D= markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/docbook2X= /files/docbook2X-0.8.8-filename_whitespace_handling.patch?rev=3D1.1&conte= nt-type=3Dtext/plain Index: docbook2X-0.8.8-filename_whitespace_handling.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D #! /bin/sh /usr/share/dpatch/dpatch-run ## 03_fix_420153_filename_whitespace_handling.dpatch by ## Daniel Leidert (dale) ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Peter Eisentraut reported a regression in the whitespace handling = of ## DP: refentrytitle content during filename creation: ## DP: http://bugs.debian.org/420153. The problem is, that upstream first ## DP: replaces all spaces (but not linebreaks btw) with underlines and t= hen ## DP: it tries to normalize the result. This means, that a linebreak wit= h ## DP: additional whitespaces results in manpage names like 'foo_ ____bar= .9'. ## DP: So what we basically do in this patch is, that we first normalize = the ## DP: refentrytitle and then replace any spaces left with underlines. @DPATCH@ diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/ma= n/manpage.xsl --- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 += 0200 +++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0= 200 @@ -30,7 +30,7 @@ =20 - + =20 =20 diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/m= an/refentry.xsl --- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 = +0200 +++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 += 0200 @@ -38,7 +38,11 @@ =20 - + + + + + =20