1 |
commit: 14d7d9cb2219f64c7a715d8da0bbe48a32c9dad8 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 31 21:37:17 2012 +0000 |
4 |
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net> |
5 |
CommitDate: Thu May 31 21:37:17 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=14d7d9cb |
7 |
|
8 |
[kde-base/kdelibs] added kdelibs-4.8.4-bytecode.patch |
9 |
|
10 |
Updated patch is required for kdelibs >4.8.3 |
11 |
|
12 |
--- |
13 |
.../kdelibs/files/kdelibs-4.8.4-bytecode.patch | 78 ++++++++++++++++++++ |
14 |
kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 2 +- |
15 |
kde-base/kdelibs/kdelibs-9999.ebuild | 2 +- |
16 |
3 files changed, 80 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch |
19 |
new file mode 100644 |
20 |
index 0000000..6920121 |
21 |
--- /dev/null |
22 |
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch |
23 |
@@ -0,0 +1,78 @@ |
24 |
+--- cmake/modules/PythonMacros.cmake.orig 2012-05-31 23:28:04.035788719 +0200 |
25 |
++++ cmake/modules/PythonMacros.cmake 2012-05-31 23:30:13.997840354 +0200 |
26 |
+@@ -24,39 +24,41 @@ |
27 |
+ INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR}) |
28 |
+ |
29 |
+ # Byte compile and install the .pyc file. |
30 |
+- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) |
31 |
+- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) |
32 |
+- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) |
33 |
+- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) |
34 |
+- |
35 |
+- if(WIN32) |
36 |
+- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") |
37 |
+- endif(WIN32) |
38 |
+- |
39 |
+- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) |
40 |
+- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) |
41 |
+- |
42 |
+- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) |
43 |
+- |
44 |
+- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") |
45 |
+- |
46 |
+- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) |
47 |
+- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. |
48 |
+- ADD_CUSTOM_COMMAND( |
49 |
+- TARGET compile_python_files |
50 |
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message} |
51 |
+- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
52 |
+- DEPENDS ${_absfilename} |
53 |
+- ) |
54 |
+- ELSE(_abs_bin_py STREQUAL ${_absfilename}) |
55 |
+- ADD_CUSTOM_COMMAND( |
56 |
+- TARGET compile_python_files |
57 |
+- COMMAND ${CMAKE_COMMAND} -E echo ${_message} |
58 |
+- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} |
59 |
+- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
60 |
+- DEPENDS ${_absfilename} |
61 |
+- ) |
62 |
+- ENDIF(_abs_bin_py STREQUAL ${_absfilename}) |
63 |
++ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") |
64 |
++ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE) |
65 |
++ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME) |
66 |
++ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE) |
67 |
++ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH) |
68 |
++ |
69 |
++ if(WIN32) |
70 |
++ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") |
71 |
++ endif(WIN32) |
72 |
++ |
73 |
++ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) |
74 |
++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) |
75 |
++ |
76 |
++ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}) |
77 |
++ |
78 |
++ SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}") |
79 |
++ |
80 |
++ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE) |
81 |
++ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself. |
82 |
++ ADD_CUSTOM_COMMAND( |
83 |
++ TARGET compile_python_files |
84 |
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message} |
85 |
++ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
86 |
++ DEPENDS ${_absfilename} |
87 |
++ ) |
88 |
++ ELSE(_abs_bin_py STREQUAL ${_absfilename}) |
89 |
++ ADD_CUSTOM_COMMAND( |
90 |
++ TARGET compile_python_files |
91 |
++ COMMAND ${CMAKE_COMMAND} -E echo ${_message} |
92 |
++ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py} |
93 |
++ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py} |
94 |
++ DEPENDS ${_absfilename} |
95 |
++ ) |
96 |
++ ENDIF(_abs_bin_py STREQUAL ${_absfilename}) |
97 |
+ |
98 |
+- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) |
99 |
++ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR}) |
100 |
++ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "") |
101 |
+ ENDMACRO(PYTHON_INSTALL) |
102 |
|
103 |
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
104 |
index a5e2f24..b4d5a7b 100644 |
105 |
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
106 |
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild |
107 |
@@ -126,7 +126,7 @@ PATCHES=( |
108 |
"${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
109 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
110 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
111 |
- "${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
112 |
+ "${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
113 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
114 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
115 |
) |
116 |
|
117 |
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild |
118 |
index e744a19..0aeaeee 100644 |
119 |
--- a/kde-base/kdelibs/kdelibs-9999.ebuild |
120 |
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild |
121 |
@@ -126,7 +126,7 @@ PATCHES=( |
122 |
"${FILESDIR}/${PN}-4.7.96-mimetypes.patch" |
123 |
"${FILESDIR}/${PN}-4.4.90-xslt.patch" |
124 |
"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
125 |
- "${FILESDIR}/${PN}-4.6.3-bytecode.patch" |
126 |
+ "${FILESDIR}/${PN}-4.8.4-bytecode.patch" |
127 |
"${FILESDIR}/${PN}-4.8.1-norpath.patch" |
128 |
"${FILESDIR}/${PN}-4.8.2-calculator_key.patch" |
129 |
) |