M gnu/local.mk => gnu/local.mk +1 -0
@@ 559,6 559,7 @@ dist_patch_DATA = \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \
+ %D%/packages/patches/dblatex-remove-multirow.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
M gnu/packages/docbook.scm => gnu/packages/docbook.scm +32 -2
@@ 180,11 180,41 @@ by no means limited to these applications.) This package provides XML DTDs.")
version ".tar.bz2"))
(sha256
(base32
- "0pdizc5rjywwzxa1qqhdmba5zr35pbmdwbysalsid7xw87w3kq06"))))
+ "0pdizc5rjywwzxa1qqhdmba5zr35pbmdwbysalsid7xw87w3kq06"))
+ (patches (search-patches "dblatex-remove-multirow.patch"))))
(build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
- `(("texlive" ,texlive)
+ `(("texlive" ,(texlive-union (list texlive-latex-amsfonts
+ texlive-latex-anysize
+ texlive-latex-appendix
+ texlive-latex-changebar
+ texlive-latex-colortbl
+ texlive-latex-eepic
+ texlive-latex-eso-pic
+ texlive-latex-fancybox
+ texlive-latex-fancyhdr
+ texlive-latex-fancyvrb
+ texlive-latex-float
+ texlive-latex-footmisc
+ texlive-latex-hyperref
+ texlive-latex-jknapltx
+ texlive-latex-listings
+ texlive-latex-multirow
+ texlive-latex-oberdiek
+ texlive-latex-overpic
+ texlive-latex-pdfpages
+ texlive-latex-subfigure
+ texlive-latex-titlesec
+ texlive-latex-url
+ texlive-latex-wasysym
+
+ texlive-fonts-amsfonts
+ texlive-fonts-ec
+ texlive-fonts-rsfs
+ texlive-fonts-stmaryrd
+
+ texlive-generic-ifxetex)))
("imagemagick" ,imagemagick) ;for convert
("inkscape" ,inkscape) ;for svg conversion
("docbook" ,docbook-xml)
A gnu/packages/patches/dblatex-remove-multirow.patch => gnu/packages/patches/dblatex-remove-multirow.patch +30 -0
@@ 0,0 1,30 @@
+This patch is needed to fix dblatex with newer versions of TeX Live.
+It was taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840189
+
+--- a/latex/style/dbk_table.sty Sun Oct 02 23:21:03 2016 +0200
++++ b/latex/style/dbk_table.sty Mon Oct 10 21:31:00 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%