[kdelibs/f17] adapt the patch

[Than Ngo]

commit 2a651574eee439ab8dae94aeed7798fab67b3f3c
Author: Than Ngo <than at redhat.com>
Date:   Wed Jun 6 11:21:07 2012 +0200

    adapt the patch

 ...tallation-of-missing-components-when-inst.patch |   58 ++++++--------------
 1 files changed, 16 insertions(+), 42 deletions(-)
---
diff --git a/0002-Trigger-installation-of-missing-components-when-inst.patch b/0002-Trigger-installation-of-missing-components-when-inst.patch
index b786bbf..d6d6867 100644
--- a/0002-Trigger-installation-of-missing-components-when-inst.patch
+++ b/0002-Trigger-installation-of-missing-components-when-inst.patch
@@ -1,28 +1,7 @@
-From 00a8b22ad6dbb03eea18090f6d9f578101632752 Mon Sep 17 00:00:00 2001
-Message-Id: <00a8b22ad6dbb03eea18090f6d9f578101632752.1313007841.git.kevin.kofler at chello.at>
-From: Kevin Kofler <kevin.kofler at chello.at>
-Date: Wed, 10 Aug 2011 21:48:19 +0200
-Subject: [PATCH] Trigger installation of missing components when installing a
- package.
-
-For script engines, the existing metadata (X-Plasma-API) is sufficient.
-
-For data engines, we introduce a new metadata entry:
-X-Plasma-RequiredDataEngines. Third-party packages will have to add this entry
-to benefit from this feature at this time. Automatic support for scanning
-package source code on installation (at least for some languages) is planned,
-but the metadata entry is definitely the most efficient method.
----
- plasma/package.cpp         |   39 +++++++++++++++++++++++++++++++++++++++
- plasma/packagemetadata.cpp |   13 +++++++++++++
- plasma/packagemetadata.h   |    7 +++++++
- 3 files changed, 59 insertions(+), 0 deletions(-)
-
-diff --git a/plasma/package.cpp b/plasma/package.cpp
-index 4c00d36..0a45c87 100644
---- a/plasma/package.cpp
-+++ b/plasma/package.cpp
-@@ -49,8 +49,11 @@
+diff -up kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma/package.cpp
+--- kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002	2012-06-01 14:28:39.306441886 +0200
++++ kdelibs-4.8.4/plasma/package.cpp	2012-06-06 11:19:01.239154039 +0200
+@@ -43,8 +43,11 @@
  #include <kdebug.h>
  
  #include "authorizationmanager.h"
@@ -34,7 +13,7 @@ index 4c00d36..0a45c87 100644
  #include "private/package_p.h"
  #include "private/plasmoidservice_p.h"
  #include "private/service_p.h"
-@@ -603,6 +606,42 @@ bool Package::installPackage(const QString &package,
+@@ -581,6 +584,42 @@ bool Package::installPackage(const QStri
          tempdir.setAutoRemove(false);
      }
  
@@ -76,11 +55,10 @@ index 4c00d36..0a45c87 100644
 +
      if (!servicePrefix.isEmpty()) {
          // and now we register it as a service =)
-         QString metaPath = targetName + "/metadata.desktop";
-diff --git a/plasma/packagemetadata.cpp b/plasma/packagemetadata.cpp
-index 59163b2..8cfaf64 100644
---- a/plasma/packagemetadata.cpp
-+++ b/plasma/packagemetadata.cpp
+         kDebug() << "************************** 1";
+diff -up kdelibs-4.8.4/plasma/packagemetadata.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma/packagemetadata.cpp
+--- kdelibs-4.8.4/plasma/packagemetadata.cpp.libplasma-pk-0002	2011-12-21 01:14:57.000000000 +0100
++++ kdelibs-4.8.4/plasma/packagemetadata.cpp	2012-06-06 11:14:36.743181062 +0200
 @@ -52,6 +52,7 @@ class PackageMetadataPrivate
          QString serviceType;
          QString api;
@@ -89,7 +67,7 @@ index 59163b2..8cfaf64 100644
  };
  
  PackageMetadata::PackageMetadata(const PackageMetadata &other)
-@@ -106,6 +107,7 @@ void PackageMetadata::write(const QString &filename) const
+@@ -108,6 +109,7 @@ void PackageMetadata::write(const QStrin
      config.writeEntry("X-KDE-ParentApp", d->app);
      config.writeEntry("Type", d->type);
      config.writeEntry("X-Plasma-RemoteLocation", d->location);
@@ -97,7 +75,7 @@ index 59163b2..8cfaf64 100644
  }
  
  void PackageMetadata::read(const QString &filename)
-@@ -133,6 +135,7 @@ void PackageMetadata::read(const QString &filename)
+@@ -154,6 +156,7 @@ void PackageMetadata::read(const QString
      d->app = config.readEntry("X-KDE-ParentApp", d->app);
      d->type = config.readEntry("Type", d->type);
      d->location = config.readEntry("X-Plasma-RemoteLocation", d->location);
@@ -105,7 +83,7 @@ index 59163b2..8cfaf64 100644
  }
  
  QString PackageMetadata::name() const
-@@ -225,6 +228,11 @@ QString PackageMetadata::implementationApi() const
+@@ -246,6 +249,11 @@ QString PackageMetadata::implementationA
      return d->api;
  }
  
@@ -117,7 +95,7 @@ index 59163b2..8cfaf64 100644
  void PackageMetadata::setImplementationApi(const QString &api)
  {
      d->api = api;
-@@ -300,6 +308,11 @@ void PackageMetadata::setRemoteLocation(const KUrl &location)
+@@ -321,6 +329,11 @@ void PackageMetadata::setRemoteLocation(
      d->location = location;
  }
  
@@ -129,10 +107,9 @@ index 59163b2..8cfaf64 100644
  void PackageMetadata::setType(const QString &type)
  {
      d->type = type;
-diff --git a/plasma/packagemetadata.h b/plasma/packagemetadata.h
-index b10f0e4..ec396a6 100644
---- a/plasma/packagemetadata.h
-+++ b/plasma/packagemetadata.h
+diff -up kdelibs-4.8.4/plasma/packagemetadata.h.libplasma-pk-0002 kdelibs-4.8.4/plasma/packagemetadata.h
+--- kdelibs-4.8.4/plasma/packagemetadata.h.libplasma-pk-0002	2011-07-27 20:34:38.705247040 +0200
++++ kdelibs-4.8.4/plasma/packagemetadata.h	2012-06-06 11:14:36.743181062 +0200
 @@ -21,6 +21,7 @@
  #define PLASMA_PACKAGEMETADATA_H
  
@@ -161,6 +138,3 @@ index b10f0e4..ec396a6 100644
  private:
      PackageMetadataPrivate * const d;
  };
--- 
-1.7.4.4
-