[arch-commits] Commit in kdelibs/trunk (PKGBUILD use-pythondontwritebytecode.patch)
Andrea Scarpino
andrea at archlinux.org
Fri Nov 9 21:01:24 UTC 2012
Date: Friday, November 9, 2012 @ 16:01:24
Author: andrea
Revision: 170700
Fix a regression in 'Save As' (FS#32560)
Modified:
kdelibs/trunk/PKGBUILD
kdelibs/trunk/use-pythondontwritebytecode.patch
-----------------------------------+
PKGBUILD | 11 ++--
use-pythondontwritebytecode.patch | 91 +++++++++++++++++++-----------------
2 files changed, 56 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-11-09 20:50:42 UTC (rev 170699)
+++ PKGBUILD 2012-11-09 21:01:24 UTC (rev 170700)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -18,11 +18,13 @@
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'archlinux-menu.patch'
- 'use-pythondontwritebytecode.patch')
+ 'use-pythondontwritebytecode.patch'
+ 'fix-save-path.patch')
sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- '08c20f4aaad076264402a1d84c559d75b37c66d3')
+ '1138e78f15faa7221669ea81e313c595000cc953'
+ 'e3d2621bd1451fe7f45a454af970fae108614ddd')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
@@ -32,8 +34,9 @@
# add Archlinux menu entry
patch -p1 -i "${srcdir}"/archlinux-menu.patch
- # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+ # Fixed upstream
patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
+ patch -p1 -i "${srcdir}"/fix-save-path.patch
cd "${srcdir}"
mkdir build
Modified: use-pythondontwritebytecode.patch
===================================================================
--- use-pythondontwritebytecode.patch 2012-11-09 20:50:42 UTC (rev 170699)
+++ use-pythondontwritebytecode.patch 2012-11-09 21:01:24 UTC (rev 170700)
@@ -1,6 +1,18 @@
---- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~ 2012-11-06 10:32:38.564034292 +0000
-+++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake 2012-11-06 10:35:51.829341102 +0000
-@@ -23,53 +23,55 @@
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever at Apache.Org>
+Date: Wed, 07 Nov 2012 19:08:01 +0000
+Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=5a3cedacdb6485f7551090467cffb2cdf150b05a
+---
+Respect PYTHONDONTWRITEBYTECODE environmental variable.
+
+BUG: 276151
+REVIEW: 107228
+---
+
+
+--- a/cmake/modules/PythonMacros.cmake
++++ b/cmake/modules/PythonMacros.cmake
+@@ -23,54 +23,56 @@
# Install the source file.
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
@@ -9,13 +21,23 @@
- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
++ # Byte compile and install the .pyc file.
++ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+
- if(WIN32)
- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
- endif(WIN32)
--
++ if(WIN32)
++ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++ endif(WIN32)
+
- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
++ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+
- # Python 3.2 changed the pyc file location
- IF(PYTHON_SHORT_VERSION GREATER 3.1)
- # To get the right version for suffix
@@ -24,11 +46,21 @@
- ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
- ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
++ # Python 3.2 changed the pyc file location
++ IF(PYTHON_SHORT_VERSION GREATER 3.1)
++ # To get the right version for suffix
++ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++ ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
++ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+
- SET(_message "Byte-compiling ${_bin_py}")
--
++ SET(_message "Byte-compiling ${_bin_py}")
+
- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
- ADD_CUSTOM_COMMAND(
@@ -46,38 +78,6 @@
- DEPENDS ${_absfilename}
- )
- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
-- IF(PYTHON_SHORT_VERSION GREATER 3.1)
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
-- ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
-- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
-- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+ # Byte compile and install the .pyc file.
-+ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+ if(WIN32)
-+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+ endif(WIN32)
-+
-+ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+ # Python 3.2 changed the pyc file location
-+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+ # To get the right version for suffix
-+ STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+ ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+ ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+
-+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+ SET(_message "Byte-compiling ${_bin_py}")
-+
+ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+ ADD_CUSTOM_COMMAND(
@@ -95,7 +95,12 @@
+ DEPENDS ${_absfilename}
+ )
+ ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+
+
+- IF(PYTHON_SHORT_VERSION GREATER 3.1)
+- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+- ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+- ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
+ IF(PYTHON_SHORT_VERSION GREATER 3.1)
+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+ ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
@@ -104,3 +109,5 @@
+ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
ENDMACRO(PYTHON_INSTALL)
+
+
More information about the arch-commits
mailing list