summaryrefslogtreecommitdiffstats
path: root/qt5-cmake
diff options
context:
space:
mode:
authorTreeve Jelbert2019-01-13 13:29:38 +0100
committerTreeve Jelbert2019-01-13 13:41:07 +0100
commita17a70134bb73b5c2cfc47145c3d295e1dee66eb (patch)
tree6ae0f3d0cb711194868268e4cd0afb72d340c12e /qt5-cmake
parent732872fb76ee57a96c895e4956f870085b55b753 (diff)
nanonote: => 1.0.1
Diffstat (limited to 'qt5-cmake')
-rwxr-xr-xqt5-cmake/nanonote/DETAILS4
-rw-r--r--qt5-cmake/nanonote/HISTORY4
-rwxr-xr-xqt5-cmake/nanonote/PRE_BUILD8
3 files changed, 10 insertions, 6 deletions
diff --git a/qt5-cmake/nanonote/DETAILS b/qt5-cmake/nanonote/DETAILS
index 515d52765c..afc87cd4bb 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 d623110103..005f96f8e0 100644
--- a/qt5-cmake/nanonote/HISTORY
+++ b/qt5-cmake/nanonote/HISTORY
@@ -1,3 +1,7 @@
+2019-01-13 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.0.1
+ * PRE_BUILD: adjust to upstream
+
2018-12-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.0.0
spell created
diff --git a/qt5-cmake/nanonote/PRE_BUILD b/qt5-cmake/nanonote/PRE_BUILD
index f4d53e64a3..37a7ed9d79 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