Merge lp:~muktupavels/compiz/cython into lp:compiz/0.9.13

[Alberts Muktupāvels]

compizconfig-python: replace pyrex with cython.

Replace pyrex with cython. The former does not work with python 3.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
--- compizconfig/compizconfig-python/CMakeLists.txt	2014-11-25 19:25:20 +0000
+++ compizconfig/compizconfig-python/CMakeLists.txt	2018-06-27 10:33:58 +0000
@@ -28,17 +28,17 @@
 set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})
 set (PY_SCRIPTS_DIR scripts-${PY_VERSION})
 set (PY_COMPIZCONFIG_SRC ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.c)
-set (PY_COMPIZCONFIG_PYREX ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)
+set (PY_COMPIZCONFIG_CYTHON ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)
 
-find_program(PYREXC_BIN pyrexc)
-if(NOT PYREXC_BIN)
-  message(FATAL_ERROR "Can not build because pyrexc binary not found.")
+find_program(CYTHON_BIN cython)
+if(NOT CYTHON_BIN)
+  message(FATAL_ERROR "Can not build because cython binary not found.")
 endif()
 
 add_custom_command (OUTPUT ${PY_COMPIZCONFIG_SRC}
-		    COMMAND ${PYREXC_BIN} -o ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_PYREX}
+		    COMMAND ${CYTHON_BIN} -o ${PY_COMPIZCONFIG_SRC} ${PY_COMPIZCONFIG_CYTHON}
 		    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		    DEPENDS ${PY_COMPIZCONFIG_PYREX})
+		    DEPENDS ${PY_COMPIZCONFIG_CYTHON})
 
 file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
@@ -50,7 +50,7 @@
 include_directories (${PYTHON_INCLUDE_DIRS}
 		     ${COMPIZCONFIG_INCLUDE_DIRS})
 
-# pyrex generates code that does type-punning, this trips
+# cython generates code that does type-punning, this trips
 # up -Werror
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-aliasing")
 

=== modified file 'compizconfig/compizconfig-python/src/compizconfig.pyx'
--- compizconfig/compizconfig-python/src/compizconfig.pyx	2012-09-05 08:05:54 +0000
+++ compizconfig/compizconfig-python/src/compizconfig.pyx	2018-06-27 10:33:58 +0000
@@ -164,8 +164,8 @@
     Bool                    extensible
 
 cdef struct CCSSettingListInfo:
-    CCSSettingType listType
-    void *         listInfo # actually CCSSettingInfo *, works around pyrex
+    CCSSettingType   listType
+    CCSSettingInfo * listInfo
 
 cdef struct CCSSettingActionInfo:
     Bool internal
@@ -974,7 +974,8 @@
 
     property EnableConflicts:
         def __get__ (self):
-            cdef CCSPluginConflictList * pl, * pls
+            cdef CCSPluginConflictList * pl
+            cdef CCSPluginConflictList * pls
             cdef CCSPluginConflict * pc
             cdef CCSPluginList * ppl
             cdef CCSPlugin * plg
@@ -1002,7 +1003,8 @@
 
     property DisableConflicts:
         def __get__ (self):
-            cdef CCSPluginConflictList * pl, * pls
+            cdef CCSPluginConflictList * pl
+            cdef CCSPluginConflictList * pls
             cdef CCSPluginConflict * pc
             cdef CCSPluginList * ppl
             cdef CCSPlugin * plg

=== modified file 'debian/control'
--- debian/control	2017-04-11 14:01:44 +0000
+++ debian/control	2018-06-27 10:33:58 +0000
@@ -52,7 +52,7 @@
                libprotobuf-dev,
                protobuf-compiler,
                python-all-dev,
-               python-pyrex,
+               cython,
                gsettings-desktop-schemas-dev,
                xserver-xorg-dev (>= 0.7.0),
 Standards-Version: 3.9.8