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

David Palacio dpalacio-guest at alioth.debian.org
Mon Jun 8 02:57:46 UTC 2009 

Author: dpalacio-guest
Date: 2009-06-08 02:57:45 +0000 (Mon, 08 Jun 2009)
New Revision: 14899

Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/control
   trunk/packages/kdebindings/debian/libqtscript2.2-cil.install
   trunk/packages/kdebindings/debian/libqtuitools2.2-cil.install
   trunk/packages/kdebindings/debian/libqtwebkit2.2-cil.install
   trunk/packages/kdebindings/debian/libqyoto4.4-cil.install
   trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.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
package .pc files for csharp

TODO: qtruby, phpqt copyright (lgpl)


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/changelog	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,9 +1,12 @@
-kdebindings (4:4.2.4-2) UNRELEASED; urgency=low
+kdebindings (4:4.3.1-1) UNRELEASED; urgency=low
 
-  * Fix sections
+  +++ Changes by David Palacio:
 
- -- Sune Vuorela <debian at pusling.com>  Wed, 03 Jun 2009 09:51:55 +0200
+  * Refresh patches.
+  * Package csharp pkgconfig files.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Jun 2009 16:00:46 +0200
+
 kdebindings (4:4.2.4-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/kdebindings/debian/control
===================================================================
--- trunk/packages/kdebindings/debian/control	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/control	2009-06-08 02:57:45 UTC (rev 14899)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Build-Depends: debhelper (>= 7), quilt,
  kdelibs5-dev (>= 4:4.2.2), libqt4-opengl-dev (>= 4.5.1), libphonon-dev (>= 4:4.3.0),
- libsoprano-dev (>= 2.1.67-2~),
+ libsoprano-dev (>= 2.1.67-2~), libqimageblitz-dev,
  python, python-all-dev, sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-qt4 (>= 4.4.4), python-qt4-dev (>= 4.4.4),
  ruby1.8-dev, ruby1.8, python-support (>= 0.6),
  mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],

Modified: trunk/packages/kdebindings/debian/libqtscript2.2-cil.install
===================================================================
--- trunk/packages/kdebindings/debian/libqtscript2.2-cil.install	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/libqtscript2.2-cil.install	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,3 +1,4 @@
 debian/csharp/qtscript.dll.config        usr/lib/cli/kdebindings-2.2/
 usr/lib/libqtscript-sharp.so             usr/lib/cli/kdebindings-2.2/
 usr/lib/mono/gac/qtscript/*/qtscript.dll usr/lib/cli/kdebindings-2.2/
+usr/lib/pkgconfig/qtscript-sharp.pc

Modified: trunk/packages/kdebindings/debian/libqtuitools2.2-cil.install
===================================================================
--- trunk/packages/kdebindings/debian/libqtuitools2.2-cil.install	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/libqtuitools2.2-cil.install	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,3 +1,4 @@
 debian/csharp/qtuitools.dll.config         usr/lib/cli/kdebindings-2.2/
 usr/lib/libqtuitools-sharp.so              usr/lib/cli/kdebindings-2.2/
 usr/lib/mono/gac/qtuitools/*/qtuitools.dll usr/lib/cli/kdebindings-2.2/
+usr/lib/pkgconfig/qtuitools-sharp.pc

Modified: trunk/packages/kdebindings/debian/libqtwebkit2.2-cil.install
===================================================================
--- trunk/packages/kdebindings/debian/libqtwebkit2.2-cil.install	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/libqtwebkit2.2-cil.install	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,3 +1,4 @@
 debian/csharp/qtwebkit.dll.config        usr/lib/cli/kdebindings-2.2/
 usr/lib/libqtwebkit-sharp.so             usr/lib/cli/kdebindings-2.2/
 usr/lib/mono/gac/qtwebkit/*/qtwebkit.dll usr/lib/cli/kdebindings-2.2/
+usr/lib/pkgconfig/qtwebkit-sharp.pc

Modified: trunk/packages/kdebindings/debian/libqyoto4.4-cil.install
===================================================================
--- trunk/packages/kdebindings/debian/libqyoto4.4-cil.install	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/libqyoto4.4-cil.install	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,3 +1,4 @@
 debian/csharp/qt-dotnet.dll.config         usr/lib/cli/kdebindings-4.4/
 usr/lib/libqyoto.so                        usr/lib/cli/kdebindings-4.4/
 usr/lib/mono/gac/qt-dotnet/*/qt-dotnet.dll usr/lib/cli/kdebindings-4.4/
