From 0a04c3a97b2e16ec21d422264652c8fb3051daa6 Mon Sep 17 00:00:00 2001
From: Hadrien Mary <hadrien.mary@gmail.com>
Date: Wed, 28 Nov 2018 23:47:11 -0500
Subject: [PATCH] Bump pyjnius version and remove patch

---
 recipe/fix_setup.py.patch | 73 ---------------------------------------
 recipe/meta.yaml          |  7 ++--
 2 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 recipe/fix_setup.py.patch

diff --git a/recipe/fix_setup.py.patch b/recipe/fix_setup.py.patch
deleted file mode 100644
index 09057c3..0000000
--- a/recipe/fix_setup.py.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/setup.py b/setup.py
-index b7c8139..bd3843d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -99,41 +99,51 @@ if PLATFORM == 'android':
-     # for android, we use SDL...
-     LIBRARIES = ['sdl', 'log']
-     LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
-+
- elif PLATFORM == 'darwin':
--    FRAMEWORK = subprocess.Popen(
-+
-+    JAVA_HOME = subprocess.Popen(
-         '/usr/libexec/java_home',
-         stdout=subprocess.PIPE, shell=True).communicate()[0]
-+
-     if PY3:
--        FRAMEWORK = FRAMEWORK.decode()
--    FRAMEWORK = FRAMEWORK.strip()
--    print('java_home: {0}\n'.format(FRAMEWORK))
--    if not FRAMEWORK:
-+        JAVA_HOME = JAVA_HOME.decode()
-+
-+    JAVA_HOME = JAVA_HOME.strip()
-+
-+    if not JAVA_HOME:
-         raise Exception('You must install Java on your Mac OS X distro')
--    if '1.6' in FRAMEWORK:
-+
-+    if '1.6' in JAVA_HOME:
-         LIB_LOCATION = '../Libraries/libjvm.dylib'
-         INCLUDE_DIRS = [join(
--            FRAMEWORK, (
-+            JAVA_HOME, (
-                 'System/Library/Frameworks/'
-                 'JavaVM.framework/Versions/Current/Headers'
-             )
-         )]
-     else:
-         LIB_LOCATION = 'jre/lib/server/libjvm.dylib'
--        FULL_LIB_LOCATION = join(FRAMEWORK, LIB_LOCATION)
- 
--        if not exists(FULL_LIB_LOCATION):
-+        # We want to favor Java installation declaring JAVA_HOME
-+        if getenv('JAVA_HOME'):
-             JAVA_HOME = getenv('JAVA_HOME')
--            FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION)
--            if not exists(FULL_LIB_LOCATION):
--                # In that case, the Java version is very likely >=9.
--                # So we need to modify the `libjvm.so` path.
--                LIB_LOCATION = 'lib/server/libjvm.dylib'
-+
-+        FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION)
-+
-+        if not exists(FULL_LIB_LOCATION):
-+            # In that case, the Java version is very likely >=9.
-+            # So we need to modify the `libjvm.so` path.
-+            LIB_LOCATION = 'lib/server/libjvm.dylib'
- 
-         INCLUDE_DIRS = [
--            '{0}/include'.format(FRAMEWORK),
--            '{0}/include/darwin'.format(FRAMEWORK)
-+            '{0}/include'.format(JAVA_HOME),
-+            '{0}/include/darwin'.format(JAVA_HOME)
-         ]
--    compile_native_invocation_handler(FRAMEWORK)
-+
-+    print('JAVA_HOME: {0}\n'.format(JAVA_HOME))
-+
-+    compile_native_invocation_handler(JAVA_HOME)
- else:
-     # note: if on Windows, set ONLY JAVA_HOME
-     # not on android or osx, we need to search the JDK_HOME
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 815db23..989c1ee 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -10,11 +10,8 @@ source:
   #url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
   #sha256: 0bc70b48eb764b20b017e44ef2df6eae94e4a2f90ae63160d2a166c406e1ccf9
   # Currently testing on pyjnius master
-  url: https://github.com/kivy/pyjnius/archive/8aa91781f6d7726f9eb04fb8b1fb913be0ba1f4c.zip
-  sha256: 301d3e1bc6105ccc3fb1a887cef0aa84557270365ff62d818f6bef1197903733
-
-  patches:
-    - fix_setup.py.patch
+  url: https://github.com/kivy/pyjnius/archive/9e5ec4fbec01c6d7fc194cdef06a36378810b29f.zip
+  sha256: a5d6efb77ce579f3a561ad9dab214d85e3894288f38a35b1dbd274f59606359e
 
 build:
   number: {{ build_number }}