Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 plasma/plasma-vault/HISTORY                                   |    1 
 plasma/plasma-vault/PRE_BUILD                                 |    5 
 plasma/plasma-vault/patches/0001-networkmanger-optional.patch |   62 
++++++++++
 plasma/plasma-workspace/HISTORY                               |    1 
 plasma/plasma-workspace/PRE_BUILD                             |    3 
 plasma/plasma-workspace/patches/0001-kjsembed-optional.patch  |   55 --------
 6 files changed, 69 insertions(+), 58 deletions(-)

New commits:
commit bb5ef167cdfb734ba58defe005565d9188609243
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    plasma-vault - build without networkmanager

commit 8d22585363909be25771df9ba75f7ea68742839a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    plasma-workspace - delete patching

diff --git a/plasma/plasma-vault/HISTORY b/plasma/plasma-vault/HISTORY
index da8caa6..da7c9c3 100644
--- a/plasma/plasma-vault/HISTORY
+++ b/plasma/plasma-vault/HISTORY
@@ -1,5 +1,6 @@
 2018-06-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.13.0
+       * PRE_BUILD patches/*: netwokrmanager-qt optional
 
 2018-06-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: tweak
diff --git a/plasma/plasma-vault/PRE_BUILD b/plasma/plasma-vault/PRE_BUILD
new file mode 100755
index 0000000..1ad15fa
--- /dev/null
+++ b/plasma/plasma-vault/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build    &&
+if ! is_depends_enabled $SPELL networkmanager-qt;then
+  cd $SOURCE_DIRECTORY &&
+  apply_patch_dir patches
+fi
diff --git a/plasma/plasma-vault/patches/0001-networkmanger-optional.patch 
b/plasma/plasma-vault/patches/0001-networkmanger-optional.patch
new file mode 100644
index 0000000..5df0b9f
--- /dev/null
+++ b/plasma/plasma-vault/patches/0001-networkmanger-optional.patch
@@ -0,0 +1,62 @@
+From 19af4781301a4a4dd2c902bdfe7e08dff2f6cda9 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 6 May 2018 17:59:47 +0200
+Subject: [PATCH] networkmanger optional
+
+---
+ CMakeLists.txt      | 2 +-
+ kded/CMakeLists.txt | 9 ++++++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87f3cdd..61e1922 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,8 +58,8 @@ find_package (
+    KIO
+    Plasma
+    WidgetsAddons
+-   NetworkManagerQt
+    )
++find_package (KF5NetworkManagerQt QUIET)
+ find_package (KF5SysGuard REQUIRED)
+ 
+ include_directories (
+diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
+index 666100e..58e4729 100644
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -5,7 +5,6 @@ include_directories (
+ 
+ set (
+    kded_plasmavault_SRCS
+-   service.cpp
+ 
+    engine/vault.cpp
+    engine/backend_p.cpp
+@@ -34,6 +33,9 @@ set (
+ 
+    ../common/vaultinfo.cpp
+    )
++if(KF5NetworkManagerQt_FOUND)
++  set( kded_plasmavault_SRCS service.cpp $(kded_plasmavault_SRCS))
++endif()
+ 
+ ki18n_wrap_ui (
+    kded_plasmavault_SRCS
+@@ -85,9 +87,10 @@ target_link_libraries (
+    KF5::SysGuard
+    KF5::WidgetsAddons
+    KF5::ProcessCore
+-   KF5::NetworkManagerQt
+    )
+-
++if(KF5NetworkManagerQt_FOUND)
++  target_link_libraries (kded_plasmavault KF5::NetworkManagerQt)
++endif()
+ 
+ install (
+     TARGETS kded_plasmavault DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded)
+-- 
+2.17.0
+
diff --git a/plasma/plasma-workspace/HISTORY b/plasma/plasma-workspace/HISTORY
index 6e7f6b5..8c5ddaa 100644
--- a/plasma/plasma-workspace/HISTORY
+++ b/plasma/plasma-workspace/HISTORY
@@ -1,5 +1,6 @@
 2018-06-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.13.0
+       * PRE_BUILD pathces/*: deleted, no longer apply
 
 2018-06-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: tweak
diff --git a/plasma/plasma-workspace/PRE_BUILD 
b/plasma/plasma-workspace/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/plasma/plasma-workspace/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git a/plasma/plasma-workspace/patches/0001-kjsembed-optional.patch 
b/plasma/plasma-workspace/patches/0001-kjsembed-optional.patch
deleted file mode 100644
index ea7494f..0000000
--- a/plasma/plasma-workspace/patches/0001-kjsembed-optional.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f76823c420ea9f8dc6a8a7dfc6b989145b206ce Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Tue, 30 Jan 2018 17:58:45 +0100
-Subject: [PATCH] kjsembed optional
-
----
- CMakeLists.txt             | 8 +++++++-
- dataengines/CMakeLists.txt | 5 ++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9977c37f..cad2eb76 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
- include(KDEPackageAppTemplates)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff 
Wallet KCMUtils
-+                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet 
KCMUtils
-                     IdleTime Declarative TextWidgets KDELibs4Support Crash 
GlobalAccel
-                     DBusAddons Wayland CoreAddons)
- find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
-@@ -45,6 +45,12 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION 
"File Searching"
-                        PURPOSE "Needed for the File Search runner."
-                       )
- 
-+find_package(KF5JsEmbed)
-+set_package_properties(KF5JsEmbed PROPERTIES DESCRIPTION "scripting"
-+                       TYPE OPTIONAL
-+                       PURPOSE "Needed for sharing dataengine"
-+                      )
-+
- find_package(KF5TextEditor)
- find_package(KWinDBusInterface CONFIG REQUIRED)
- 
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
-index 9fcdb57a..e730814f 100644
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -25,7 +25,10 @@ add_subdirectory(soliddevice)
- add_subdirectory(time)
- add_subdirectory(weather)
- add_subdirectory(statusnotifieritem)
--add_subdirectory(share)
-+
-+if(KF5JsEmbed_FOUND)
-+  add_subdirectory(share)
-+endif()
- 
- if(Boost_FOUND AND KdepimLibs_FOUND)
-    if(Akonadi_FOUND)
--- 
-2.16.0
-