diff options
| author | Andreas K. Huettel <mail@akhuettel.de> | 2013-01-17 17:37:42 +0100 |
|---|---|---|
| committer | Andreas K. Huettel <mail@akhuettel.de> | 2013-01-17 17:37:42 +0100 |
| commit | b4f52710b7340368b9d7295595475b0f15eb9dcf (patch) | |
| tree | d4ed7c93df8f6381307e1303657a572dc0e19461 /kde-base/pykde4 | |
| parent | aa59f31d68d19aa1abcbcdc311fa6cc5ad3fed9f (diff) | |
| download | kde-b4f52710b7340368b9d7295595475b0f15eb9dcf.tar.gz kde-b4f52710b7340368b9d7295595475b0f15eb9dcf.tar.bz2 kde-b4f52710b7340368b9d7295595475b0f15eb9dcf.zip | |
[kde-base/pykde4] revert recent symlink changes, they cause sandbox failure
Diffstat (limited to 'kde-base/pykde4')
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.9.98-symlink.patch | 27 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.10.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.9.98.ebuild | 2 |
3 files changed, 31 insertions, 0 deletions
diff --git a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch new file mode 100644 index 00000000000..c9eab079eb8 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch @@ -0,0 +1,27 @@ +From fa1b3798477b91492330a6db9e81834d64ce8ec1 Mon Sep 17 00:00:00 2001 +From: "Andreas K. Huettel" <mail@akhuettel.de> +Date: Thu, 17 Jan 2013 17:33:46 +0100 +Subject: [PATCH] Revert "Use a slightly better strategy for symlinking: + although the previous" + +This reverts commit 4e8ee28f3a314edef2a8489854c0ed58ac668070. +--- + tools/pykdeuic4/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt +index 092985d..2209fba 100644 +--- a/tools/pykdeuic4/CMakeLists.txt ++++ b/tools/pykdeuic4/CMakeLists.txt +@@ -10,7 +10,7 @@ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PA + + if (NOT PYKDEUIC4_ALTINSTALL) + # Step 2: Make a the generated symlink a link to "pykdeuic4" +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" ) + endif() + + unset(_uic_name) +-- +1.8.1 + diff --git a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild index 27d5dad7af4..d7ec75a91bc 100644 --- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild +++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} sys-devel/libtool " +PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" ) + pkg_setup() { python_pkg_setup kde4-base_pkg_setup diff --git a/kde-base/pykde4/pykde4-4.9.98.ebuild b/kde-base/pykde4/pykde4-4.9.98.ebuild index 69e5d5e420f..b4d21309fb4 100644 --- a/kde-base/pykde4/pykde4-4.9.98.ebuild +++ b/kde-base/pykde4/pykde4-4.9.98.ebuild @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} sys-devel/libtool " +PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" ) + pkg_setup() { python_pkg_setup kde4-base_pkg_setup |