summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Mullins2016-02-29 19:32:55 -0500
committerChristopher Mullins2016-02-29 19:32:55 -0500
commit97a35e17a8694507a73895f00884b90dd68ad20e (patch)
tree46ea91892e67f2febae680516c64b0db305983a8
parent6f6735c30624c665fd6292057c87ce21fd124e5b (diff)
downloadaur-97a35e17a8694507a73895f00884b90dd68ad20e.tar.gz
Update to 2.6.3.
Include this patch to enable skipping manpage generation due to an error with xslt[1]. [1] https://github.com/malaterre/GDCM/commit/4c06d8fa0a107a03638045f5e0bd0ec11013e70b
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
-rw-r--r--skip-manpages.patch26
3 files changed, 45 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f724b1fdbd6..9beb14ea613 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Dec 30 20:30:59 UTC 2015
+# Tue Mar 1 00:30:15 UTC 2016
pkgbase = gdcm
pkgdesc = a C++ library for DICOM medical files
- pkgver = 2.6.2
- pkgrel = 3
+ pkgver = 2.6.3
+ pkgrel = 4
url = http://gdcm.sourceforge.net
arch = i686
arch = x86_64
@@ -13,8 +13,10 @@ pkgbase = gdcm
optdepends = java-runtime: java bindings
optdepends = vtk: vtk bindings
optdepends = swig: generate python wrappers
- source = http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.6.2/gdcm-2.6.2.tar.gz
- sha512sums = 0f3f66db5f27ff3f7cde2eb50878aa47a700880ca79fde450846dd0dc33a0176453175b6d50f41f64e1c28eb0b2023e7a2cdc2b2c7f40097939a40449650ab98
+ source = http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%202.6.3/gdcm-2.6.3.tar.gz
+ source = skip-manpages.patch
+ sha512sums = 3d3abcaa84b23b0a689d1ba530bd65408e220cce2461b10ff5c0dd07a67fc0ccb29269fa4eb733121d227adab9e5e8b64885d06709850c43f0b1a1e8cca33a07
+ sha512sums = 2178179be7adbb16334cfa9f4c19165d97ffbf099bb5c134fef7aedea26e7e47b3c67cf0de1af8b2aa1be150acc323d1b0f9c737003b75ccec4f02af5df2b52e
pkgname = gdcm
diff --git a/PKGBUILD b/PKGBUILD
index c2e4e6a9569..4f9583083b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
pkgname=gdcm
-pkgver=2.6.2
-pkgrel=3
+pkgver=2.6.3
+pkgrel=4
pkgdesc='a C++ library for DICOM medical files'
arch=('i686' 'x86_64')
url='http://gdcm.sourceforge.net'
@@ -13,8 +13,15 @@ optdepends=('python2: python bindings'
'vtk: vtk bindings'
'swig: generate python wrappers')
makedepends=('cmake')
-source=("http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20$pkgver/gdcm-$pkgver.tar.gz")
-sha512sums=('0f3f66db5f27ff3f7cde2eb50878aa47a700880ca79fde450846dd0dc33a0176453175b6d50f41f64e1c28eb0b2023e7a2cdc2b2c7f40097939a40449650ab98')
+source=("http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20$pkgver/gdcm-$pkgver.tar.gz"
+ "skip-manpages.patch")
+sha512sums=('3d3abcaa84b23b0a689d1ba530bd65408e220cce2461b10ff5c0dd07a67fc0ccb29269fa4eb733121d227adab9e5e8b64885d06709850c43f0b1a1e8cca33a07'
+ '2178179be7adbb16334cfa9f4c19165d97ffbf099bb5c134fef7aedea26e7e47b3c67cf0de1af8b2aa1be150acc323d1b0f9c737003b75ccec4f02af5df2b52e')
+
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -Np1 -i ../../skip-manpages.patch
+}
build() {
cd "$srcdir"
@@ -24,6 +31,7 @@ build() {
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_BUILD_TESTING:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=Release \
+ -DGDCM_DOCUMENTATION_SKIP_MANPAGES:BOOL=ON \
../$pkgname-$pkgver
make
}
diff --git a/skip-manpages.patch b/skip-manpages.patch
new file mode 100644
index 00000000000..58a38a8cb4f
--- /dev/null
+++ b/skip-manpages.patch
@@ -0,0 +1,26 @@
+From 4c06d8fa0a107a03638045f5e0bd0ec11013e70b Mon Sep 17 00:00:00 2001
+From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+Date: Tue, 9 Feb 2016 21:18:31 +0100
+Subject: [PATCH] Add a way to skip manpages for users
+
+---
+ Utilities/doxygen/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt
+index 4ddbbcf..dc32e07 100644
+--- a/Utilities/doxygen/CMakeLists.txt
++++ b/Utilities/doxygen/CMakeLists.txt
+@@ -225,6 +225,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/latex/Makefile
+ endif()
+ endif()
+
++if(NOT GDCM_DOCUMENTATION_SKIP_MANPAGES)
+ set(MANPAGES_XML
+ gdcm2pnm
+ gdcm2vtk
+@@ -302,3 +303,4 @@ install(FILES
+ else()
+ message(WARNING "Cannot build man page from docbook (need an XSL processor)")
+ endif()
++endif() #NOT GDCM_DOCUMENTATION_SKIP_MANPAGES