forked from chenxiaolong/Unity-for-Arch
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path0004_Use_python2.patch
104 lines (83 loc) · 4.93 KB
/
0004_Use_python2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/ccsm compiz-0.9.9~daily12.12.05/compizconfig/ccsm/ccsm
--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/ccsm 2013-01-07 08:01:18.404547238 -0500
+++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/ccsm 2013-01-07 08:02:31.700828058 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: UTF-8 -*-
# This program is free software; you can redistribute it and/or
diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/CMakeLists.txt compiz-0.9.9~daily12.12.05/compizconfig/ccsm/CMakeLists.txt
--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/CMakeLists.txt 2013-01-07 08:01:18.407880554 -0500
+++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/CMakeLists.txt 2013-01-07 08:03:06.863976513 -0500
@@ -12,7 +12,7 @@
execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
# Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
+execute_process (COMMAND python2 -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
OUTPUT_VARIABLE PY_VERSION)
string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
@@ -36,14 +36,14 @@
set (VERSION ${COMPIZ_RELEASE_VERSION})
add_custom_command (OUTPUT ${PY_CCSM_LIB}
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
+ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Generating Python Bytecode")
add_custom_target (ccsm_module ALL DEPENDS
${PY_CCSM_LIB})
-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
+set (UNINSTALL_COMMAND "python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR})
diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/Makefile compiz-0.9.9~daily12.12.05/compizconfig/ccsm/Makefile
--- compiz-0.9.9~daily12.12.05.orig/compizconfig/ccsm/Makefile 2013-01-07 08:01:18.077882286 -0500
+++ compiz-0.9.9~daily12.12.05/compizconfig/ccsm/Makefile 2013-01-07 08:03:25.720543706 -0500
@@ -1,11 +1,11 @@
all:
- @python setup.py build --prefix=${PREFIX}
+ @python2 setup.py build --prefix=${PREFIX}
install: all
- @python setup.py install --prefix=${PREFIX}
+ @python2 setup.py install --prefix=${PREFIX}
uninstall:
- @python setup.py uninstall --prefix=${PREFIX}
+ @python2 setup.py uninstall --prefix=${PREFIX}
clean:
rm -rf build/
diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/CMakeLists.txt compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/CMakeLists.txt
--- compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/CMakeLists.txt 2013-01-07 08:01:18.477880191 -0500
+++ compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/CMakeLists.txt 2013-01-07 08:04:24.600232364 -0500
@@ -5,7 +5,7 @@
execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
# Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
+execute_process (COMMAND python2 -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
OUTPUT_VARIABLE PY_VERSION)
find_package (PythonLibs)
@@ -73,7 +73,7 @@
${PYTHON_LIBRARY_LOCAL}
compizconfig)
-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
+set (UNINSTALL_COMMAND "python2 ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_BINARY_DIR})
@@ -101,7 +101,7 @@
if (COMPIZ_BUILD_TESTING)
find_program (BASH_EXECUTABLE bash)
- find_program (PYTHON_EXECUTABLE python)
+ find_program (PYTHON_EXECUTABLE python2)
mark_as_advanced (FORCE PYTHON_EXECUTABLE)
file (GLOB PYTHON_TESTS "tests/test_*.py")
diff -Nru compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/Makefile compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/Makefile
--- compiz-0.9.9~daily12.12.05.orig/compizconfig/compizconfig-python/Makefile 2013-01-07 08:01:18.477880191 -0500
+++ compiz-0.9.9~daily12.12.05/compizconfig/compizconfig-python/Makefile 2013-01-07 08:04:44.733459576 -0500
@@ -1,11 +1,11 @@
all:
- @python setup.py build --prefix=${PREFIX}
+ @python2 setup.py build --prefix=${PREFIX}
install: all
- @python setup.py install --prefix=${PREFIX}
+ @python2 setup.py install --prefix=${PREFIX}
uninstall:
- @python setup.py uninstall --prefix=${PREFIX}
+ @python2 setup.py uninstall --prefix=${PREFIX}
clean:
rm -rf build/