[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/14: gnu: dblatex: Update to 0.3.10.
From: |
Tobias Geerinckx-Rice |
Subject: |
13/14: gnu: dblatex: Update to 0.3.10. |
Date: |
Tue, 27 Feb 2018 22:14:05 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 1143450c14edfd91a27f73844d9e46eb376d1b64
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Mon Feb 12 11:08:54 2018 +0100
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.
---
gnu/local.mk | 1 -
gnu/packages/docbook.scm | 6 ++---
gnu/packages/patches/dblatex-remove-multirow.patch | 30 ----------------------
3 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 94ffbe1..68f3a20 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -610,7 +610,6 @@ dist_patch_DATA =
\
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.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/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index ed1e60a..d56dc49 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -176,7 +177,7 @@ by no means limited to these applications.) This package
provides XML DTDs.")
(define-public dblatex
(package
(name "dblatex")
- (version "0.3.9")
+ (version "0.3.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/dblatex/dblatex/"
@@ -184,8 +185,7 @@ by no means limited to these applications.) This package
provides XML DTDs.")
version ".tar.bz2"))
(sha256
(base32
- "0pdizc5rjywwzxa1qqhdmba5zr35pbmdwbysalsid7xw87w3kq06"))
- (patches (search-patches "dblatex-remove-multirow.patch"))))
+ "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"))))
(build-system python-build-system)
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
diff --git a/gnu/packages/patches/dblatex-remove-multirow.patch
b/gnu/packages/patches/dblatex-remove-multirow.patch
deleted file mode 100644
index 62d1c64..0000000
--- a/gnu/packages/patches/dblatex-remove-multirow.patch
+++ /dev/null
@@ -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 address@hidden long
--\expandafter\long\expandafter\def%
address@hidden
--\expandafter#\expandafter1%
--\expandafter[\expandafter#\expandafter2\expandafter]%
--\expandafter#\expandafter3%
--\expandafter[\expandafter#\expandafter4\expandafter]%
--\expandafter#\expandafter5%
address@hidden
--
- % For the newtbl code
- \newdimen\newtblstarfactor%
- \newdimen\newtblsparewidth%
- 04/14: gnu: perl-extutils-installpaths: Update to 0.011., (continued)
- 04/14: gnu: perl-extutils-installpaths: Update to 0.011., Tobias Geerinckx-Rice, 2018/02/27
- 09/14: gnu: perl-throwable: Update to 0.200013., Tobias Geerinckx-Rice, 2018/02/27
- 05/14: gnu: perl-import-into: Update to 1.002005., Tobias Geerinckx-Rice, 2018/02/27
- 07/14: gnu: perl-path-class: Update to 0.37., Tobias Geerinckx-Rice, 2018/02/27
- 11/14: gnu: perl-yaml: Update to 1.24., Tobias Geerinckx-Rice, 2018/02/27
- 08/14: gnu: perl-text-diff: Update to 1.45., Tobias Geerinckx-Rice, 2018/02/27
- 12/14: gnu: perl-yaml-libyaml: Update to 0.69., Tobias Geerinckx-Rice, 2018/02/27
- 10/14: gnu: perl-variable-magic: Update to 0.62., Tobias Geerinckx-Rice, 2018/02/27
- 06/14: gnu: perl-list-moreutils-xs: Update to 0.428., Tobias Geerinckx-Rice, 2018/02/27
- 14/14: gnu: r-httpuv: Update to 1.3.6., Tobias Geerinckx-Rice, 2018/02/27
- 13/14: gnu: dblatex: Update to 0.3.10.,
Tobias Geerinckx-Rice <=