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

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-26 22:29:58 +0000 (Mon, 26 Jan 2009)
New Revision: 13593

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
* Steal r917133 (as 00_917133_qreal_portability_fix.diff) from upstream svn
  to fix FTBFS on armel.
* Deprecate external Qt symbols in libplasma3 symbols template
  (Closes: #513133).

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-26 22:22:07 UTC (rev 13592)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-26 22:29:58 UTC (rev 13593)
@@ -3,8 +3,12 @@
   +++ Changes by Modestas Vainius:
 
   * Tweak libplasma3 description.
+  * Steal r917133 (as 00_917133_qreal_portability_fix.diff) from upstream svn
+    to fix FTBFS on armel.
+  * Deprecate external Qt symbols in libplasma3 symbols template
+    (Closes: #513133).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 Jan 2009 22:06:52 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jan 2009 00:06:22 +0200
 
 kde4libs (4:4.2.0-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2009-01-26 22:22:07 UTC (rev 13592)
+++ branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2009-01-26 22:29:58 UTC (rev 13593)
@@ -10,10 +10,10 @@
 #DEPRECATED: PRIVATE: TEMPLINST# _Z13qvariant_castI9QDateTimeET_RK8QVariant at Base 4:4.2.0
 #DEPRECATED: PRIVATE: TEMPLINST# _Z21qMetaTypeDeleteHelperI5QListIP7QWidgetEEvPT_ at Base 4:4.2.0
 #DEPRECATED: PRIVATE: TEMPLINST# _Z24qMetaTypeConstructHelperI5QListIP7QWidgetEEPvPKT_ at Base 4:4.2.0
- _Z8qWarningv at Base 4:4.2.0
- _ZN10QByteArrayD1Ev at Base 4:4.2.0
+#DEPRECATED: PRIVATE: EXTERNAL# _Z8qWarningv at Base 4:4.2.0
+#DEPRECATED: PRIVATE: EXTERNAL# _ZN10QByteArrayD1Ev at Base 4:4.2.0
 #DEPRECATED: PRIVATE: TEMPLINST# _ZN11QMetaTypeIdI5QListIP7QWidgetEE14qt_metatype_idEv at Base 4:4.2.0
- _ZN11QStringListC1ERKS_ at Base 4:4.2.0
+#DEPRECATED: PRIVATE: EXTERNAL# _ZN11QStringListC1ERKS_ at Base 4:4.2.0
  _ZN13QFormInternal10DomInclude4readERK11QDomElement at Base 4:4.2.0
  _ZN13QFormInternal10DomInclude5clearEb at Base 4:4.2.0
  _ZN13QFormInternal10DomIncludeC1Ev at Base 4:4.2.0

Added: branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff	2009-01-26 22:29:58 UTC (rev 13593)
@@ -0,0 +1,11 @@
+--- a/khtml/misc/borderarcstroker.cpp	2009-01-14 06:51:46.000000000 +0000
++++ b/khtml/misc/borderarcstroker.cpp	2009-01-14 06:52:08.000000000 +0000
+@@ -347,7 +347,7 @@
+     const KCubicBezier inner(innerPath.elementAt(0), innerPath.elementAt(1), innerPath.elementAt(2), innerPath.elementAt(3));
+     const KCubicBezier outer(outerPath.elementAt(0), outerPath.elementAt(1), outerPath.elementAt(2), outerPath.elementAt(3));
+ 
+-    qreal a = std::fmod(angle, 360.0);
++    qreal a = std::fmod(angle, qreal(360.0));
+     if (a < 0)
+         a += 360.0;
+ 


Property changes on: branches/kde4.2/packages/kdelibs/debian/patches/00_917133_qreal_portability_fix.diff
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2009-01-26 22:22:07 UTC (rev 13592)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2009-01-26 22:29:58 UTC (rev 13593)
@@ -1,3 +1,4 @@
+00_917133_qreal_portability_fix.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 11_default_kde4_xdg_menu_prefix.diff