mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: dblatex: Update to 0.3.10.
* gnu/packages/docbook.scm (dblatex): Update to 0.3.10. [source]: Remove patch. * gnu/packages/patches/dblatex-remove-multirow.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
parent
bf5e7189dc
commit
1143450c14
3 changed files with 3 additions and 34 deletions
|
@ -610,7 +610,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/cursynth-wave-rand.patch \
|
%D%/packages/patches/cursynth-wave-rand.patch \
|
||||||
%D%/packages/patches/cvs-2017-12836.patch \
|
%D%/packages/patches/cvs-2017-12836.patch \
|
||||||
%D%/packages/patches/cyrus-sasl-CVE-2013-4122.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/dbus-helper-search-path.patch \
|
||||||
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
|
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
|
||||||
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
|
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||||
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -176,7 +177,7 @@ (define-public docbook-xsl
|
||||||
(define-public dblatex
|
(define-public dblatex
|
||||||
(package
|
(package
|
||||||
(name "dblatex")
|
(name "dblatex")
|
||||||
(version "0.3.9")
|
(version "0.3.10")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/dblatex/dblatex/"
|
(uri (string-append "mirror://sourceforge/dblatex/dblatex/"
|
||||||
|
@ -184,8 +185,7 @@ (define-public dblatex
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0pdizc5rjywwzxa1qqhdmba5zr35pbmdwbysalsid7xw87w3kq06"))
|
"1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"))))
|
||||||
(patches (search-patches "dblatex-remove-multirow.patch"))))
|
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
;; TODO: Add xfig/transfig for fig2dev utility
|
;; TODO: Add xfig/transfig for fig2dev utility
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
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%
|
|
Loading…
Reference in a new issue