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

Sune Vuorela pusling-guest at alioth.debian.org
Sat May 30 18:47:25 UTC 2009 

Author: pusling-guest
Date: 2009-05-30 18:47:25 +0000 (Sat, 30 May 2009)
New Revision: 14727

Modified:
   trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
   trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
   trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
   trunk/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
   trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
   trunk/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff
   trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
Log:
while quilt push ; do quilt refresh ; done

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-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -4,9 +4,9 @@
 
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -66,6 +66,9 @@
+@@ -66,6 +66,9 @@ SET(SIP_EXTRA_OPTIONS -g)
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
+ ADD_DEFINITIONS(-D_REENTRANT -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}")

Modified: trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff	2009-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -1,6 +1,6 @@
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -10,6 +10,18 @@
+@@ -10,6 +10,18 @@ ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMA
      SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
  ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
  

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-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -3,7 +3,7 @@
 
 --- a/csharp/qyoto/core/QObjectExtras.cs
 +++ b/csharp/qyoto/core/QObjectExtras.cs
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ namespace Qyoto {
  		private static extern void FindQObjectChildren(IntPtr parent, IntPtr regexp,
  									string childName, AddToListFn addFn);
  		
@@ -12,7 +12,7 @@
  		private static extern bool ConnectDelegate(IntPtr obj, string signal, Delegate d);
  		
  		public static bool Connect(QObject obj, string signal, NoArgDelegate d) {
-@@ -97,4 +97,4 @@
+@@ -97,4 +97,4 @@ namespace Qyoto {
  			return list;
  		}
  	}
@@ -21,7 +21,7 @@
 +}
 --- 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);
  		
@@ -30,7 +30,7 @@
  		public static extern void InstallInvokeDelegate(InvokeDelegateFn callback);
  		
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
-@@ -905,4 +905,4 @@
+@@ -905,4 +905,4 @@ namespace Qyoto {
  #endregion
  
  	}

Modified: trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2009-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -10,7 +10,7 @@
  KDE::CmdLineArgs.init(1, ["RubberDoc"], about)
 --- a/ruby/korundum/examples/menudemo.rb
 +++ b/ruby/korundum/examples/menudemo.rb
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -21,7 +21,7 @@
  class MainWin < MainWindow
 --- a/ruby/korundum/examples/mimetype.rb
 +++ b/ruby/korundum/examples/mimetype.rb
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -32,7 +32,7 @@
  class MainWin < MainWindow
 --- a/ruby/korundum/examples/systray.rb
 +++ b/ruby/korundum/examples/systray.rb
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -43,7 +43,7 @@
      def initialize(*args)
 --- a/ruby/korundum/examples/uikmdi.rb
 +++ b/ruby/korundum/examples/uikmdi.rb
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ All is not rosy, however:
  
  =end
  
@@ -64,7 +64,7 @@
  about = KDE::AboutData.new("one", "two", "three")
 --- a/ruby/korundum/examples/xmlmenudemo.rb
 +++ b/ruby/korundum/examples/xmlmenudemo.rb
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -86,7 +86,7 @@
  	class Application < Qt::Base
 --- a/ruby/korundum/templates/annotated/basicapp.rb
 +++ b/ruby/korundum/templates/annotated/basicapp.rb
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -97,7 +97,7 @@
  Most Korundum applications will need a main window - the is the top
 --- a/ruby/korundum/templates/annotated/menuapp1.rb
 +++ b/ruby/korundum/templates/annotated/menuapp1.rb
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ copyright holder.
  =end
  
  
@@ -108,7 +108,7 @@
  	TOOLBAR_NEW   = 1
 --- a/ruby/korundum/templates/annotated/menuapp2.rb
 +++ b/ruby/korundum/templates/annotated/menuapp2.rb
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ copyright holder.
  =end
  
  
@@ -119,7 +119,7 @@
  
 --- a/ruby/korundum/templates/annotated/menuapp3.rb
 +++ b/ruby/korundum/templates/annotated/menuapp3.rb
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ copyright holder.
  =end
  
  
