rev 8838 - in branches/kde4/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-01-09 05:29:18 +0000 (Wed, 09 Jan 2008)
New Revision: 8838

Added:
   branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs-bin.lintian
   branches/kde4/packages/kdelibs/debian/kdelibs5.lintian
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
Add patch to fix make it build in arm and hopefully armel.
Fix some annoying: no final newline


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-09 05:10:20 UTC (rev 8837)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-09 05:29:18 UTC (rev 8838)
@@ -13,8 +13,10 @@
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
   * Update patch 15_kfreebsd_support to build in kfreebsd after latest changes
-    in ConfigureChecks.cmake. 
-  * Update lintian overides.
+    in ConfigureChecks.cmake.
+  * Update lintian overrides.
+  * Add patch to fix make it build in arm and hopefully armel. Thanks Aurel.
+    (Closes: #459515)
 
   +++ Changes by Matthew Rosewarne:
 
@@ -23,7 +25,7 @@
   * Replace dependency on xbase-clients with xauth.
   * Replace source:Version with binary:Version.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Jan 2008 06:12:25 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Jan 2008 06:19:10 +0100
 
 kde4libs (4:3.98.0~svn755919-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdelibs/debian/kdelibs-bin.lintian
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs-bin.lintian	2008-01-09 05:10:20 UTC (rev 8837)
+++ branches/kde4/packages/kdelibs/debian/kdelibs-bin.lintian	2008-01-09 05:29:18 UTC (rev 8838)
@@ -4,4 +4,5 @@
 kdelibs-bin: no-shlibs-control-file usr/lib/libkdeinit4_kconf_update.so
 kdelibs-bin: no-shlibs-control-file usr/lib/libkdeinit4_kio_http_cache_cleaner.so
 kdelibs-bin: postinst-must-call-ldconfig usr/lib/libkdeinit4_kconf_update.so
-kdelibs-bin: package-name-doesnt-match-sonames libkdeinit4-kbuildsycoca4 libkdeinit4-kconf_update libkdeinit4-kded4 libkdeinit4-kio_http_cache_cleaner libkdeinit4-klauncher
\ No newline at end of file
+kdelibs-bin: package-name-doesnt-match-sonames libkdeinit4-kbuildsycoca4 libkdeinit4-kconf_update libkdeinit4-kded4 libkdeinit4-kio_http_cache_cleaner libkdeinit4-klauncher
+

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5.lintian
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5.lintian	2008-01-09 05:10:20 UTC (rev 8837)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5.lintian	2008-01-09 05:29:18 UTC (rev 8838)
@@ -1 +1,2 @@
-kdelibs5: package-name-doesnt-match-sonames libkaudiodevicelist4 libkde3support4 libkdecore5 libkdefakes5 libkdesu5 libkdeui5 libkdnssd4 libkfile4 libkhtml5 libkimproxy4 libkio5 libkjs4 libkjsembed4 libkmediaplayer4 libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 libktexteditor4 libkunittest4 libkutils4 libkwalletbackend4 libnepomuk4 libsolid4 libthreadweaver4
\ No newline at end of file
+kdelibs5: package-name-doesnt-match-sonames libkaudiodevicelist4 libkde3support4 libkdecore5 libkdefakes5 libkdesu5 libkdeui5 libkdnssd4 libkfile4 libkhtml5 libkimproxy4 libkio5 libkjs4 libkjsembed4 libkmediaplayer4 libknewstuff2-4 libknotifyconfig4 libkntlm4 libkparts4 libkpty4 libkrosscore4 libkrossui4 libktexteditor4 libkunittest4 libkutils4 libkwalletbackend4 libnepomuk4 libsolid4 libthreadweaver4
+

Added: branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/16_arm_fixes.diff	2008-01-09 05:29:18 UTC (rev 8838)
@@ -0,0 +1,12 @@
+--- kde4libs-3.98.0~svn755919.orig/khtml/html/html_canvasimpl.cpp
++++ kde4libs-3.98.0~svn755919/khtml/html/html_canvasimpl.cpp
+@@ -1019,7 +1019,7 @@
+ 
+     const CanvasPatternImpl *pattern = static_cast<const CanvasPatternImpl*>(style);
+ 
+-    float penWidth = qMax(p->pen().widthF(), 1.0);
++    float penWidth = qMax(p->pen().widthF(), qreal(1.0));
+     const QRectF rect = path.controlPointRect().adjusted(-penWidth, -penWidth, penWidth, penWidth);
+ 
+     return pattern->clipForRepeat(p->brushOrigin(), rect);
+

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-01-09 05:10:20 UTC (rev 8837)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-01-09 05:29:18 UTC (rev 8838)
@@ -6,3 +6,4 @@
 13_qt4_designer_plugins_path.diff
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
+16_arm_fixes.diff