[SCM] plasma-desktop packaging branch, master, updated. debian/4%5.12.0-2-4-g7931374

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=b8734a5

The following commit has been merged in the master branch:
commit b8734a50150f1b172e78f0a454cf6c892d6f383d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 15 10:36:02 2018 +0100

    [lookandfeel kcm] Do not declare plugin in lookandfeeltool code version
---
 ...Do-not-declare-plugin-in-lookandfeeltool-.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 54 insertions(+)

diff --git a/debian/patches/lookandfeel-kcm-Do-not-declare-plugin-in-lookandfeeltool-.patch b/debian/patches/lookandfeel-kcm-Do-not-declare-plugin-in-lookandfeeltool-.patch
new file mode 100644
index 0000000..5fc718e
--- /dev/null
+++ b/debian/patches/lookandfeel-kcm-Do-not-declare-plugin-in-lookandfeeltool-.patch
@@ -0,0 +1,53 @@
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Tue, 13 Feb 2018 17:50:53 +0100
+Subject: [lookandfeel kcm] Do not declare plugin in lookandfeeltool code
+ version
+
+Summary:
+Also improves race condition on creating the JSON file and running
+automoc over the cpp file which refers to it, given there is no
+dependency chain defined at all for the lookandfeeltool target and
+that kcm_lookandfeel.json, which was prone to make highly parallel
+builds fail
+
+Reviewers: #freebsd, tcberner, bshah, mart, davidedmundson
+
+Reviewed By: davidedmundson
+
+Subscribers: davidedmundson, rikmills, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D10485
+---
+ kcms/lookandfeel/CMakeLists.txt | 2 ++
+ kcms/lookandfeel/kcm.cpp        | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt
+index d854eb9..c96bceb 100644
+--- a/kcms/lookandfeel/CMakeLists.txt
++++ b/kcms/lookandfeel/CMakeLists.txt
+@@ -71,6 +71,8 @@ set(lookandfeeltool_SRCS
+ qt5_add_dbus_interface(lookandfeeltool_SRCS ${klauncher_xml} klauncher_iface)
+ 
+ add_executable(lookandfeeltool ${lookandfeeltool_SRCS})
++# TODO: load kcm plugin instead of using code copy
++target_compile_definitions(lookandfeeltool PRIVATE -DDEFINE_NO_PLUGIN)
+ 
+ target_link_libraries(lookandfeeltool
+   KF5::KIOWidgets
+diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
+index f5582f7..df83b7d 100644
+--- a/kcms/lookandfeel/kcm.cpp
++++ b/kcms/lookandfeel/kcm.cpp
+@@ -57,7 +57,9 @@
+ #  include <X11/extensions/Xfixes.h>
+ #endif
+ 
++#ifndef DEFINE_NO_PLUGIN
+ K_PLUGIN_FACTORY_WITH_JSON(KCMLookandFeelFactory, "kcm_lookandfeel.json", registerPlugin<KCMLookandFeel>();)
++#endif
+ 
+ KCMLookandFeel::KCMLookandFeel(QObject* parent, const QVariantList& args)
+     : KQuickAddons::ConfigModule(parent, args)
diff --git a/debian/patches/series b/debian/patches/series
index 830bdcc..565a042 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 allow_uxterm_overrides.diff
+lookandfeel-kcm-Do-not-declare-plugin-in-lookandfeeltool-.patch

-- 
plasma-desktop packaging