summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/java-batik/PKGBUILD90
-rw-r--r--libre/java-batik/batik-remove_js.patch13
2 files changed, 44 insertions, 59 deletions
diff --git a/libre/java-batik/PKGBUILD b/libre/java-batik/PKGBUILD
index 1ff561bb3..8b95c982e 100644
--- a/libre/java-batik/PKGBUILD
+++ b/libre/java-batik/PKGBUILD
@@ -1,69 +1,67 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgname=java-batik
-pkgver=1.8
-pkgrel=2.parabola1
+pkgver=1.9
+pkgrel=1.parabola1
pkgdesc='SVG library for Java.'
arch=('any')
url='http://xmlgraphics.apache.org/batik/'
license=(APACHE)
depends=('java-runtime' 'java-commons-io' 'java-commons-logging' 'java-xmlgraphics-commons'
'java-xml-commons-external' 'rhino' 'xalan-java' 'xerces2-java')
-makedepends=('java-environment' 'apache-ant' 'unzip' 'jh')
-source=("https://www.apache.org/dist/xmlgraphics/batik/source/batik-src-${pkgver}.tar.gz"{,.asc}
- 'batik-remove_js.patch')
-md5sums=('2d330fce73c15629b9052a1a52d4af24'
- 'SKIP'
- '71705a32991629bf5f8ee35c91c88dca')
-validpgpkeys=('9D5F9D9B3E21B585E8F4551082036989D56B5F17') # Luis Bernardo
+makedepends=('java-environment' 'apache-ant' 'unzip' 'jh'
+ 'rhino' 'xalan-java')
+source=("https://www.apache.org/dist/xmlgraphics/batik/source/batik-src-$pkgver.tar.gz")
+sha256sums=('bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3')
prepare() {
- cd "${srcdir}/batik-${pkgver}"
- rm -rv lib/*
- rm -rv test-resources/org/apache/batik/bridge/*.jar
- rm -rv documentation-sources/content/demo/*.jar
- ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar
- ln -sf /usr/share/java/xml-apis-ext.jar lib/xml-apis-ext.jar
- #ln -sf /usr/share/java/xalan.jar lib/xalan.jar
- #ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
- ln -sf /usr/share/java/xmlgraphics-commons.jar lib/xmlgraphics-commons.jar
-
- patch -Np1 -i ../batik-remove_js.patch
+ cd "batik-$pkgver"
+ rm -rv lib/*
+ rm -rv documentation-sources/content/demo/*.jar
+ ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar
+ ln -sf /usr/share/java/xml-apis-ext.jar lib/xml-apis-ext.jar
+ #ln -sf /usr/share/java/xalan.jar lib/xalan.jar
+ #ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
+ ln -sf /usr/share/java/xmlgraphics-commons.jar lib/xmlgraphics-commons.jar
}
build() {
- cd "${srcdir}/batik-${pkgver}"
- ant all-jar libs-jar ext-jar transcoder-jar maven-artifacts
+ cd "batik-$pkgver"
+# ant all-jar libs-jar ext-jar transcoder-jar
+ ant jars libs-jar all-jar
}
package() {
- cd "${srcdir}/batik-${pkgver}/batik-${pkgver}"
+ cd "batik-$pkgver/batik-$pkgver"
+
+ # Install license file
+ install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- # Install license file
- install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ # Install Maven artifacts
+ export DESTDIR=$pkgdir
+ for artifact in $(find . -name "batik-*-*.jar" ! -name '*-libs-*.jar' | sed 's/-[0-9.]*\.jar$//'); do
+ _dir=$(dirname $artifact)
+ _artifact=$(basename $artifact)
- # Install Maven artifacts
- install -d "${pkgdir}/usr/share/java/batik"
- export DESTDIR=${pkgdir}
- for artifact in $(find . -name "*.pom" | sed 's/.*\///' | sed 's/-[0-9.]*\.pom$//'); do
- jh mvn-install "org.apache.xmlgraphics" ${artifact} ${pkgver} \
- "maven/${artifact}/${pkgver}/${artifact}-${pkgver}.pom" \
- "maven/${artifact}/${pkgver}/${artifact}-${pkgver}.jar" \
- "${artifact}.jar"
+ jh mvn-install "org.apache.xmlgraphics" ${_artifact} $pkgver \
+ "../${_artifact}/pom.xml" \
+ "${_dir}/${_artifact}-$pkgver.jar" \
+ "${_artifact}-$pkgver.jar"
- # Symlink them to /usr/share/java
- ln -s "/usr/share/java/${artifact}.jar" \
- "${pkgdir}/usr/share/java/${artifact}-${pkgver}.jar"
- done
+ # Symlink them to /usr/share/java
+ ln -s "/usr/share/java/${_artifact}-$pkgver.jar" \
+ "$pkgdir/usr/share/java/${_artifact}.jar"
+ done
- # Install batik-all.jar and batik-libs.jar
- install -m644 "lib/batik-all-${pkgver}.jar" \
- "${pkgdir}/usr/share/java/batik/"
- install -m644 "lib/batik-libs-${pkgver}.jar" \
- "${pkgdir}/usr/share/java/batik/"
+ # Install batik-all.jar and batik-libs.jar
+ install -d "$pkgdir/usr/share/java/batik"
+ install -m644 "lib/batik-all-$pkgver.jar" \
+ "$pkgdir/usr/share/java/batik/"
+ install -m644 "lib/batik-libs-$pkgver.jar" \
+ "$pkgdir/usr/share/java/batik/"
- ln -s "/usr/share/java/batik/batik-all-${pkgver}.jar" \
- "${pkgdir}/usr/share/java/batik/batik-all.jar"
- ln -s "/usr/share/java/batik/batik-libs-${pkgver}.jar" \
- "${pkgdir}/usr/share/java/batik/batik-libs.jar"
+ ln -s "/usr/share/java/batik/batik-all-$pkgver.jar" \
+ "$pkgdir/usr/share/java/batik/batik-all.jar"
+ ln -s "/usr/share/java/batik/batik-libs-$pkgver.jar" \
+ "$pkgdir/usr/share/java/batik/batik-libs.jar"
}
diff --git a/libre/java-batik/batik-remove_js.patch b/libre/java-batik/batik-remove_js.patch
deleted file mode 100644
index 6b2afe6db..000000000
--- a/libre/java-batik/batik-remove_js.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- batik-1.8.orig/build.xml 2015-03-10 04:58:29.000000000 -0500
-+++ batik-1.8/build.xml 2015-12-18 01:05:55.701905436 -0500
-@@ -720,10 +720,6 @@
- <copy file="${src}/${project}-xml.pom.template" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.pom" filtering="true"/>
- <copy file="${build}/lib/${project}-xml-${completeVersion}.jar" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.jar"/>
-
-- <mkdir dir="${maven}/${project}-js/${completeVersion}"/>
-- <copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/>
-- <copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/>
--
- <!-- Generate checksums of all artifacts and POMs -->
- <checksum algorithm="MD5" fileext=".md5">
- <fileset dir="${maven}">