rev 13753 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

Pino Toscano pino-guest at alioth.debian.org
Sun Feb 8 23:19:04 UTC 2009


Author: pino-guest
Date: 2009-02-08 23:19:04 +0000 (Sun, 08 Feb 2009)
New Revision: 13753

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/02_r923562_kephal_qreal_dbus.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
Log:
Add patch 02_r923562_kephal_qreal_dbus.diff from upstream r923562
should hopefully fix build of kephal in archs where qreal is not double (but float)


Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-08 20:45:10 UTC (rev 13752)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-08 23:19:04 UTC (rev 13753)
@@ -27,8 +27,13 @@
   * Add patch 01_r922805_kdm_qt4.5_crash_fix.diff from upstream, which fixes
     a kdm crash with Qt 4.5-rc1.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Feb 2009 18:46:22 +0200
+  +++ Changes by Pino Toscano:
 
+  * Add patch 02_r923562_kephal_qreal_dbus.diff from upstream r923562 to fix
+    build of kephal in archs where qreal is not double.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Feb 2009 00:18:02 +0200
+
 kdebase-workspace (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.

Added: branches/kde4.2/packages/kdebase-workspace/debian/patches/02_r923562_kephal_qreal_dbus.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/02_r923562_kephal_qreal_dbus.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/02_r923562_kephal_qreal_dbus.diff	2009-02-08 23:19:04 UTC (rev 13753)
@@ -0,0 +1,70 @@
+Index: workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.h
+===================================================================
+--- workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.h	(revisione 922899)
++++ workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.h	(copia locale)
+@@ -52,11 +52,11 @@
+         bool isConnected(QString id);
+         bool isActivated(QString id);
+         int rotation(QString id);
+-        qreal rate(QString id);
++        double rate(QString id);
+         bool reflectX(QString id);
+         bool reflectY(QString id);
+         int numAvailableRates(QString id);
+-        qreal availableRate(QString id, int index);
++        double availableRate(QString id, int index);
+         
+     Q_SIGNALS:
+         void outputConnected(QString id);
+Index: workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.cpp
+===================================================================
+--- workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.cpp	(revisione 922899)
++++ workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.cpp	(copia locale)
+@@ -109,10 +109,10 @@
+     return false;
+ }
+ 
+-bool DBusAPIConfigurations::changeRate(QString output, qreal rate) {
++bool DBusAPIConfigurations::changeRate(QString output, double rate) {
+     Output * o = Outputs::self()->output(output);
+     if (o) {
+-        return Configurations::self()->changeRate(o, rate);
++        return Configurations::self()->changeRate(o, static_cast<float>(rate));
+     }
+     return false;
+ }
+Index: workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.h
+===================================================================
+--- workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.h	(revisione 922899)
++++ workspace/libs/kephal/kded_kephal/dbus/dbusapi_configurations.h	(copia locale)
+@@ -51,7 +51,7 @@
+         bool move(QString output, QPoint position);
+         bool resize(QString output, QSize size);
+         bool rotate(QString output, int rotation);
+-        bool changeRate(QString output, qreal rate);
++        bool changeRate(QString output, double rate);
+         bool reflectX(QString output, bool reflect);
+         bool reflectY(QString output, bool reflect);
+         int screen(QString output);
+Index: workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.cpp
+===================================================================
+--- workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.cpp	(revisione 922899)
++++ workspace/libs/kephal/kded_kephal/dbus/dbusapi_outputs.cpp	(copia locale)
+@@ -127,7 +127,7 @@
+     return 0;
+ }
+ 
+-qreal DBusAPIOutputs::availableRate(QString id, int i)
++double DBusAPIOutputs::availableRate(QString id, int i)
+ {
+     if (! m_rates.contains(id)) {
+         numAvailableRates(id);
+@@ -146,7 +146,7 @@
+     return RotateNormal;
+ }
+ 
+-qreal DBusAPIOutputs::rate(QString id) {
++double DBusAPIOutputs::rate(QString id) {
+     Output * output = Outputs::self()->output(id);
+     if (output && output->isActivated()) {
+         return output->rate();

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-08 20:45:10 UTC (rev 13752)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-08 23:19:04 UTC (rev 13753)
@@ -1,4 +1,5 @@
 01_r922805_kdm_qt4.5_crash_fix.diff
+02_r923562_kephal_qreal_dbus.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff




More information about the pkg-kde-commits mailing list