rev 16120 - trunk/packages/kdebindings/debian/patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-10-10 23:06:25 +0000 (Sat, 10 Oct 2009)
New Revision: 16120

Modified:
   trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
   trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
   trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
Log:
refresh patches

Modified: trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2009-10-10 21:13:31 UTC (rev 16119)
+++ trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2009-10-10 23:06:25 UTC (rev 16120)
@@ -2,11 +2,9 @@
 uses --no-undefined by default, we have to remove that from the default
 CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
 
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -75,6 +75,9 @@
+@@ -75,6 +75,9 @@ SET(SIP_EXTRA_OPTIONS -g)
  
  ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  

Modified: trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2009-10-10 21:13:31 UTC (rev 16119)
+++ trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2009-10-10 23:06:25 UTC (rev 16120)
@@ -83,7 +83,7 @@
 +require 'Qt4'
  
  module KDE
- 	class Application < Qt::Base
+ 	def KDE.i18n(text, *args)
 --- a/ruby/korundum/templates/annotated/basicapp.rb
 +++ b/ruby/korundum/templates/annotated/basicapp.rb
 @@ -31,7 +31,7 @@ dealings in this Software without prior 

Modified: trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-10-10 21:13:31 UTC (rev 16119)
+++ trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-10-10 23:06:25 UTC (rev 16120)
@@ -1,10 +1,8 @@
 This patch is HACK to make kdebindings build. The resulting
 PhononSmoke is useless probably.
-Index: b/smoke/CMakeLists.txt
-===================================================================
 --- a/smoke/CMakeLists.txt
 +++ b/smoke/CMakeLists.txt
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,7 @@ OPTION(ENABLE_QTWEBKIT_SMOKE "build QtWe
  OPTION(ENABLE_QTSCRIPT_SMOKE "build QtScriptSmoke" ON)
  OPTION(ENABLE_QTUITOOLS_SMOKE "build QtUiToolsSmoke" ON)
  OPTION(ENABLE_QTTEST_SMOKE "build QtTestSmoke" ON)

Modified: trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2009-10-10 21:13:31 UTC (rev 16119)
+++ trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2009-10-10 23:06:25 UTC (rev 16120)
@@ -1,8 +1,6 @@
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -75,6 +75,9 @@
+@@ -75,6 +75,9 @@ INCLUDE_DIRECTORIES(
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
@@ -12,7 +10,7 @@
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
  IF (WIN32)
-@@ -82,7 +85,7 @@
+@@ -82,7 +85,7 @@ IF (WIN32)
  ELSE (WIN32)
      SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
  ENDIF (WIN32)