+usr/lib/pkgconfig/qyoto.pc

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-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2009-06-08 02:57:45 UTC (rev 14899)
@@ -2,11 +2,13 @@
 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
-@@ -66,6 +66,9 @@ SET(SIP_EXTRA_OPTIONS -g)
+@@ -75,6 +75,9 @@
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB)
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  
 +# 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/03_csharp_dont_use_qyotoshared_directly.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,27 +1,35 @@
 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,7 +21,7 @@ namespace Qyoto {
+@@ -21,10 +21,10 @@
  		private static extern void FindQObjectChildren(IntPtr parent, IntPtr regexp,
  									string childName, AddToListFn addFn);
  		
 -		[DllImport("libqyotoshared", CharSet=CharSet.Ansi)]
 +		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
- 		private static extern bool ConnectDelegate(IntPtr obj, string signal, Delegate d);
+ 		private static extern bool ConnectDelegate(IntPtr obj, string signal, Delegate d, IntPtr handle);
  		
- 		public static bool Connect(QObject obj, string signal, NoArgDelegate d) {
-@@ -97,4 +97,4 @@ namespace Qyoto {
+-		[DllImport("libqyotoshared", CharSet=CharSet.Ansi)]
++		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
+ 		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 @@
  			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 @@ namespace Qyoto {
+@@ -127,7 +127,7 @@
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
  		public static extern void InstallInvokeCustomSlot(InvokeCustomSlotFn callback);
  		
@@ -30,7 +38,7 @@
  		public static extern void InstallInvokeDelegate(InvokeDelegateFn callback);
  		
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
-@@ -905,4 +905,4 @@ namespace Qyoto {
+@@ -1060,4 +1060,4 @@
  #endregion
  
  	}

Modified: trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/patches/06_build_smokephonon.diff	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,8 +1,10 @@
 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 @@ OPTION(ENABLE_QTWEBKIT_SMOKE "build QtWe
+@@ -3,7 +3,7 @@
  OPTION(ENABLE_QTSCRIPT_SMOKE "build QtScriptSmoke" ON)
  OPTION(ENABLE_QTUITOOLS_SMOKE "build QtUiToolsSmoke" ON)
  OPTION(ENABLE_QTTEST_SMOKE "build QtTestSmoke" ON)
@@ -10,4 +12,4 @@
 +OPTION(ENABLE_PHONON_SMOKE "build PhononSmoke" ON)
  OPTION(ENABLE_QSCI_SMOKE "build QsciSmoke" ON)
  OPTION(ENABLE_QWT_SMOKE "build QwtSmoke" OFF)
- OPTION(ENABLE_KDE_SMOKE "build KDESmoke" ON)
+ OPTION(ENABLE_QIMAGEBLITZ_SMOKE "build QImageBlitzSmoke" 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-06-06 18:16:45 UTC (rev 14898)
+++ trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2009-06-08 02:57:45 UTC (rev 14899)
@@ -1,7 +1,9 @@
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -70,10 +70,13 @@ INCLUDE_DIRECTORIES(
-     ${KDE4_INCLUDE_DIR}/dnssd
+@@ -75,6 +75,9 @@
+     ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
 +# Pull in ARM configuration options if needed
@@ -9,9 +11,13 @@
 +
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
- SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ IF (WIN32)
+@@ -82,7 +85,7 @@
+ ELSE (WIN32)
+     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ ENDIF (WIN32)
 -SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
 +SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
  SET(SIP_EXTRA_OPTIONS -g)
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB)
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)

More information about the pkg-kde-commits mailing list