2 files changed, 68 insertions, 0 deletions
diff --git a/dev-python/jpype/files/jpype-1.7.1-jar-location.patch b/dev-python/jpype/files/jpype-1.7.1-jar-location.patch
new file mode 100644
index 000000000000..f904a5d8c220
--- /dev/null
+++ b/dev-python/jpype/files/jpype-1.7.1-jar-location.patch
@@ -0,0 +1,36 @@
+QA marks the stray top-level jar in site-packages.
+Lookup adjusted to the new location.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ 
+ if(SKBUILD)
+     message(DEBUG "SKBuild invocation")
+-    set(DEST_JAR ${SKBUILD_PLATLIB_DIR})
++    set(DEST_JAR ${SKBUILD_PLATLIB_DIR}/jpype)
+     set(DEST_EXTENSION ${SKBUILD_PLATLIB_DIR})
+ else()
+     # in-place build, set output to cmakes output dir.
+--- a/jpype/_core.py
++++ b/jpype/_core.py
+@@ -313,7 +313,7 @@
+ #        extra_jvm_args += ['--module-path=%s'%mp ]
+ 
+     # Get the support library
+-    support_lib_p = Path(__file__).resolve().parent.parent / "org.jpype.jar"
++    support_lib_p = Path(__file__).resolve().parent / "org.jpype.jar"
+     if not support_lib_p.exists():  # pragma: no cover
+         raise RuntimeError(
+             f"Unable to find org.jpype.jar support library at {support_lib_p}")
+--- a/jpype/_pyinstaller/hook-jpype.py
++++ b/jpype/_pyinstaller/hook-jpype.py
+@@ -6,6 +6,6 @@
+ 
+ fspath = getattr(os, 'fspath', str)
+ 
+-jar_path = Path(jpype.__file__).parent.parent.joinpath('org.jpype.jar')
++jar_path = Path(jpype.__file__).parent.joinpath('org.jpype.jar')
+ 
+-datas = [[fspath(jar_path), '.']]
++datas = [[fspath(jar_path), 'jpype']]
diff --git a/dev-python/jpype/files/jpype-1.7.1-java-release.patch b/dev-python/jpype/files/jpype-1.7.1-java-release.patch
new file mode 100644
index 000000000000..c60a4939ec46
--- /dev/null
+++ b/dev-python/jpype/files/jpype-1.7.1-java-release.patch
@@ -0,0 +1,32 @@
+Upstream uses URLDecoder.decode(String, Charset) - unavailable in Java 9
+
+--- a/native/build.xml
++++ b/native/build.xml
+@@ -1,7 +1,7 @@
+ <project default="all" name="JPype - Native">
+ 
+ 	<!-- JAVA_VERSION must match the oldest supported Java version -->
+-	<property name="JAVA_VERSION" value="9" />
++	<property name="JAVA_VERSION" value="11" />
+ 
+ 	<!-- src can't be "java" as it breaks nose tests -->
+ 	<property name="src" location="jpype_module/src/main/java"/>
+@@ -17,16 +17,14 @@
+ 		<mkdir dir="${build}/classes/META-INF/versions/0"/>
+ 		<mkdir dir="${build}/lib"/>
+ 		<javac destdir="${build}/classes"
+-			source="${JAVA_VERSION}"
+-			target="${JAVA_VERSION}"
++			release="${JAVA_VERSION}"
+ 			excludes="**/Reflector0.java"
+             includeantruntime="false"
+ 			>
+ 			<src path="${src}"/>
+ 		</javac>
+ 		<javac destdir="${build}/classes/META-INF/versions/0"
+-			source="${JAVA_VERSION}"
+-			target="${JAVA_VERSION}"
++			release="${JAVA_VERSION}"
+ 			includes="**/Reflector0.java"
+             includeantruntime="false"
+ 			>