[SCM] PyKDE4 packaging branch, kde4.11, updated. debian/4.11.2-1
Maximiliano Curia
maxy at alioth.debian.org
Thu Oct 10 07:27:08 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=25cbef9
The following commit has been merged in the kde4.11 branch:
commit 25cbef9597fae14dee739628f675408d54012839
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Oct 9 18:05:28 2013 +0200
Refresh patches.
---
debian/changelog | 1 +
.../patches/python_modules_dont_link_against_libpython.diff | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38eae7a..a7d1820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pykde4 (4:4.11.2-1) experimental; urgency=low
* New upstream release.
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Wed, 09 Oct 2013 16:25:06 +0200
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index 8953b16..bb45fb7 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -8,11 +8,13 @@ Do not link python modules against -lpython2.X. Since KDE4's cmake file
uses --no-undefined by default, we have to remove that from the default
CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,6 +129,9 @@ endif ()
+Index: pykde4/CMakeLists.txt
+===================================================================
+--- pykde4.orig/CMakeLists.txt 2013-10-09 18:04:16.971427532 +0200
++++ pykde4/CMakeLists.txt 2013-10-09 18:04:16.959428011 +0200
+@@ -129,6 +129,9 @@
- add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+ add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public)
+# Do not use --no-undefined for python modules.
+STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
--
PyKDE4 packaging
More information about the pkg-kde-commits
mailing list