Date: Friday, November 11, 2016 @ 19:51:07 Author: lfleischer Revision: 195398
upgpkg: dblatex 0.3.9-2 Drop multirow dependency (fixes FS#51670). Added: dblatex/trunk/dblatex-0.3.9-drop-multirow-dependency.patch Modified: dblatex/trunk/PKGBUILD ----------------------------------------------+ PKGBUILD | 13 ++++++--- dblatex-0.3.9-drop-multirow-dependency.patch | 36 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-11 19:43:08 UTC (rev 195397) +++ PKGBUILD 2016-11-11 19:51:07 UTC (rev 195398) @@ -4,7 +4,7 @@ pkgname=dblatex pkgver=0.3.9 -pkgrel=1 +pkgrel=2 pkgdesc='DocBook (XML and SGML) to DVI, PDF, PostScript converter using latex.' arch=('any') url='http://dblatex.sourceforge.net/' @@ -11,9 +11,16 @@ license=('GPL') depends=('docbook-xsl' 'docbook-xml' 'libxslt' 'python2' 'texlive-core' 'texlive-htmlxml' 'texlive-latexextra' 'texlive-pictures') -source=("https://downloads.sourceforge.net/project/dblatex/dblatex/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('38e9fd93dd37d71e352010ad40e1dfb4') +source=("https://downloads.sourceforge.net/project/dblatex/dblatex/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" + dblatex-0.3.9-drop-multirow-dependency.patch) +md5sums=('38e9fd93dd37d71e352010ad40e1dfb4' + '2ccaf937d0de48c9c283ed0c0f7af5a7') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../dblatex-0.3.9-drop-multirow-dependency.patch +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" Added: dblatex-0.3.9-drop-multirow-dependency.patch =================================================================== --- dblatex-0.3.9-drop-multirow-dependency.patch (rev 0) +++ dblatex-0.3.9-drop-multirow-dependency.patch 2016-11-11 19:51:07 UTC (rev 195398) @@ -0,0 +1,36 @@ +# HG changeset patch +# User marsgui +# Date 1476384175 -7200 +# Thu Oct 13 20:42:55 2016 +0200 +# Node ID 4f030d62420c3101d85976f5017b29070d1277b4 +# Parent 58ff524b7f0f0b8127333ba9542c9619dbdd4dbf +Fix Debian bug #840189: drop multirow dependency + +diff -r 58ff524b7f0f -r 4f030d62420c latex/style/dbk_table.sty +--- a/latex/style/dbk_table.sty Sun Oct 02 23:21:03 2016 +0200 ++++ b/latex/style/dbk_table.sty Thu Oct 13 20:42:55 2016 +0200 +@@ -9,7 +9,6 @@ + \usepackage{longtable} + \usepackage{lscape} + \usepackage{colortbl} +-\usepackage{multirow} + \usepackage{calc} + \usepackage{hhline} + +@@ -21,16 +20,6 @@ + \expandafter[\expandafter3\expandafter]\expandafter{% + \multicolumn{#1}{#2}{#3}} + +-% Make \@xmultirow long +-\expandafter\long\expandafter\def% +-\expandafter\@xmultirow% +-\expandafter#\expandafter1% +-\expandafter[\expandafter#\expandafter2\expandafter]% +-\expandafter#\expandafter3% +-\expandafter[\expandafter#\expandafter4\expandafter]% +-\expandafter#\expandafter5% +-\expandafter{\@xmultirow{#1}[#2]{#3}[#4]{#5}} +- + % For the newtbl code + \newdimen\newtblstarfactor% + \newdimen\newtblsparewidth%