@@ -130,7 +130,7 @@
  	STATUSBAR_LEFT   = 1
 --- a/ruby/korundum/templates/annotated/minimal.rb
 +++ b/ruby/korundum/templates/annotated/minimal.rb
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -141,7 +141,7 @@
  =begin
 --- a/ruby/korundum/templates/annotated/systray1.rb
 +++ b/ruby/korundum/templates/annotated/systray1.rb
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -152,7 +152,7 @@
  # It solves the problem described in systray.rb by using
 --- a/ruby/korundum/templates/basic/basicapp.rb
 +++ b/ruby/korundum/templates/basic/basicapp.rb
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -163,7 +163,7 @@
      def initialize(*args)
 --- a/ruby/korundum/templates/basic/menuapp1.rb
 +++ b/ruby/korundum/templates/basic/menuapp1.rb
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ copyright holder.
  =end
  
  
@@ -174,7 +174,7 @@
  	TOOLBAR_NEW   = 1
 --- a/ruby/korundum/templates/basic/menuapp2.rb
 +++ b/ruby/korundum/templates/basic/menuapp2.rb
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ copyright holder.
  =end
  
  
@@ -185,7 +185,7 @@
  
 --- a/ruby/korundum/templates/basic/menuapp3.rb
 +++ b/ruby/korundum/templates/basic/menuapp3.rb
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ copyright holder.
  =end
  
  
@@ -196,7 +196,7 @@
  	STATUSBAR_LEFT   = 1
 --- a/ruby/korundum/templates/basic/minimal.rb
 +++ b/ruby/korundum/templates/basic/minimal.rb
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -207,7 +207,7 @@
  
 --- a/ruby/korundum/templates/basic/systray1.rb
 +++ b/ruby/korundum/templates/basic/systray1.rb
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ dealings in this Software without prior 
  copyright holder.
  =end
  
@@ -1470,7 +1470,7 @@
  $KCODE = 'u'
 --- a/ruby/qtruby/rails_support/active_item_model.rb
 +++ b/ruby/qtruby/rails_support/active_item_model.rb
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@ Written by Richard Dale and Silvio Fonse
  
  =end
  
@@ -1481,7 +1481,7 @@
  #require "active_support"
 --- a/ruby/qtruby/rails_support/active_table_model.rb
 +++ b/ruby/qtruby/rails_support/active_table_model.rb
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ Written by Richard Dale and Silvio Fonse
  
  =end
  

Modified: trunk/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff	2009-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -1,6 +1,5 @@
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/bin/rbqtapi libqt4-ruby-1.4.9/ruby/qtruby/bin/rbqtapi
---- libqt4-ruby-1.4.9~/ruby/qtruby/bin/rbqtapi	2007-04-20 15:03:22.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/bin/rbqtapi	2008-04-29 20:37:31.000000000 +0200
+--- a/ruby/qtruby/bin/rbqtapi
++++ b/ruby/qtruby/bin/rbqtapi
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/env ruby1.8

Modified: trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -2,7 +2,7 @@
 PhononSmoke is useless probably.
 --- 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/10_fix_kimono_dllimports.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff	2009-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/10_fix_kimono_dllimports.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -2,7 +2,7 @@
 
 --- a/csharp/kimono/kde/KUrlExtras.cs
 +++ b/csharp/kimono/kde/KUrlExtras.cs
-@@ -13,13 +13,13 @@
+@@ -13,13 +13,13 @@ namespace Kimono {
  		public class List : List<KUrl> {
  			delegate bool GetNextDictionaryEntryFn(ref IntPtr key, ref IntPtr value);
  			
@@ -22,7 +22,7 @@
  			public List() {}
 --- a/csharp/kimono/kde/KPluginFactoryExtras.cs
 +++ b/csharp/kimono/kde/KPluginFactoryExtras.cs
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ namespace Kimono {
  	using Qyoto;
  
  	public partial class KPluginFactory : QObject, IDisposable {

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-05-30 18:45:52 UTC (rev 14726)
+++ trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2009-05-30 18:47:25 UTC (rev 14727)
@@ -1,8 +1,6 @@
-Index: kdebindings-4.2.2/python/pykde4/CMakeLists.txt
-===================================================================
---- kdebindings-4.2.2.orig/python/pykde4/CMakeLists.txt	2009-04-15 07:59:41.000000000 +0000
-+++ kdebindings-4.2.2/python/pykde4/CMakeLists.txt	2009-04-15 07:59:43.000000000 +0000
-@@ -70,10 +70,13 @@
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -70,10 +70,13 @@ INCLUDE_DIRECTORIES(
      ${KDE4_INCLUDE_DIR}/dnssd
  )
  
@@ -16,4 +14,4 @@
 +SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
  SET(SIP_EXTRA_OPTIONS -g)
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB)

More information about the pkg-kde-commits mailing list