rev 15953 - in trunk/packages/kdebindings/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-09-19 22:08:50 +0000 (Sat, 19 Sep 2009)
New Revision: 15953

Added:
   trunk/packages/kdebindings/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
   trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
   trunk/packages/kdebindings/debian/patches/series
Log:
+++ Changes by Sune Vuorela:
* Refresh patches.
* Make kpythonfactory dlopen versioned python library. (Closes: 524685,
  541999)

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2009-09-19 06:35:55 UTC (rev 15952)
+++ trunk/packages/kdebindings/debian/changelog	2009-09-19 22:08:50 UTC (rev 15953)
@@ -24,6 +24,12 @@
     libkde4-ruby1.8. (Closes: #541539)
   * Copyright update
 
+  +++ Changes by Sune Vuorela:
+
+  * Refresh patches.
+  * Make kpythonfactory dlopen versioned python library. (Closes: 524685,
+    541999)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 08 Aug 2009 15:07:37 +0200
 
 kdebindings (4:4.2.96-1) experimental; urgency=low

Modified: trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2009-09-19 06:35:55 UTC (rev 15952)
+++ trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2009-09-19 22:08:50 UTC (rev 15953)
@@ -1,11 +1,9 @@
 The qyotoshared is more of a real library than a basic glue library and sholud be treated as such.
 This at least builds, but is not runtime tested yet.
 
-Index: b/csharp/qyoto/core/QObjectExtras.cs
-===================================================================
 --- a/csharp/qyoto/core/QObjectExtras.cs
 +++ b/csharp/qyoto/core/QObjectExtras.cs
-@@ -21,10 +21,10 @@
+@@ -21,10 +21,10 @@ namespace Qyoto {
  		private static extern void FindQObjectChildren(IntPtr parent, IntPtr regexp,
  									string childName, AddToListFn addFn);
  		
@@ -18,18 +16,16 @@
  		private static extern bool DisconnectDelegate(IntPtr obj, string signal, Delegate d);
  		
  		public static bool Connect(QObject obj, string signal, SlotFunc d) {
-@@ -124,4 +124,4 @@
+@@ -124,4 +124,4 @@ namespace Qyoto {
  			return list;
  		}
  	}
 -}
 \ No newline at end of file
 +}
-Index: b/csharp/qyoto/src/SmokeMarshallers.cs
-===================================================================
 --- a/csharp/qyoto/src/SmokeMarshallers.cs
 +++ b/csharp/qyoto/src/SmokeMarshallers.cs
-@@ -127,7 +127,7 @@
+@@ -127,7 +127,7 @@ namespace Qyoto {
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
  		public static extern void InstallInvokeCustomSlot(InvokeCustomSlotFn callback);
  		
@@ -38,7 +34,7 @@
  		public static extern void InstallInvokeDelegate(InvokeDelegateFn callback);
  		
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
-@@ -1060,4 +1060,4 @@
+@@ -1062,4 +1062,4 @@ namespace Qyoto {
  #endregion
  
  	}

Modified: trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	2009-09-19 06:35:55 UTC (rev 15952)
+++ trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	2009-09-19 22:08:50 UTC (rev 15953)
@@ -1,6 +1,7 @@
 --- a/csharp/plasma/examples/applets/CMakeLists.txt
 +++ b/csharp/plasma/examples/applets/CMakeLists.txt
-@@ -1,3 +1,3 @@
+@@ -1,4 +1,4 @@
+ add_subdirectory( extendertutorial )
 -add_subdirectory( tiger )
 +#add_subdirectory( tiger )
  add_subdirectory( plasmaclock )

Added: trunk/packages/kdebindings/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/12_pythonpluginfactory_use_versioned_python_lib.diff	2009-09-19 22:08:50 UTC (rev 15953)
@@ -0,0 +1,11 @@
+--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
++++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+@@ -297,7 +297,7 @@ QLibrary *LoadPythonLibrary()
+ {
+     QLibrary *pythonLib = new QLibrary();
+     pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
+-    pythonLib->setFileName(LIB_PYTHON);
++    pythonLib->setFileName(LIB_PYTHON+".1");
+     pythonLib->load();
+     return pythonLib;
+ }

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2009-09-19 06:35:55 UTC (rev 15952)
+++ trunk/packages/kdebindings/debian/patches/series	2009-09-19 22:08:50 UTC (rev 15953)
@@ -8,3 +8,4 @@
 08_csharp_plasma_examples.diff
 10_fix_kimono_dllimports.diff
 11_make_pykde4_respect_sip_flags.diff
+12_pythonpluginfactory_use_versioned_python_lib.diff