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

[Modestas Vainius]

Author: modax
Date: 2010-06-22 20:54:40 +0000 (Tue, 22 Jun 2010)
New Revision: 18394

Added:
   trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
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).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-06-22 19:56:11 UTC (rev 18393)
+++ trunk/packages/kdelibs/debian/changelog	2010-06-22 20:54:40 UTC (rev 18394)
@@ -10,6 +10,9 @@
   * Replace 09_disable_usr_lib_install_rpath.diff with a less extreme version
     of the patch from kde4libs trunk which should keep support for
     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).
 
  -- Modestas Vainius <modax at debian.org>  Mon, 07 Jun 2010 20:58:22 +0300
 

Added: trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/31_relax_plugin_kde_version_check.diff	2010-06-22 20:54:40 UTC (rev 18394)
@@ -0,0 +1,26 @@
+Description: relax KDE version check when loading plugins
+ This patch removes the check that kdecore runtime version must be higher or
+ equal to the version a KDE plugin has been compiled against. It does not make
+ much sense since Debian enforces dependencies on the symbol level and kde4libs
+ guarantees binary compatibility.
+ .
+ The worst about this check was that it made impossible for most KDE packages
+ 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.
+Author: Modestas Vainius <modestas at vainius.eu>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585792
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2010-06-22
+
+--- a/kdecore/util/kpluginloader.cpp
++++ b/kdecore/util/kpluginloader.cpp
+@@ -242,7 +242,6 @@ bool KPluginLoader::load()
+     d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
+     if (d->verificationData) {
+         if (d->verificationData->dataVersion < KDEPluginVerificationData::PluginVerificationDataVersion
+-            || (d->verificationData->KDEVersion > KDE_VERSION)
+             || (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);

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-06-22 19:56:11 UTC (rev 18393)
+++ trunk/packages/kdelibs/debian/patches/series	2010-06-22 20:54:40 UTC (rev 18394)
@@ -16,3 +16,4 @@
 28_find_old_kde4_html_documentation.diff
 29_hurd_support.diff
 30_kfileshare_kdesu_fileshareset.diff
+31_relax_plugin_kde_version_check.diff