rev 9120 - in branches/kde4/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2008-01-25 20:59:37 +0000 (Fri, 25 Jan 2008)
New Revision: 9120

Added:
   branches/kde4/packages/kdebindings/debian/patches/
   branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   branches/kde4/packages/kdebindings/debian/patches/series
Modified:
   branches/kde4/packages/kdebindings/debian/
   branches/kde4/packages/kdebindings/debian/changelog
   branches/kde4/packages/kdebindings/debian/control
   branches/kde4/packages/kdebindings/debian/rules
Log:
Do not let python modules link against libpython.



Property changes on: branches/kde4/packages/kdebindings/debian
___________________________________________________________________
Name: svn:ignore
   - tmp
files
*.debhelper
*.substvars

python-kde4
python-kde4-dev
python-kde4-doc

   + tmp
files
*.debhelper
*.substvars
stamp-patched

python-kde4
python-kde4-dev
python-kde4-doc


Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog	2008-01-25 20:17:17 UTC (rev 9119)
+++ branches/kde4/packages/kdebindings/debian/changelog	2008-01-25 20:59:37 UTC (rev 9120)
@@ -3,7 +3,7 @@
   * Initial upload.
 
   [ Adeodato Simó ]
-  * Package PyKDE4 (python-kde4, python-kde4-dev, python-kde4-doc; -dbg
-    versions missing).
+  * Package PyKDE4 (whithout -dbg version for now):
+    + add patch to prevent python modules from linking against libpython.
 
  -- Adeodato Simó <dato at net.com.org.es>  Fri, 25 Jan 2008 20:04:20 +0100

Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control	2008-01-25 20:17:17 UTC (rev 9119)
+++ branches/kde4/packages/kdebindings/debian/control	2008-01-25 20:59:37 UTC (rev 9120)
@@ -2,7 +2,8 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 5), cmake, kdelibs5-dev (>> 4:4.0), libphonon-dev,
+Build-Depends: debhelper (>= 5), cmake, quilt,
+ kdelibs5-dev (>> 4:4.0), libphonon-dev,
  python, python-all-dev, sip4, python-sip4-dev, python-qt4-dev,
  ruby1.8-dev,
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Torsten Marek <shlomme at debian.org>, Adeodato Simó <dato at net.com.org.es>

Added: branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2008-01-25 20:59:37 UTC (rev 9120)
@@ -0,0 +1,26 @@
+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/python/pykde4/cmake/modules/SIPMacros.cmake
++++ b/python/pykde4/cmake/modules/SIPMacros.cmake
+@@ -96,7 +96,6 @@
+         DEPENDS ${_abs_module_sip}
+     )
+     ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
+-    TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
+     TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
+     SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
+ 
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -53,6 +53,9 @@
+ 
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
+ 
++# Do not use --no-undefined for python modules.
++STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
++
+ ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS})

Added: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/series	2008-01-25 20:59:37 UTC (rev 9120)
@@ -0,0 +1 @@
+01_python_modules_dont_link_against_libpython.diff

Modified: branches/kde4/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4/packages/kdebindings/debian/rules	2008-01-25 20:17:17 UTC (rev 9119)
+++ branches/kde4/packages/kdebindings/debian/rules	2008-01-25 20:59:37 UTC (rev 9120)
@@ -1,5 +1,9 @@
 #! /usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
+##
+
 cmake_flags := \
 	-DCMAKE_SKIP_RPATH=true				\
 	-DCMAKE_BUILD_TYPE=Debian			\
@@ -55,7 +59,7 @@
 
 ##
 
-$(objdir)/CMakeCache.txt:
+$(objdir)/CMakeCache.txt: $(QUILT_STAMPFN)
 	-mkdir $(objdir)
 	cd $(objdir) && cmake $(CURDIR) $(cmake_flags) \
 	    -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CFLAGS)"
@@ -82,7 +86,7 @@
 
 ##
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot