diff options
| author | Holger Jaekel <holger.jaekel@gmx.de> | 2020-05-18 23:36:32 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-05-19 06:37:43 +0000 |
| commit | 8298e57eeff4e0e4451f2d33ca61f3a663ff435f (patch) | |
| tree | be53f4ee9fe586fcd394a8a918aca4b68ce01940 | |
| parent | 64079c5ca15a9946161a51ade87720825a36c1d2 (diff) | |
| download | aports-8298e57eeff4e0e4451f2d33ca61f3a663ff435f.tar.gz aports-8298e57eeff4e0e4451f2d33ca61f3a663ff435f.tar.bz2 aports-8298e57eeff4e0e4451f2d33ca61f3a663ff435f.tar.xz | |
community/java-lz4: upgrade to 1.7.1
fixes #11494
| -rw-r--r-- | community/java-lz4/0001-ivy-location.patch | 6 | ||||
| -rw-r--r-- | community/java-lz4/0002-dont-bundle-natives.patch | 8 | ||||
| -rw-r--r-- | community/java-lz4/APKBUILD | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/community/java-lz4/0001-ivy-location.patch b/community/java-lz4/0001-ivy-location.patch index f51ffa35e9..aff4587c8a 100644 --- a/community/java-lz4/0001-ivy-location.patch +++ b/community/java-lz4/0001-ivy-location.patch @@ -8,14 +8,14 @@ diff --git a/build.xml b/build.xml index 841582e..2571f46 100644 --- a/build.xml +++ b/build.xml -@@ -56,8 +56,8 @@ +@@ -74,8 +74,8 @@ </target> <target name="-ivy-install" unless="ivy.available"> - <mkdir dir="${user.home}/.ant/lib" /> -- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest="${user.home}/.ant/lib/${ivy.jar.name}"/> +- <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest="${user.home}/.ant/lib/${ivy.jar.name}"/> + <mkdir dir=".ant" /> -+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest=".ant/${ivy.jar.name}"/> ++ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest=".ant/${ivy.jar.name}"/> </target> <target name="install-cpptasks" unless="cpptasks.available"> diff --git a/community/java-lz4/0002-dont-bundle-natives.patch b/community/java-lz4/0002-dont-bundle-natives.patch index ae90e29b1b..055a68b019 100644 --- a/community/java-lz4/0002-dont-bundle-natives.patch +++ b/community/java-lz4/0002-dont-bundle-natives.patch @@ -9,7 +9,7 @@ diff --git a/build.xml b/build.xml index 841582e..901b880 100644 --- a/build.xml +++ b/build.xml -@@ -280,11 +280,9 @@ +@@ -349,11 +349,9 @@ <mkdir dir="${dist}" /> <jar destfile="${dist}/${ivy.module}.jar"> @@ -18,6 +18,6 @@ index 841582e..901b880 100644 <fileset dir="${build}/unsafe-classes" /> <fileset dir="${build}/generated-classes" /> - <fileset dir="${build}/jni" erroronmissingdir="false" /> - </jar> - </target> - + <manifest> + <attribute name="Automatic-Module-Name" value="org.lz4.java"/> + </manifest> diff --git a/community/java-lz4/APKBUILD b/community/java-lz4/APKBUILD index 99c0dc846d..d4659801c6 100644 --- a/community/java-lz4/APKBUILD +++ b/community/java-lz4/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=java-lz4 _pkgname=lz4-java -pkgver=1.4.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="LZ4 compression for Java" url="https://github.com/jpountz/lz4-java" -arch="" # ftbfs due to maven repo refusing http +arch="all !mips !mips64" license="Apache-2.0" -depends="openjdk8-jre-base $pkgname-native" +depends="openjdk8-jre-base $pkgname-native lz4-dev xxhash-dev" makedepends="apache-ant openjdk8" subpackages="$pkgname-native" source="$_pkgname-$pkgver.tar.gz::https://github.com/jpountz/$_pkgname/archive/$pkgver.tar.gz @@ -18,6 +18,7 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/jpountz/$_pkgname/archive/$ builddir="$srcdir/$_pkgname-$pkgver" build() { + mkdir -p src/lz4/lib ant ivy-bootstrap ant jar -lib .ant -Divy.default.ivy.user.dir=/tmp/ivy2 } @@ -37,6 +38,6 @@ native() { ln -sf $soname.$pkgver "$subpkgdir"/usr/lib/$soname } -sha512sums="5032f47e66e66c1e3c6ee5eeb431b2eb70578b5406e3a01fa501951f3864e67a70f39127f937f5af1bc943401b673e412ff3d99fb9539f3e6fa1a28a9b002b56 lz4-java-1.4.0.tar.gz -1e5d1f5bdb87ad89efa423af2ec83921ab7a7fc3de36e6398cbfa90e1b2e07d11834decddf97a17b3dbadf7d2575770b629b35435ce8f1d5ac078554026d1789 0001-ivy-location.patch -cc570080f7682525709ec1999fe5cf8e0ccc6f41dd34ab76159321c02ca504041d4d2bc008f04e312550bd1de611ed77d99dd7f2101a0a3600cbea7ab16ce09d 0002-dont-bundle-natives.patch" +sha512sums="13fd89a9564f1f504348ce30a51ca22d5581a6661658d55c96f3f0c1e43126de04d2df87683251a8ec5bf53726f529b60bb1ec666863b7e33810df8ed73bb586 lz4-java-1.7.1.tar.gz +bd80cac3454db4cd95fab162d0031d4866cc7a9f9822f1231d5f9c766aa550398b9e27fad48c8150c0c8a538673ca3ad7de95edff9bd790d3351ba318ea44c49 0001-ivy-location.patch +9d435cd35af15988d8844b38d7d00ad423062680323e9d5d395f431e736668ee10148bc3a0147a430cea522983a4ca54e57557d7330c42347bd71c2c9a06d622 0002-dont-bundle-natives.patch" |