[SCM] libkscreen packaging branch, master, updated. c0f29a8001687c3908bebe1d3923af3be84673e3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkscreen.git;a=commitdiff;h=6018389

The following commit has been merged in the master branch:
commit 601838932887fce92d70631c2d70687f3a684ab8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 5 19:35:01 2013 +0100

    New patch: plugins_in_ma_paths.diff.
---
 debian/changelog                        |  1 +
 debian/patches/plugins_in_ma_paths.diff | 86 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 88 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e5dc38..5b108ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,6 @@ libkscreen (1.0.2-1) UNRELEASED; urgency=low
 
   * Initial release.
   * New patch: libdir.diff, install in the m-a paths.
+  * New patch: plugins_in_ma_paths.diff.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Dec 2013 12:52:48 +0100
diff --git a/debian/patches/plugins_in_ma_paths.diff b/debian/patches/plugins_in_ma_paths.diff
new file mode 100644
index 0000000..b57da96
--- /dev/null
+++ b/debian/patches/plugins_in_ma_paths.diff
@@ -0,0 +1,86 @@
+Index: libkscreen/src/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/src/CMakeLists.txt	2013-12-05 20:33:23.935292393 +0100
++++ libkscreen/src/CMakeLists.txt	2013-12-05 20:33:23.931292309 +0100
+@@ -10,6 +10,9 @@
+     mode.cpp
+ )
+ 
++add_definitions( -DADDITIONAL_PLUGINS_PATH="${LIB_DESTINATION}/kde4/plugins" )
++add_definitions( -DKSCREEN_MAJOR="${libkscreen_VERSION_MAJOR}" )
++
+ qt4_automoc(${libkscreen_SRCS})
+ 
+ add_library(kscreen SHARED ${libkscreen_SRCS})
+Index: libkscreen/src/backendloader.cpp
+===================================================================
+--- libkscreen.orig/src/backendloader.cpp	2013-12-05 20:33:23.935292393 +0100
++++ libkscreen/src/backendloader.cpp	2013-12-05 20:33:23.931292309 +0100
+@@ -39,9 +39,20 @@
+     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
+     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
+ 
++#ifdef ADDITIONAL_PLUGINS_PATH
++    QCoreApplication::addLibraryPath(ADDITIONAL_PLUGINS_PATH);
++#endif
++
+     const QStringList paths = QCoreApplication::libraryPaths();
+     Q_FOREACH (const QString &path, paths) {
+-        const QDir dir(path + QDir::separator() + QLatin1String("kscreen"),
++        kWarning() << path; // TODO: remove me
++        const QDir dir(path + QDir::separator() +
++                              QLatin1String("kscreen")
++#ifdef KSCREEN_MAJOR
++                              + QDir::separator() +
++                              QLatin1String(KSCREEN_MAJOR)
++#endif
++                              ,
+                        backendFilter,
+                        QDir::SortFlags(QDir::QDir::NoSort),
+                        QDir::NoDotAndDotDot | QDir::Files);
+Index: libkscreen/backends/fake/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/backends/fake/CMakeLists.txt	2013-12-05 20:33:23.935292393 +0100
++++ libkscreen/backends/fake/CMakeLists.txt	2013-12-05 20:33:23.931292309 +0100
+@@ -17,6 +17,6 @@
+                                kscreen
+ )
+ 
+-install(TARGETS KSC_Fake DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/kscreen/)
++install(TARGETS KSC_Fake DESTINATION ${KSCREEN_PLUGIN_DIR})
+ 
+ 
+Index: libkscreen/backends/xrandr/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/backends/xrandr/CMakeLists.txt	2013-12-05 20:33:23.935292393 +0100
++++ libkscreen/backends/xrandr/CMakeLists.txt	2013-12-05 20:33:23.931292309 +0100
+@@ -26,4 +26,4 @@
+                                  kscreen
+ )
+ 
+-install(TARGETS KSC_XRandR DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/kscreen/)
++install(TARGETS KSC_XRandR DESTINATION ${KSCREEN_PLUGIN_DIR})
+Index: libkscreen/backends/xrandr1.1/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/backends/xrandr1.1/CMakeLists.txt	2013-12-05 20:33:23.935292393 +0100
++++ libkscreen/backends/xrandr1.1/CMakeLists.txt	2013-12-05 20:33:23.931292309 +0100
+@@ -27,4 +27,4 @@
+                                    kscreen
+ )
+ 
+-install(TARGETS KSC_XRandR11 DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/kscreen/)
++install(TARGETS KSC_XRandR11 DESTINATION ${KSCREEN_PLUGIN_DIR})
+Index: libkscreen/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/CMakeLists.txt	2013-12-05 20:33:14.959103710 +0100
++++ libkscreen/CMakeLists.txt	2013-12-05 20:33:36.107549177 +0100
+@@ -58,6 +58,9 @@
+     "Library directory name")
+ set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING
+     "Base directory for pkgconfig files")
++set(KSCREEN_PLUGIN_DIR
++    "${LIB_DESTINATION}/kde4/plugins/kscreen/${libkscreen_VERSION_MAJOR}/"
++    CACHE STRING "Base directory for plugins files")
+ 
+ set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+                                   LIBRARY DESTINATION "${LIB_DESTINATION}"
diff --git a/debian/patches/series b/debian/patches/series
index b7e163a..8920961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libdir.diff
+plugins_in_ma_paths.diff

-- 
libkscreen packaging