rev 10101 - in kde-extras/ksplash-engine-moodin/trunk/debian: . patches

[Jonathan Patrick Davies]

Author: jpatrick-guest
Date: 2008-04-10 08:30:39 +0000 (Thu, 10 Apr 2008)
New Revision: 10101

Added:
   kde-extras/ksplash-engine-moodin/trunk/debian/patches/03_disable_cache.diff
   kde-extras/ksplash-engine-moodin/trunk/debian/patches/04_effect_transparency.diff
Modified:
   kde-extras/ksplash-engine-moodin/trunk/debian/changelog
   kde-extras/ksplash-engine-moodin/trunk/debian/control
Log:
* Moodin patches for bug fixes from Ubuntu.


Modified: kde-extras/ksplash-engine-moodin/trunk/debian/changelog
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/changelog	2008-04-10 07:22:14 UTC (rev 10100)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/changelog	2008-04-10 08:30:39 UTC (rev 10101)
@@ -1,5 +1,14 @@
 ksplash-engine-moodin (0.4.2-2) unstable; urgency=low
 
+  +++ Changes by Jonathan Patrick Davies
+  * Updated Standards-Version to 3.7.3.
+  * Moved Homepage field to source stanza.
+  * Added 03_disable_cache.diff from Ubuntu - disables Moodin's caching of
+    splash themes in the user's home directory. Many thanks to Michael Ummels
+    <michael at ummels.de>.
+  * Added 04_effect_transparency.diff from Ubuntu.
+
+  +++ Changes by Fathi Boudra
   * merged patches from ubuntu:
     * add kdepot
     * icon fix

Modified: kde-extras/ksplash-engine-moodin/trunk/debian/control
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/control	2008-04-10 07:22:14 UTC (rev 10100)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/control	2008-04-10 08:30:39 UTC (rev 10101)
@@ -4,7 +4,8 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdebase-dev, ksplash
-Standards-Version: 3.6.2
+Standards-Version: 3.7.3
+Homepage: http://moodwrod.com
 
 Package: ksplash-engine-moodin
 Architecture: any
@@ -23,5 +24,3 @@
  .
  This KDE splash screen engine is based upon Linspire's
  engine by Sean Meiners <Sean.Meiners at LinspireInc.com>
- .
-  Homepage: http://moodwrod.com

Added: kde-extras/ksplash-engine-moodin/trunk/debian/patches/03_disable_cache.diff
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/patches/03_disable_cache.diff	                        (rev 0)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/patches/03_disable_cache.diff	2008-04-10 08:30:39 UTC (rev 10101)
@@ -0,0 +1,99 @@
+--- /src/cache.cpp	2005-07-11 21:27:29.000000000 +0200
++++ /src/cache.cpp	2008-03-26 17:24:56.000000000 +0100
+@@ -19,91 +19,36 @@
+ 
+ #include "cache.h"
+ 
++/* Disabled Cache (Michael Ummels) */
++
+ Cache::Cache(Scaler* scaler, const QString& themeEngine, const QString& theme)
+ {
+-  mScaler = scaler;
+-  mTheme = theme;
+-  mThemeEngine = themeEngine;
+-
+-  if (mScaler->resolutionDiff())
+-    createCacheDir();
+ }
+ 
+ 
+ QImage* Cache::cacheFile(const QString& file)
+ {
+-  // file must be the full path to queried image so that we can return
+-  // a new instance if no cached version exists
+-  QStringList parts = QStringList::split("/", file);
+-  QFile cachedFile(mCacheDir.filePath(parts.last()));
+-
+-  if (!mScaler->resolutionDiff())
+-    return new QImage(file);
+-  else if (isInSync(parts.last()) && cachedFile.exists())
+-    return new QImage(cachedFile.name());
+-  else
+-  {
+-    QImage *i = new QImage(file);
+-    
+-    // update cache if image needs to be scaled (base != target)
+-    if (mScaler->scaleSize(i))
+-      i->save(cachedFile.name(), QImage::imageFormat(file));
+-
+-    writeInfoFile(parts.last());
+-
+-    return i;
+-  }
++  return new QImage(file);
+ }
+ 
+ 
+ void Cache::createCacheDir()
+ {
+-  KUser user;
+-  QString path = user.homeDir() + "/.kde/" + KStandardDirs::kde_default("data");
+-  path += QString("ksplash/cache/%1/%2/%3x%4").arg(mThemeEngine).arg(mTheme).arg(mScaler->targetResolution().width()).arg(mScaler->targetResolution().height()) + "/";
+-
+-  mCacheDir.setPath(path);
+-
+-  QDir d(mCacheDir.path());
+-
+-  if (!d.exists())
+-  {
+-    QStringList parts = QStringList::split("/", mCacheDir.path());
+-    QString tmp;
+-
+-    for (int i = 0; i < parts.count(); i++)
+-    {
+-      tmp += "/" + parts[i];
+-      d = tmp;
+-      d.mkdir(tmp);
+-    }
+-  }
+ }
+ 
+ 
+ void Cache::writeInfoFile(QString& file)
+ {
+-  QFileInfo fi(getFile(file));
+-
+-  KConfig cfg(getFile("info"));
+-  cfg.setGroup("Cached");
+-  cfg.writeEntry(file, fi.lastModified());
+ }
+ 
+ 
+ bool Cache::isInSync(QString& file)
+ {
+-  QFileInfo fi(getFile(file));
+-
+-  KConfig cfg(getFile("info"));
+-  cfg.setGroup("Cached");
+-  QDateTime dt = cfg.readDateTimeEntry(file);
+-  
+-  return (fi.lastModified() == dt);
++  return true;
+ }
+ 
+ 
+ QString Cache::getFile(QString file)
+ {
+-  return mCacheDir.filePath(file);
++  return file;
+ }

Added: kde-extras/ksplash-engine-moodin/trunk/debian/patches/04_effect_transparency.diff
===================================================================
--- kde-extras/ksplash-engine-moodin/trunk/debian/patches/04_effect_transparency.diff	                        (rev 0)
+++ kde-extras/ksplash-engine-moodin/trunk/debian/patches/04_effect_transparency.diff	2008-04-10 08:30:39 UTC (rev 10101)
@@ -0,0 +1,11 @@
+--- /src/effectwidget.cpp	2005-07-11 20:43:38.000000000 +0200
++++ /src/effectwidget.cpp	2007-04-03 14:15:16.000000000 +0200
+@@ -145,7 +145,7 @@
+   if (!bgImage)
+     return;
+ 
+-  QPoint pos(mapToGlobal(QPoint(0, 0)));
++  QPoint pos(mapToParent(QPoint(0, 0)));
+   background = bgImage->copy(pos.x(), pos.y(), width(), height());
+   bitBlt(this, 0, 0, &background);
+ }