rev 3106 - trunk/packages/kdeutils/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Thu Feb 9 01:11:45 UTC 2006


Author: chrsmrtn
Date: 2006-02-09 01:11:44 +0000 (Thu, 09 Feb 2006)
New Revision: 3106

Added:
   trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff
Log:
kdeutils branch pull. Fixes some kcalc errors.


Added: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff	2006-02-09 01:11:11 UTC (rev 3105)
+++ trunk/packages/kdeutils/debian/patches/01_kdeutils_branch_r507313.diff	2006-02-09 01:11:44 UTC (rev 3106)
@@ -0,0 +1,573 @@
+#DPATCHLEVEL=0
+--- charselectapplet/kcharselectapplet.desktop	(revision 502961)
++++ charselectapplet/kcharselectapplet.desktop	(revision 507313)
+@@ -51,6 +51,7 @@
+ Comment[es]=Seleccionar caracteres extranjeros y especiales para el portapapeles
+ Comment[et]=Võõr- ja erisümbolite valimine lõikepuhvrisse
+ Comment[eu]=Hautatu atzerriko karaketereak eta karaketere bereziak arbelarentzat
++Comment[fi]=Poimi erikoismerkkejä leikepöydälle
+ Comment[fr]=Sélectionner des caractères étrangers et spéciaux
+ Comment[hu]=Más nyelvi és speciális karakterek másolása a vágólapra
+ Comment[is]=Velur útlenda og sérstaka stafi fyrir klippispjaldið
+--- klaptopdaemon/applnk/klaptopdaemon.desktop	(revision 502961)
++++ klaptopdaemon/applnk/klaptopdaemon.desktop	(revision 507313)
+@@ -22,7 +22,7 @@
+ Comment[es]=Monitor de batería del portátil
+ Comment[et]=Sülearvuti aku monitooring
+ Comment[eu]=Magalekoaren bateria begiralea
+-Comment[fi]=Kannettavan koneen paristonvalvonta
++Comment[fi]=Kannettavan koneen akkutarkkailja
+ Comment[fr]=Indicateur de batterie de portable
+ Comment[hu]=A telepek szintjelzője
+ Comment[is]=Rafhlöðueftirlit fyrir ferðavélar
+@@ -60,7 +60,7 @@
+ Name[es]=Monitor de batería del portátil
+ Name[et]=Sülearvuti aku monitooring
+ Name[eu]=Magalekoaren Bateria Begiralea
+-Name[fi]=Paristonvalvonta
++Name[fi]=Akkutarkkailija
+ Name[fr]=Indicateur de batterie de portable
+ Name[ga]=Monatóir Chadhnra Ríomhaire Glúine
+ Name[hi]=लैपटॉप बैटरी मॉनीटर
+--- khexedit/parts/kpart/khexedit2partui.rc	(revision 502961)
++++ khexedit/parts/kpart/khexedit2partui.rc	(revision 507313)
+@@ -1,12 +1,12 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+ <kpartgui name="khexedit2part" version="1">
+ <MenuBar>
+-  <Menu name="edit">
++  <Menu name="edit"><text>&amp;Edit</text>
+     <Action name="edit_copy" group="edit_paste_merge" />
+     <Action name="edit_select_all" group="edit_select_merge" />
+     <Action name="edit_deselect" group="edit_select_merge" />
+   </Menu>
+-  <Menu name="view">
++  <Menu name="view"><text>&amp;View</text>
+     <Separator/>
+     <Action name="view_zoom_in" />
+     <Action name="view_zoom_out" />
+@@ -17,7 +17,7 @@
+     <Action name="view_valuecoding" />
+     <Action name="view_charencoding" />
+   </Menu>
+-  <Menu name="settings">
++  <Menu name="settings"><text>&amp;Settings</text>
+     <Separator/>
+     <Action name="resizestyle" group="show_merge" />
+     <Action name="togglecolumns" group="show_merge" />
+--- kmilo/thinkpad/kmilo_thinkpad.desktop	(revision 502961)
++++ kmilo/thinkpad/kmilo_thinkpad.desktop	(revision 507313)
+@@ -14,7 +14,7 @@
+ Name[es]=Plugin para Thinkpad
+ Name[et]=Thinkpadi plugin
+ Name[eu]=Thikpad Plugina
+-Name[fi]=Thinkpad -liitännäinen
++Name[fi]=Thinkpad-liitännäinen
+ Name[fr]=Module externe pour les Thinkpad
+ Name[hu]=Thinkpad bővítőmodul
+ Name[is]=Thinkpad íforrit
+--- kmilo/thinkpad/kcmthinkpad/thinkpad.desktop	(revision 502961)
++++ kmilo/thinkpad/kcmthinkpad/thinkpad.desktop	(revision 507313)
+@@ -19,7 +19,7 @@
+ Name[es]=Portátil IBM Thinkpad
+ Name[et]=IBM Thinkpadi sülearvuti
+ Name[eu]=IBM Thinkpad Magalekoa
+-Name[fi]=IBM Thinkpad kannettava
++Name[fi]=IBM Thinkpad -kannettava
+ Name[fr]=Portable Thinkpad d'IBM
+ Name[hu]=IBM Thinkpad noteszgép
+ Name[is]=IBM ferðavél
+--- kmilo/kmilo_kvaio/kvaio.cpp	(revision 502961)
++++ kmilo/kmilo_kvaio/kvaio.cpp	(revision 507313)
+@@ -351,9 +351,9 @@
+     }
+ 
+     // query all necessary information:
+-    if(mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
++    (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
+                                  bat2Avail, bat2Remaining, bat2Max,
+-                                 acConnected) );
++                                 acConnected);
+ 
+     int remaining;
+     if ( bat1Avail || bat2Avail )
+--- kcalc/kcalcdisplay.cpp	(revision 502961)
++++ kcalc/kcalcdisplay.cpp	(revision 507313)
+@@ -269,8 +269,9 @@
+ 	if (_num_base != NB_DECIMAL)
+ 	{
+ 		_display_amount = new_amount.integerPart();
++		unsigned long long int tmp_workaround = static_cast<unsigned long long int>(_display_amount);
+ 
+-		display_str = QString::number(static_cast<long int>(_display_amount), _num_base).upper();
++		display_str = QString::number(tmp_workaround, _num_base).upper();
+ 		if (display_str.length() > DSP_SIZE)
+ 		{
+ 			sendEvent(EventError);
+@@ -383,7 +384,7 @@
+ 		Q_ASSERT(_period == false  && _eestate == false);
+ 		Q_ASSERT(tmp_string.length() <= DSP_SIZE);
+ 		setText(tmp_string);
+-		_display_amount = static_cast<int>(STRTOUL(_str_int.latin1(), 0, 2));
++		_display_amount = static_cast<unsigned long long int>(STRTOUL(_str_int.latin1(), 0, 2));
+ 		if (_neg_sign)
+ 			_display_amount = -_display_amount;
+ 		//str_size = cvb(_str_int, boh_work, DSP_SIZE);
+@@ -393,7 +394,7 @@
+ 		Q_ASSERT(_period == false  && _eestate == false);
+ 		Q_ASSERT(tmp_string.length() <= DSP_SIZE);
+ 		setText(tmp_string);
+-		_display_amount = static_cast<int>(STRTOUL(_str_int.latin1(), 0, 8));
++		_display_amount = static_cast<unsigned long long int>(STRTOUL(_str_int.latin1(), 0, 8));
+ 		if (_neg_sign)
+ 			_display_amount = -_display_amount;
+ 		break;
+@@ -402,7 +403,7 @@
+ 		Q_ASSERT(_period == false  && _eestate == false);
+ 		Q_ASSERT(tmp_string.length() <= DSP_SIZE);
+ 		setText(tmp_string);
+-		_display_amount = static_cast<int>(STRTOUL(_str_int.latin1(), 0, 16));
++		_display_amount = static_cast<unsigned long long int>(STRTOUL(_str_int.latin1(), 0, 16));
+ 		if (_neg_sign)
+ 			_display_amount = -_display_amount;
+ 		break;
+--- kcalc/knumber/knumber.cpp	(revision 502961)
++++ kcalc/knumber/knumber.cpp	(revision 507313)
+@@ -52,6 +52,21 @@
+   _num = new _knuminteger(num);
+ }
+ 
++KNumber::KNumber(signed long int num)
++{
++  _num = new _knuminteger(num);
++}
++
++KNumber::KNumber(unsigned long int num)
++{
++  _num = new _knuminteger(num);
++}
++
++KNumber::KNumber(unsigned long long int num)
++{
++  _num = new _knuminteger(num);
++}
++
+ KNumber::KNumber(double num)
+ {
+   _num = new _knumfloat(num);
+@@ -632,11 +647,25 @@
+   return true;
+ }
+ 
+-KNumber::operator long int(void) const
++KNumber::operator signed long int(void) const
+ {
+-  return static_cast<long int>(*_num);
++  return static_cast<signed long int>(*_num);
+ }
+ 
++KNumber::operator unsigned long int(void) const
++{
++  return static_cast<unsigned long int>(*_num);
++}
++
++KNumber::operator unsigned long long int(void) const
++{
++  KNumber tmp_num = this->abs().integerPart();
++  return  static_cast<unsigned long int>(*this) +
++  (static_cast<unsigned long long int>(
++				       static_cast<unsigned long int>(tmp_num >> KNumber("32"))) << 32) ;
++
++}
++
+ KNumber::operator double(void) const
+ {
+   return static_cast<double>(*_num);
+--- kcalc/knumber/knumber_priv.cpp	(revision 502961)
++++ kcalc/knumber/knumber_priv.cpp	(revision 507313)
+@@ -913,7 +913,7 @@
+ 
+ 
+ 
+-_knumerror::operator long int (void) const
++_knumerror::operator signed long int (void) const
+ {
+   // what would be the correct return values here?
+   if (_error == Infinity)
+@@ -924,23 +924,50 @@
+     return 0;
+ }
+ 
+-_knuminteger::operator long int (void) const
++_knumerror::operator unsigned long int (void) const
+ {
++  // what would be the correct return values here?
++  if (_error == Infinity)
++    return 0;
++  if (_error == MinusInfinity)
++    return 0;
++  else // if (_error == UndefinedNumber)
++    return 0;
++}
++
++
++_knuminteger::operator signed long int (void) const
++{
+   return mpz_get_si(_mpz);
+ }
+ 
+-_knumfraction::operator long int (void) const
++_knumfraction::operator signed long int (void) const
+ {
+-  return static_cast<long int>(mpq_get_d(_mpq));
++  return static_cast<signed long int>(mpq_get_d(_mpq));
+ }
+ 
+-_knumfloat::operator long int (void) const
++_knumfloat::operator signed long int (void) const
+ {
+   return mpf_get_si(_mpf);
+ }
+ 
++_knuminteger::operator unsigned long int (void) const
++{
++  return mpz_get_ui(_mpz);
++}
+ 
++_knumfraction::operator unsigned long int (void) const
++{
++  return static_cast<unsigned long int>(mpq_get_d(_mpq));
++}
+ 
++_knumfloat::operator unsigned long int (void) const
++{
++  return mpf_get_ui(_mpf);
++}
++
++
++
+ _knumerror::operator double (void) const
+ {
+   if (_error == Infinity)
+--- kcalc/knumber/knumber.h	(revision 502961)
++++ kcalc/knumber/knumber.h	(revision 507313)
+@@ -105,10 +105,13 @@
+    *
+    */
+   enum ErrorType {UndefinedNumber, Infinity, MinusInfinity};
+-  
+-  KNumber(signed int num = 1);
+-  KNumber(unsigned int num);
+ 
++  KNumber(signed int num = 0);
++  KNumber(unsigned int num);  
++  KNumber(signed long int num);
++  KNumber(unsigned long int num);
++  KNumber(unsigned long long int num);
++
+   KNumber(double num);
+ 
+   KNumber(KNumber const & num);
+@@ -240,7 +243,9 @@
+   KNumber const operator>>(KNumber const & arg2) const;
+ 
+   operator bool(void) const;
+-  operator long int(void) const;
++  operator signed long int(void) const;
++  operator unsigned long int(void) const;
++  operator unsigned long long int(void) const;
+   operator double(void) const;
+ 
+   bool const operator==(KNumber const & arg2) const
+--- kcalc/knumber/knumber_priv.h	(revision 502961)
++++ kcalc/knumber/knumber_priv.h	(revision 507313)
+@@ -63,7 +63,8 @@
+ 
+   virtual int compare(_knumber const &arg2) const = 0;
+ 
+-  virtual operator long int (void) const = 0;
++  virtual operator signed long int (void) const = 0;
++  virtual operator unsigned long int (void) const = 0;
+   virtual operator double (void) const = 0;
+ };
+ 
+@@ -106,7 +107,8 @@
+ 
+   virtual int compare(_knumber const &arg2) const;
+ 
+-  virtual operator long int (void) const;
++  virtual operator signed long int (void) const;
++  virtual operator unsigned long int (void) const;
+   virtual operator double (void) const;
+ 
+  private:
+@@ -132,12 +134,25 @@
+   {
+     mpz_init_set_ui(_mpz, num);
+   }
+-  
++
+   _knuminteger(signed long int num)
+   {
+     mpz_init_set_si(_mpz, num);
+   }
+ 
++  _knuminteger(unsigned long int num)
++  {
++    mpz_init_set_ui(_mpz, num);
++  }
++  
++  _knuminteger(unsigned long long int num)
++  {
++    mpz_init(_mpz);
++    mpz_set_ui(_mpz, static_cast<unsigned long int>(num >> 32));
++    mpz_mul_2exp(_mpz, _mpz, 32);
++    mpz_add_ui(_mpz, _mpz, static_cast<unsigned long int>(num));
++  }
++
+   _knuminteger(_knumber const & num);
+ 
+   _knuminteger(const QString & num);
+@@ -172,7 +187,8 @@
+ 
+   virtual _knumber * power(_knumber const & exponent) const;
+ 
+-  virtual operator long int (void) const;
++  virtual operator signed long int (void) const;
++  virtual operator unsigned long int (void) const;
+   virtual operator double (void) const;
+ 
+   _knuminteger * intAnd(_knuminteger const &arg2) const;
+@@ -234,7 +250,8 @@
+   
+   virtual int compare(_knumber const &arg2) const;
+ 
+-  virtual operator long int (void) const;
++  virtual operator signed long int (void) const;
++  virtual operator unsigned long int (void) const;
+   virtual operator double (void) const;
+ 
+  private:
+@@ -286,7 +303,8 @@
+ 
+   virtual int compare(_knumber const &arg2) const;
+ 
+-  virtual operator long int (void) const;
++  virtual operator signed long int (void) const;
++  virtual operator unsigned long int (void) const;
+   virtual operator double (void) const;
+ 
+  private:
+--- kcalc/version.h	(revision 502961)
++++ kcalc/version.h	(revision 507313)
+@@ -1 +1 @@
+-#define KCALCVERSION "2.0.1"
++#define KCALCVERSION "2.0.2"
+--- superkaramba/src/karamba.cpp	(revision 502961)
++++ superkaramba/src/karamba.cpp	(revision 507313)
+@@ -544,7 +544,7 @@
+         QFileInfo info(path);
+         if( info.isRelative())
+           path = m_theme.path() +"/" + path;
+-        (new karamba( path, false ))->show();
++        (new karamba( path, QString() ))->show();
+       }
+ 
+       if(lineParser.meter() == "<GROUP>")
+@@ -1903,7 +1903,7 @@
+ {
+   //qDebug("karamba::readProperties");
+   config->setGroup("session");
+-  QString atheme = config->readEntry("theme","");
++  QString atheme = config->readEntry("theme");
+ }
+ 
+ //Register types of events that can be dragged on our widget
+--- superkaramba/src/karambaapp.h	(revision 502961)
++++ superkaramba/src/karambaapp.h	(revision 507313)
+@@ -76,8 +76,6 @@
+     void deleteKaramba(karamba* k, bool reloading = false);
+     bool hasKaramba(karamba* k);
+ 
+-    static bool lockKaramba();
+-    static void unlockKaramba();
+     static void checkSuperKarambaDir();
+ 
+   public slots:
+--- superkaramba/src/superkaramba.kcfg	(revision 502961)
++++ superkaramba/src/superkaramba.kcfg	(revision 507313)
+@@ -9,8 +9,8 @@
+     </entry>
+   </group>
+   <group name="themes">
+-    <entry name="UserAddedThemes" type="StringList">
++    <entry name="UserAddedThemes" type="PathList">
+       <label>Themes that user added to theme list.</label>
+     </entry>
+   </group>
+-</kcfg>
+\ No newline at end of file
++</kcfg>
+--- superkaramba/src/karambaapp.cpp	(revision 502961)
++++ superkaramba/src/karambaapp.cpp	(revision 507313)
+@@ -245,7 +245,7 @@
+   {
+     KConfig* config = app.sessionConfig();
+     config->setGroup("General Options");
+-    QString restartThemes = config->readEntry("OpenThemes","");
++    QString restartThemes = config->readEntry("OpenThemes");
+ 
+     //Get themes that were running
+     lst = QStringList::split(QString(";"), restartThemes);
+@@ -279,7 +279,7 @@
+   {
+     karamba *mainWin = 0;
+ 
+-    mainWin = new karamba(*it , false);
++    mainWin = new karamba(*it , QString());
+     mainWin->show();
+     result = true;
+   }
+@@ -312,39 +312,6 @@
+   return karambaList->containsRef(k) > 0;
+ }
+ 
+-// XXX: I guess this should be made with mutex/semaphores
+-// but this is good for now...
+-
+-bool KarambaApplication::lockKaramba()
+-{
+-  QString file = QDir::home().absPath() + "/.superkaramba/.lock";
+-
+-  fd = open(file.ascii(), O_CREAT | O_RDWR);
+-  if (fd < 0)
+-  {
+-    qWarning("Open failed in lock.");
+-    return false;
+-  }
+-  //qDebug("lock %d", getpid());
+-  if(lockf(fd, F_LOCK, 0))
+-  {
+-    qWarning("Lock failed.");
+-    return false;
+-  }
+-  return true;
+-}
+-
+-void KarambaApplication::unlockKaramba()
+-{
+-  if(fd > 0)
+-  {
+-    lockf(fd, F_ULOCK, 0);
+-    //qDebug("Unlock %d", getpid());
+-    close(fd);
+-    fd = -1;
+-  }
+-}
+-
+ void KarambaApplication::hideSysTray(bool hide)
+ {
+   //kdDebug() << k_funcinfo << endl;
+--- superkaramba/src/themesdlg.cpp	(revision 502961)
++++ superkaramba/src/themesdlg.cpp	(revision 507313)
+@@ -195,7 +195,7 @@
+     ThemeFile* tf = w->themeFile();
+     if(tf)
+     {
+-      (new karamba(tf->file(), false))->show();
++      (new karamba(tf->file(), QString()))->show();
+     }
+   }
+ }
+@@ -210,7 +210,7 @@
+   {
+     ThemeFile file(*it);
+     if(file.isValid())
+-      (new karamba(*it, false))->show();
++      (new karamba(*it, QString()))->show();
+   }
+ }
+ 
+@@ -219,8 +219,8 @@
+ #ifdef HAVE_KNEWSTUFF
+   KConfig* config = KGlobal::config();
+   config->setGroup("KNewStuff");
+-  config->writeEntry("ProvidersUrl",
+-      "http://download.kde.org/khotnewstuff/karamba-providers.xml");
++  config->writePathEntry("ProvidersUrl",
++      QString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+   config->sync();
+   m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
+   //This check is b/c KNewStuff will download, throw an error, 
+@@ -429,10 +429,7 @@
+   kdDebug() << "isDownloaded path: " << path << endl;
+   KConfig* config = KGlobal::config();
+   config->setGroup("KNewStuffNames");
+-  if( !config->readEntry(path).isEmpty() )
+-    return true;
+-  else
+-    return false;
++  return !config->readEntry(path).isEmpty();
+ }
+ 
+ void ThemesDlg::uninstall()
+--- superkaramba/src/misc_python.cpp	(revision 502961)
++++ superkaramba/src/misc_python.cpp	(revision 507313)
+@@ -459,7 +459,7 @@
+ 
+   if( file.exists() )
+     {
+-      currTheme = new karamba( filename, false );
++      currTheme = new karamba( filename, QString() );
+       currTheme->show();
+     }
+ 
+--- superkaramba/src/karambainterface.cpp	(revision 502961)
++++ superkaramba/src/karambainterface.cpp	(revision 507313)
+@@ -72,7 +72,7 @@
+   QFileInfo file(filename);
+   if(file.exists())
+   {
+-    (new karamba(filename, false))->show();
++    (new karamba(filename, QString()))->show();
+   }
+ }
+ 
+--- superkaramba/src/main.cpp	(revision 502961)
++++ superkaramba/src/main.cpp	(revision 507313)
+@@ -22,6 +22,7 @@
+ 
+ #include <karambaapp.h>
+ #include <qobject.h>
++#include <qmutex.h>
+ 
+ #include <kaboutdata.h>
+ #include <kcmdlineargs.h>
+@@ -86,6 +87,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++    QMutex mutex;
+ #ifdef KARAMBA_LOG
+     qInstallMsgHandler(karambaMessageOutput);
+ #endif
+@@ -110,7 +112,9 @@
+     // Create ~/.superkaramba if necessary
+     KarambaApplication::checkSuperKarambaDir();
+ 
+-    KarambaApplication::lockKaramba();
++    // Exit (instead of waiting) if another superkaramba has the lock.
++    if (!mutex.tryLock())
++      return ret;
+ 
+     KarambaApplication app;
+ 
+@@ -126,7 +130,7 @@
+       app.initDcopStub();
+     }
+ 
+-    KarambaApplication::unlockKaramba();
++    mutex.unlock();
+ 
+     app.connect(qApp,SIGNAL(lastWindowClosed()),qApp,SLOT(quit()));
+ 




More information about the pkg-kde-commits mailing list