Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd52416df910c2494f5e9e5f80df9d000ee6bb41
commit fd52416df910c2494f5e9e5f80df9d000ee6bb41 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sat May 3 23:37:42 2008 +0200 asciidoc-8.2.6-2-i686 - fixed up for fop-0.9x diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index 1f1b26f..a8a740d 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -3,21 +3,20 @@ pkgname=asciidoc pkgver=8.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html"; depends=() rodepends=('python>=2.3' 'libxslt') -makedepends=('imagemagick' 'libpng' 'libjpeg' 'fontconfig') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ - a2x-pdf.diff) + fop-0.9x.diff) sha1sums=('cce98ed670c462a3a007b03b6f92d2108c5bc405' \ '717779406f876f439ac37c79878f403ecdef3467' \ - 'c235be9105a5cec42d1c19e416b8dc177127017f') + 'c79b780f8b5aec17184a8339fe8d05bf16c1014c') build() { Fpatchall @@ -28,15 +27,6 @@ build() { Fsed 'VIM_CONFDIR=/etc/vim' "VIM_CONFDIR=$Fdestdir/$Fprefix/share/vim" install.sh # enable offline build Fsed 'http://www.oasis-open.org/docbook/xml/' 'file:///usr/share/sgml/docbook/dtd/xml-dtd-' docbook.conf - # prefer dejavu in fo, the default font does not support most accents - Fsed 'serif' 'DejaVuSerif' docbook-xsl/fo.xsl - sh install.sh - # provive the images in jpg format, too. this is necessary as fop can't - # use png images without license problems for pdfs - for i in `find $Fdestdir/etc -name '*.png'` - do - convert $i ${i%%.png}.jpg || return 1 - done # install the mathml fonts Fmkdir /usr/lib/X11/fonts/TTF Ffile asciidoc-fonts-0.1/*.ttf /usr/lib/X11/fonts/TTF diff --git a/source/apps-extra/asciidoc/a2x-pdf.diff b/source/apps-extra/asciidoc/a2x-pdf.diff deleted file mode 100644 index cbf745a..0000000 --- a/source/apps-extra/asciidoc/a2x-pdf.diff +++ /dev/null @@ -1,21 +0,0 @@ -Added 3 small hacks: -* Fix the path of the icon images -* Remove bgcolor, border-right-color and border-bottom-color attributes, they - are not handled by fop -* Handle dejavu fonts -diff -Naur asciidoc-8.2.3.orig/a2x asciidoc-8.2.3/a2x ---- asciidoc-8.2.3.orig/a2x 2007-07-18 10:09:06.000000000 +0200 -+++ asciidoc-8.2.3/a2x 2007-11-07 23:12:33.000000000 +0100 -@@ -513,8 +513,10 @@ - pdf="$DESTINATION_DIR/$SRC_NAME.pdf" - to_docbook - execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \ -- \"$xsl\" \"$xml\" >\"$fo\"" -- execute_command_2 "fop.sh \"$fo\" \"$pdf\"" -+ \"$xsl\" \"$xml\" \ -+ | sed 's|\(src=\"./images/icons/[^\"]\+\).png\"|\1.jpg\"|g' \ -+ | sed 's/bgcolor=\"[^\"]\+\"//g;s/border-right-color=\"\"//g;s/border-bottom-color=\"\"//g' >\"$fo\"" -+ execute_command_2 "fop.sh -c /usr/share/fop/dejavu-ttf.xml \"$fo\" \"$pdf\"" - } - - function to_odt() diff --git a/source/apps-extra/asciidoc/fop-0.9x.diff b/source/apps-extra/asciidoc/fop-0.9x.diff new file mode 100644 index 0000000..7262d4a --- /dev/null +++ b/source/apps-extra/asciidoc/fop-0.9x.diff @@ -0,0 +1,27 @@ +diff -Naur asciidoc-8.2.6.orig/a2x asciidoc-8.2.6/a2x +--- asciidoc-8.2.6.orig/a2x 2007-11-25 23:59:55.000000000 +0100 ++++ asciidoc-8.2.6/a2x 2008-05-03 23:28:36.000000000 +0200 +@@ -502,9 +502,9 @@ + function to_pdf() + { + require "xsltproc" +- require "fop.sh" ++ require "fop" + local xsl xml fo pdf +- xsl=$(conf_file docbook-xsl/fo.xsl) ++ xsl="/usr/share/xml/docbook/fo/docbook.xsl" + if [ ! -r "$xsl" ]; then + quit "file not found: $xsl" + fi +@@ -512,9 +512,9 @@ + fo="$SRC_DIR/$SRC_NAME.fo" + pdf="$DESTINATION_DIR/$SRC_NAME.pdf" + to_docbook +- execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \ ++ execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet --stringparam draft.mode no \ + \"$xsl\" \"$xml\" >\"$fo\"" +- execute_command_2 "fop.sh \"$fo\" \"$pdf\"" ++ execute_command_2 "fop \"$fo\" \"$pdf\"" + } + + function to_odt() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
