rev 18395 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-06-22 21:48:32 +0000 (Tue, 22 Jun 2010)
New Revision: 18395

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff
Log:
(Closes: #585792). The patch covers KPluginLoader and plasmoids.
* Urgency=high to get this into testing before 4.4.5 (see #585792).

Release to unstable.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-06-22 20:54:40 UTC (rev 18394)
+++ trunk/packages/kdelibs/debian/changelog	2010-06-22 21:48:32 UTC (rev 18395)
@@ -1,4 +1,4 @@
-kde4libs (4:4.4.4-2~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.4.4-2) unstable; urgency=high
 
   * Improve 10_make_libkdeinit4_private.diff patch:
     - fix kpluginloader.cpp:findLibraryInternal() to find moved libkdeinit4_*s.
@@ -12,9 +12,10 @@
     custom prefix builds (Closes: #586512).
   * Relax KDE version check when loading plugins. This enables plugins compiled
     against newer kde4libs to work with older kde4libs at runtime as well
-    (Closes: #585792).
+    (Closes: #585792). The patch covers KPluginLoader and plasmoids.
+  * Urgency=high to get this into testing before 4.4.5 (see #585792).
 
- -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 20:58:22 +0300
+ -- Modestas Vainius <modax at debian.org>  Wed, 23 Jun 2010 00:27:20 +0300
 
 kde4libs (4:4.4.4-1) unstable; urgency=low
 

Modified: trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff	2010-06-22 20:54:40 UTC (rev 18394)
+++ trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff	2010-06-22 21:48:32 UTC (rev 18395)
@@ -8,6 +8,8 @@
  to migrate to testing before newer kde4libs even if they did not need symbols
  from it. See the bug report for more information about breakage it once caused
  in testing.
+ .
+ This patch also removes similar "later" version check in libplasma.
 Author: Modestas Vainius <modestas at vainius.eu>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585792
 Forwarded: not-needed
@@ -24,3 +26,20 @@
              || (KDE_VERSION_MAJOR << 16 != (d->verificationData->KDEVersion & 0xFF0000)))
          {
              d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, d->verificationData->KDEVersionString);
+--- a/plasma/version.cpp
++++ b/plasma/version.cpp
+@@ -52,12 +52,11 @@ bool isPluginVersionCompatible(unsigned
+ {
+     // we require PLASMA_VERSION_MAJOR and PLASMA_VERSION_MINOR
+     const quint32 minVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, 0, 0);
+-    const quint32 maxVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, PLASMA_VERSION_MINOR, 60);
+ 
+-    if (version < minVersion || version > maxVersion) {
++    if (version < minVersion) {
+         kDebug() << "plugin is compiled against incompatible Plasma version  " << version
+                  << "This build is compatible with" << PLASMA_VERSION_MAJOR << ".0.0 (" << minVersion
+-                 << ") to" << PLASMA_VERSION_STRING << "(" << maxVersion << ")";
++                 << ")";
+         return false;
+     }
+