Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 crypto/ca-certificates/DETAILS |    1 -
 crypto/ca-certificates/HISTORY |    4 ++++
 qt5-cmake/nanonote/DETAILS     |    4 ++--
 qt5-cmake/nanonote/HISTORY     |    4 ++++
 qt5-cmake/nanonote/PRE_BUILD   |    8 ++++----
 5 files changed, 14 insertions(+), 7 deletions(-)

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

    nanonote: => 1.0.1

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

    ca-certificates - allow staging

diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index 692ae48..37275b7 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
       LICENSE[0]=GPL
          ENTERED=20081127
            SHORT="PEM files of CA certificates"
-  STAGED_INSTALL=off
       PATCHLEVEL=1
 cat << EOF
 This package includes PEM files of CA certificates to allow SSL-based
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index dcd46ba..68af3e0 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,3 +1,7 @@
+2019-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: allow staging
+         install was crashing on my system without it
+
 2018-05-31 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 20180409
 
diff --git a/qt5-cmake/nanonote/DETAILS b/qt5-cmake/nanonote/DETAILS
index 515d527..afc87cd 100755
--- a/qt5-cmake/nanonote/DETAILS
+++ b/qt5-cmake/nanonote/DETAILS
@@ -1,6 +1,6 @@
            SPELL=nanonote
-         VERSION=1.0.0
-     
SOURCE_HASH=sha512:d2d92a2e3cb124e2b70b51250f7716c123140195208637987c99a2bd843349ea8d7afe247988479b290727769042d4870d581dcd64a8102fdc86cbfbeb50f820
+         VERSION=1.0.1
+     
SOURCE_HASH=sha512:c790118f43f620e3a265952549ec36490c0f672221e17dea9159051080c9e258602a173df2e62a866ab9493074eef26a22f31bd62a54806aa2b68bd3c12ec3d8
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
        WEB_SITE=https://github.com/agateau/$SPELL
diff --git a/qt5-cmake/nanonote/HISTORY b/qt5-cmake/nanonote/HISTORY
index d623110..005f96f 100644
--- a/qt5-cmake/nanonote/HISTORY
+++ b/qt5-cmake/nanonote/HISTORY
@@ -1,3 +1,7 @@
+2019-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.0.1
+       * PRE_BUILD: adjust to upstream
+
 2018-12-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.0
          spell created
diff --git a/qt5-cmake/nanonote/PRE_BUILD b/qt5-cmake/nanonote/PRE_BUILD
index f4d53e6..37a7ed9 100755
--- a/qt5-cmake/nanonote/PRE_BUILD
+++ b/qt5-cmake/nanonote/PRE_BUILD
@@ -1,8 +1,8 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
 # use installed qpropgen and singleapplication
-ln -s /usr/share/qpropgen/cmake qpropgen/
-cp  /usr/share/singleapplication/*.{cpp,h} singleapplication/src
+ln -s /usr/share/qpropgen/cmake 3rdparty/qpropgen/ &&
+cp  /usr/share/singleapplication/*.{cpp,h} 3rdparty/singleapplication/src &&
 # fix cmake usage
-sed -i 's/3.5/3.10/' CMakeLists.txt
-sed -i 's|cpp|cpp src/singleapplication_p.cpp|' 
singleapplication/CMakeLists.txt
+sed -i 's/3.5/3.10/;/catch2/D;/tests/D' CMakeLists.txt &&
+sed -i 's|cpp|cpp src/singleapplication_p.cpp|' 
3rdparty/singleapplication/CMakeLists.txt