X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a860b0fb9ef9a71d83d40c9c2f19931dacd7bb67..3c11c91f69f968289c7e8f0fac9dadd98af6250c:/packages/weechat/cmake-FindPython.cmake.patch

diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch
index a2e5158a..a29a8ae8 100644
--- a/packages/weechat/cmake-FindPython.cmake.patch
+++ b/packages/weechat/cmake-FindPython.cmake.patch
@@ -1,13 +1,12 @@
-diff -u -r ../weechat-1.5/cmake/FindPython.cmake ./cmake/FindPython.cmake
---- ../weechat-1.5/cmake/FindPython.cmake	2016-05-01 06:50:12.000000000 -0400
-+++ ./cmake/FindPython.cmake	2016-05-03 04:00:56.742055189 -0400
-@@ -33,65 +33,11 @@
-    set(PYTHON_FIND_QUIETLY TRUE)
+diff -u -r ../weechat-1.6/cmake/FindPython.cmake ./cmake/FindPython.cmake
+--- ../weechat-1.6/cmake/FindPython.cmake	2016-10-02 03:35:04.000000000 -0400
++++ ./cmake/FindPython.cmake	2016-10-09 14:56:31.261168669 -0400
+@@ -34,64 +34,11 @@
  endif()
  
--if(ENABLE_PYTHON3)
+ if(ENABLE_PYTHON3)
 -  find_program(PYTHON_EXECUTABLE
--    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-    NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
 -    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
 -    )
 -else()
@@ -39,7 +38,7 @@ diff -u -r ../weechat-1.5/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -    )
 -  if(ENABLE_PYTHON3)
 -    find_library(PYTHON_LIBRARY
--      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+-      NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
 -      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
 -      )
 -  else()
@@ -64,16 +63,11 @@ diff -u -r ../weechat-1.5/cmake/FindPython.cmake ./cmake/FindPython.cmake
 -      set(PYTHON_FOUND TRUE)
 -    endif()
 -  endif()
-+set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python")
-+set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.5m")
-+set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib")
-+set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")
-+set(PYTHON_FOUND TRUE)
++  set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python")
++  set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.5m")
++  set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib")
++  set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.5m")
++  set(PYTHON_FOUND TRUE)
  
    mark_as_advanced(
      PYTHON_EXECUTABLE
-@@ -100,4 +46,3 @@
-     PYTHON_LFLAGS
-     )
- 
--endif()