[SCM] smokekde packaging branch, master, updated. 680ab028cc62fe6ca445a5fdb49964c5f5446f76

[Pino Toscano]

The following commit has been merged in the master branch:
commit 680ab028cc62fe6ca445a5fdb49964c5f5446f76
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 16 21:53:35 2011 +0200

    backport two upstream patches
    
    - fix-kutils-linking.patch: fix the link of smokekutils
    - fix-knewstuff2-binding.patch: fix the generation of smokeknewstuff2
---
 debian/changelog                            |    3 ++
 debian/patches/fix-knewstuff2-binding.patch |   46 +++++++++++++++++++++++++++
 debian/patches/fix-kutils-linking.patch     |   31 ++++++++++++++++++
 debian/patches/series                       |    2 +
 4 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83dee72..2c3af6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ smokekde (4:4.7.0-0r1) UNRELEASED; urgency=low
     - pass sodeps as dh addon
   * Update copyright.
   * Update lintian overrides.
+  * Backport upstream patches:
+    - fix-kutils-linking.patch: fix the link of smokekutils
+    - fix-knewstuff2-binding.patch: fix the generation of smokeknewstuff2
 
   [ Modestas Vainius ]
   * Remove myself from Uploaders.
diff --git a/debian/patches/fix-knewstuff2-binding.patch b/debian/patches/fix-knewstuff2-binding.patch
new file mode 100644
index 0000000..8242a62
--- /dev/null
+++ b/debian/patches/fix-knewstuff2-binding.patch
@@ -0,0 +1,46 @@
+From 783511a71156c4d72b3c8fdcd7694448d532934c Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 16 Aug 2011 21:45:08 +0200
+Subject: [PATCH] fix knewstuff2 binding
+
+reference actual used classes, like Author, Engine, Entry, and KTranslatable, in addition to Button;
+remove non-existing classes;
+include the proper header for Button
+---
+ knewstuff2/knewstuff2_includes.h |    1 +
+ knewstuff2/smokeconfig.xml       |    7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/knewstuff2/knewstuff2_includes.h b/knewstuff2/knewstuff2_includes.h
+index b394c1d..c8b47eb 100644
+--- a/knewstuff2/knewstuff2_includes.h
++++ b/knewstuff2/knewstuff2_includes.h
+@@ -3,6 +3,7 @@
+ #include <knewstuff2/core/category.h>
+ #include <knewstuff2/core/ktranslatable.h>
+ #include <knewstuff2/core/installation.h>
++#include <knewstuff2/ui/knewstuffbutton.h>
+ #include <knewstuff2/ui/knewstuffaction.h>
+ #include <knewstuff2/engine.h>
+ #include <knewstuff2/knewstuff_export.h>
+diff --git a/knewstuff2/smokeconfig.xml b/knewstuff2/smokeconfig.xml
+index a60b2bc..a8c54cf 100644
+--- a/knewstuff2/smokeconfig.xml
++++ b/knewstuff2/smokeconfig.xml
+@@ -42,9 +42,10 @@
+         <name>.*i18n.*</name>
+     </functions>
+     <classList>
++        <class>KNS::Author</class>
+         <class>KNS::Button</class>
+-        <class>KNS::CoreEngine</class>
+-        <class>KNS::ProviderLoader</class>
+-        <class>KNS::UploadDialog</class>
++        <class>KNS::Engine</class>
++        <class>KNS::Entry</class>
++        <class>KNS::KTranslatable</class>
+     </classList>
+ </config>
+-- 
+1.7.5.4
+
diff --git a/debian/patches/fix-kutils-linking.patch b/debian/patches/fix-kutils-linking.patch
new file mode 100644
index 0000000..4b76979
--- /dev/null
+++ b/debian/patches/fix-kutils-linking.patch
@@ -0,0 +1,31 @@
+From fa260d7399bbeede0aa4c48bf4ae226f3030b3b0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 16 Aug 2011 21:41:21 +0200
+Subject: [PATCH] fix kutils linking
+
+instead of linking to the (now empty) kutils library, link directly to the kemoticons, kidletime, kcmutils, and kprintutils libraries
+this avoids potential issues when linking in "as-needed" mode
+---
+ kutils/CMakeLists.txt |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
+index cae67e7..3d61109 100644
+--- a/kutils/CMakeLists.txt
++++ b/kutils/CMakeLists.txt
+@@ -34,8 +34,10 @@ target_link_libraries(smokekutils
+     ${QT_QTGUI_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KDEUI_LIBS}
+-    ${KDE4_KIO_LIBS}
+-    ${KDE4_KUTILS_LIBS}
++    ${KDE4_KEMOTICONS_LIBS}
++    ${KDE4_KIDLETIME_LIBS}
++    ${KDE4_KCMUTILS_LIBS}
++    ${KDE4_KPRINTUTILS_LIBS}
+     smokekdeui
+     ${SMOKE_QTCORE_LIBRARY}
+     ${SMOKE_BASE_LIBRARY}
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2f86615..02bc90f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 fix_smoke_config_install_path.diff
+fix-kutils-linking.patch
+fix-knewstuff2-binding.patch

-- 
smokekde packaging