[pkg-kde-commits] rev 2627 - in trunk/packages/arts/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-12 17:51:15 +0000 (Mon, 12 Dec 2005)
New Revision: 2627

Added:
   trunk/packages/arts/debian/patches/01_branch_fixes.diff
Modified:
   trunk/packages/arts/debian/changelog
Log:
Steal the one fix in the branch.

And prepare for experimental.


Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog	2005-12-12 17:46:52 UTC (rev 2626)
+++ trunk/packages/arts/debian/changelog	2005-12-12 17:51:15 UTC (rev 2627)
@@ -1,3 +1,11 @@
+arts (1.5.0-2) experimental; urgency=low
+
+  * Upload to experimental.
+
+  * Grab a minor aliasing fix from KDE_3_5_BRANCH.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 12 Dec 2005 12:23:01 -0500
+
 arts (1.5.0-1) alioth; urgency=low
 
   * New upstream release.

Added: trunk/packages/arts/debian/patches/01_branch_fixes.diff
===================================================================
--- trunk/packages/arts/debian/patches/01_branch_fixes.diff	2005-12-12 17:46:52 UTC (rev 2626)
+++ trunk/packages/arts/debian/patches/01_branch_fixes.diff	2005-12-12 17:51:15 UTC (rev 2627)
@@ -0,0 +1,30 @@
+--- kde.orig/x11/x11globalcomm_impl.cc
++++ kde.patched/x11/x11globalcomm_impl.cc
+@@ -81,7 +81,7 @@
+   		unsigned long nitems;
+   		unsigned long bytes_after;
+   		long offset;
+-  		char *buf;
++  		unsigned char *buf;
+ 	
+ 		propertyMap.clear();
+ 
+@@ -94,15 +94,15 @@
+   		{
+ 			XGetWindowProperty( X11display, rootWin, atom, offset, 256,
+                         False, XA_STRING, &type, &format, &nitems, &bytes_after,
+-                        (unsigned char **)&buf);
++                        &buf);
+ 
+ 			if(type == None)	// no property -> no contents
+ 				return;
+ 		
+-    		s += buf;
++    		s += (char*) buf;
+     		offset += nitems/4;
+     		if (buf)
+-      			XFree(buf);
++      			XFree((char*) buf);
+   		}
+ 
+   		// Parse through the property string stripping out key value pairs