Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 database/firebird3/DETAILS                                        |    4 
 database/firebird3/HISTORY                                        |    5 +
 database/firebird3/INSTALL                                        |    7 -
 database/firebird3/patches/0005-make-pthread-usage-explicit.patch |   24 
+++++
 database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch   |   43 
++++++++++
 database/firebird3/patches/0006-make-pthread-usage-explicit.patch |   24 
-----
 kde5-apps/zanshin/DETAILS                                         |    2 
 kde5-apps/zanshin/HISTORY                                         |    3 
 8 files changed, 81 insertions(+), 31 deletions(-)

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

    firebird3: => 3.0.5.33220-0

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

    zanshin: => 0.5.71

diff --git a/database/firebird3/DETAILS b/database/firebird3/DETAILS
index ceafc4a..1064364 100755
--- a/database/firebird3/DETAILS
+++ b/database/firebird3/DETAILS
@@ -1,7 +1,7 @@
            SPELL=firebird3
           SPELLX=Firebird
-         VERSION=3.0.4.33054-0
-     
SOURCE_HASH=sha512:a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
+         VERSION=3.0.5.33220-0
+     
SOURCE_HASH=sha512:67120c54f563cac84408cb50f0f8ea80755342527a441552a975925926ea263937914bce69474f12cf82e004c0f804297fa714aaba4200685f4bff1e47b4df11
      PATCHLEVEL=1
   SECURTIY_PATCH=1
         VX=${VERSION%.*}
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index a15264d..ac61c55 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,8 @@
+2020-01-14 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.0.5.33220-0
+       * patches/*: update
+       * INSTALL: tweak
+
 2018-10-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.0.4.33054-0
        * BUILD INSTALL FINAL init.d/firebird3: adapt to upstream changes
diff --git a/database/firebird3/INSTALL b/database/firebird3/INSTALL
index 254daaa..9f04178 100755
--- a/database/firebird3/INSTALL
+++ b/database/firebird3/INSTALL
@@ -1,5 +1,4 @@
-BLD=$SOURCE_DIRECTORY/build &&
-cd $BLD/firebird &&
+cd $SOURCE_DIRECTORY/build/firebird &&
 # config files
 DEST=$INSTALL_ROOT/etc/firebird3   &&
 mkdir -p $DEST &&
@@ -14,10 +13,10 @@ mkdir -p $DEST  &&
 # install the built tree
 cp -a * $DEST    &&
 
-cd $BLD/src &&
+cd $SOURCE_DIRECTORY/build/src &&
 cp msg.fdb help.fdb $DEST &&
 
-DEST=$FB_PREFIX/firebird/include/firebird
+DEST=$FB_PREFIX/firebird/include/firebird &&
 mkdir -p $DEST   &&
 # need the impl/boost files; copy them as well
 cp -a $SOURCE_DIRECTORY/src/include/firebird/impl $DEST &&
diff --git 
a/database/firebird3/patches/0005-make-pthread-usage-explicit.patch 
b/database/firebird3/patches/0005-make-pthread-usage-explicit.patch
new file mode 100644
index 0000000..f3f101e
--- /dev/null
+++ b/database/firebird3/patches/0005-make-pthread-usage-explicit.patch
@@ -0,0 +1,24 @@
+From 90315362b464855c42602e0ee6a5c5def57214e0 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 18 Jan 2018 21:24:49 +0100
+Subject: [PATCH 5/6] make pthread usage explicit
+
+---
+ src/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 144f6003d2..c5a0181cf4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -437,6 +437,7 @@ target_link_libraries       (yvalve
+     PRIVATE remote
+     PRIVATE common
+     PUBLIC tommath
++    PUBLIC pthread
+     PUBLIC ${LIB_Ws2_32}
+     PUBLIC ${LIB_readline}
+     PUBLIC ${LIB_dl}
+-- 
+2.24.0
+
diff --git a/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch 
b/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch
new file mode 100644
index 0000000..2336adc
--- /dev/null
+++ b/database/firebird3/patches/0006-fix-build-with-cmake-3.16.patch
@@ -0,0 +1,43 @@
+From d0013d07402a7eba05fffe1983ea0d6ea2ab473c Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 3 Dec 2019 10:29:55 +0100
+Subject: [PATCH 6/6] fix build with cmake-3.16
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c5a0181cf4..ea4014c61f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -266,7 +266,7 @@ add_custom_target(parse
+     SOURCES ${parse_src}
+ )
+ project_group(parse "Boot/Custom build steps")
+-set_source_files_properties(dsql/parse.cpp include/gen/parse.h PROPERTIES 
GENERATED TRUE)
++set_source_files_properties(dsql/parse.cpp  
${CMAKE_CURRENT_BINARY_DIR}/include/gen/parse.h PROPERTIES GENERATED TRUE)
+ 
+ 
+ ########################################
+@@ -357,7 +357,7 @@ add_library                 (burp ${burp_src} 
${burp_generated_src_master})
+ 
+ 
+ ########################################
+-# LIBRARY common
++# LIBRARY Wcommon
+ ########################################
+ 
+ file(GLOB common_src "common/*.cpp" "common/classes/*.cpp" 
"common/config/*.cpp" "common/os/${OS_DIR}/*.cpp" "common/sha2/*.cpp")
+@@ -371,7 +371,7 @@ endif()
+ add_library                 (common ${common_src} ${common_os_src} 
${common_include})
+ set_source_files_properties(common/CRC32C.cpp PROPERTIES COMPILE_FLAGS 
-msse4)
+ target_link_libraries       (common ${LIB_mpr})
+-add_dependencies_cc         (common UpdateCloopInterfaces)
++add_dependencies_cc         (common UpdateCloopInterfaces parse)
+ 
+ 
+ 
################################################################################
+-- 
+2.24.0
+
diff --git 
a/database/firebird3/patches/0006-make-pthread-usage-explicit.patch 
b/database/firebird3/patches/0006-make-pthread-usage-explicit.patch
deleted file mode 100644
index de988bb..0000000
--- a/database/firebird3/patches/0006-make-pthread-usage-explicit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 96a619f0cd33ebee530f0574a8f255fc2a00d503 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Thu, 18 Jan 2018 21:24:49 +0100
-Subject: [PATCH 6/6] make pthread usage explicit
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 01fa3e4..fa91d62 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -437,6 +437,7 @@ target_link_libraries       (yvalve
-     PRIVATE remote
-     PRIVATE common
-     PUBLIC tommath
-+    PUBLIC pthread
-     PUBLIC ${LIB_Ws2_32}
-     PUBLIC ${LIB_readline}
-     PUBLIC ${LIB_dl}
--- 
-2.16.0
-
diff --git a/kde5-apps/zanshin/DETAILS b/kde5-apps/zanshin/DETAILS
index dc6496f..0adc5c4 100755
--- a/kde5-apps/zanshin/DETAILS
+++ b/kde5-apps/zanshin/DETAILS
@@ -1,5 +1,5 @@
            SPELL=zanshin
-         VERSION=0.5.0
+         VERSION=0.5.71
           SOURCE=$SPELL-$VERSION.tar.xz
       SOURCE_URL=https://download.kde.org/stable/zanshin/$SOURCE
          SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/zanshin/HISTORY b/kde5-apps/zanshin/HISTORY
index e0c2fdc..5e48ea7 100644
--- a/kde5-apps/zanshin/HISTORY
+++ b/kde5-apps/zanshin/HISTORY
@@ -1,3 +1,6 @@
+2020-01-14 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.5.71
+
 2018-01-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.5.0
        * DETAILS: add gpg checking