mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-java/jna: drop 5.11.0-r1
Closes: https://bugs.gentoo.org/881021 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32881 Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
committed by
Arthur Zamarin
parent
9c02397156
commit
d4aa470ac2
@@ -1,2 +1 @@
|
||||
DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
|
||||
DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
diff --git a/build.xml b/build.xml
|
||||
index ed104c2..cd8895c 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -182,9 +182,9 @@
|
||||
|
||||
<target name="-prepare-anttools">
|
||||
<subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
|
||||
- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" />
|
||||
- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
|
||||
- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
|
||||
+ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:${gentoo.classpath}" />
|
||||
+ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:${gentoo.classpath}" />
|
||||
+ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:${gentoo.classpath}" />
|
||||
</target>
|
||||
|
||||
<target name="-dynamic-properties" depends="-prepare-anttools">
|
||||
@@ -385,7 +385,9 @@
|
||||
<pathelement path="${build}/${jar}"/>
|
||||
<pathelement path="${test.classes}"/>
|
||||
<pathelement path="${build}/${testjar}"/>
|
||||
+ <!--
|
||||
<pathelement path="lib/clover.jar"/>
|
||||
+ -->
|
||||
<path refid="test.libs"/>
|
||||
</path>
|
||||
</target>
|
||||
@@ -1265,8 +1267,10 @@ cd ..
|
||||
<mkdir dir="${build}/jws"/>
|
||||
<copy todir="${build}/jws" file="${build}/${jar}"/>
|
||||
<copy todir="${build}/jws" file="${build}/${testjar}"/>
|
||||
+ <!--
|
||||
<copy todir="${build}/jws" file="lib/junit.jar"/>
|
||||
<copy todir="${build}/jws" file="lib/clover.jar"/>
|
||||
+ -->
|
||||
<jar jarfile="${build}/jws/jnidispatch.jar" createUnicodeExtraFields="never" encoding="UTF-8">
|
||||
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
|
||||
</jar>
|
||||
diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
|
||||
index 47fa8ed..a623ce6 100644
|
||||
--- a/contrib/platform/build.xml
|
||||
+++ b/contrib/platform/build.xml
|
||||
@@ -115,9 +115,9 @@
|
||||
|
||||
<target name="-prepare-anttools">
|
||||
<subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant>
|
||||
- <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
|
||||
- <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
|
||||
- <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
|
||||
+ <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
|
||||
+ <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
|
||||
+ <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${gentoo.classpath}" />
|
||||
</target>
|
||||
|
||||
<macrodef name="build-manifest">
|
||||
@@ -1,96 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
MAVEN_ID="net.java.dev.jna:jna:5.11.0"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Java Native Access"
|
||||
HOMEPAGE="https://github.com/java-native-access/jna"
|
||||
SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
|
||||
SLOT="4"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
CDEPEND="
|
||||
>=dev-libs/libffi-3.4:=
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
>=virtual/jdk-1.8:*
|
||||
dev-java/animal-sniffer-annotations:0
|
||||
dev-java/ant-core:0
|
||||
dev-java/asm:9
|
||||
test? (
|
||||
dev-java/ant-junit4:0
|
||||
dev-java/junit:4
|
||||
dev-java/reflections:0
|
||||
)
|
||||
${CDEPEND}
|
||||
x11-libs/libXt
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=virtual/jre-1.8:*
|
||||
${CDEPEND}
|
||||
"
|
||||
|
||||
DOCS=( README.md CHANGES.md OTHERS TODO )
|
||||
PATCHES=(
|
||||
"${FILESDIR}/5.10.0-build.xml.patch"
|
||||
"${FILESDIR}/5.11.0-makefile-flags.patch"
|
||||
"${FILESDIR}/jna-5.11.0-no-Werror.patch"
|
||||
)
|
||||
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
|
||||
EANT_BUILD_TARGET="jar contrib-jars"
|
||||
EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
|
||||
EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
|
||||
EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
|
||||
animal-sniffer-annotations,ant-core,asm-9)"
|
||||
|
||||
# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
|
||||
# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
|
||||
# variable's value, so define them in ANT_OPTS instead
|
||||
ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
|
||||
# Parallel build does not respect dependency relationships between objects
|
||||
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
|
||||
|
||||
# Eliminate build.xml's dependency on bundled native JARs
|
||||
sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
|
||||
die "Failed to delete lines referencing bundled JARs in build.xml"
|
||||
|
||||
# Clean up bundled JARs and libffi
|
||||
java-pkg_clean
|
||||
rm -r native/libffi || die "Failed to remove bundled libffi"
|
||||
|
||||
java-pkg-2_src_prepare
|
||||
}
|
||||
|
||||
src_test() {
|
||||
java-pkg-2_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar "build/${PN}-min.jar"
|
||||
java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
|
||||
java-pkg_doso build/native-*/libjnidispatch.so
|
||||
einstalldocs
|
||||
|
||||
use source && java-pkg_dosrc src/*
|
||||
use doc && java-pkg_dojavadoc doc/javadoc
|
||||
}
|
||||
Reference in New Issue
Block a user