From 4ab56db2d33face011f5d5741fcf110fffe887a2 Mon Sep 17 00:00:00 2001
From: Matvey Soloviev <blackhole89@gmail.com>
Date: Tue, 23 Nov 2021 14:43:56 -0500
Subject: [PATCH] Fix CI and bump deb package version.

Try to fix CI (2)

Remove questionable choice of condition from clatexmath build files in
attempt to fix CI

Typo fix

Trying to fix automated gcc7.5.0 build of clatexmath, again

Typo fix, again

Yet another typo fix

Bump deb package version.
---
 .github/workflows/ci.yml             |  2 ++
 .github/workflows/latest-release.yml |  2 ++
 debian/changelog                     |  8 +++++++
 install-clatexmath.sh                | 36 +++++++++++++++++++++++++++-
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 495053b..52605c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,8 @@ jobs:
       with:
         path: ~/cLaTeXMath/
         key: ${{ runner.os }}-clatexmath
+    - name: Updating apt package lists
+      run: sudo apt-get update
     - name: Downloading dependencies 📥
       run: sudo apt-get install build-essential libfontconfig1-dev zlib1g-dev libjsoncpp-dev libgtksourceviewmm-3.0-dev libgtkmm-3.0-dev libtinyxml2-dev python3 python3-pip python3-setuptools
     - name: Download the latest version of Meson 🧰
diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
index ddf806c..abcabf4 100644
--- a/.github/workflows/latest-release.yml
+++ b/.github/workflows/latest-release.yml
@@ -11,6 +11,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: updating apt package archives
+      run: sudo apt-get update
     - name: setting the dependencies up
       run: sudo apt install libfontconfig1-dev zlib1g-dev libjsoncpp-dev libgtksourceviewmm-3.0-dev libtinyxml2-dev libgtkmm-3.0-dev cmake ninja-build
     - name: installing cLaTeXMath
diff --git a/debian/changelog b/debian/changelog
index aac28d0..64ea39e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notekit (0.2) unstable; urgency=medium
+  
+  * Various bugfixes.
+  * Add support for inline images and image pasting.
+  * Misc improvements.
+
+ -- Matvey Soloviev <blackhole89@gmail.com>  Tue, 23 Nov 2021 16:20:00 -0500
+
 notekit (0.1-1) unstable; urgency=medium
 
   * Initial release
diff --git a/install-clatexmath.sh b/install-clatexmath.sh
index 0a46e90..69913a8 100755
--- a/install-clatexmath.sh
+++ b/install-clatexmath.sh
@@ -2,6 +2,40 @@
 git clone https://github.com/NanoMichael/cLaTeXMath.git
 cd cLaTeXMath
 git reset --hard HEAD
+# patch out C++17 feature use in code, but compile with -std=c++17
+(cat <<EOF
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9654360..a070437 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,10 +25,6 @@ else ()
+             # needs extra lib to use std::filesystem
+             target_link_libraries(LaTeX PUBLIC "stdc++fs")
+         endif ()
+-        if ("\${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 8)
+-            # dose not have full c++17 features
+-            set(COMPILER_SUPPORTS_CXX17 OFF)
+-        endif ()
+     endif ()
+ 
+     if (COMPILER_SUPPORTS_CXX17)
+diff --git a/src/config.h b/src/config.h
+index b43a395..d8aabe5 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -40,10 +40,6 @@
+ #include "vcruntime.h"
+ #endif
+ 
+-#if (__cplusplus >= 201703L) || (defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17)
+-#define CLATEX_CXX17 1
+-#else
+ #define CLATEX_CXX17 0
+-#endif
+ 
+ #endif  // CONFIG_H_INCLUDED
+EOF
+) | patch -p1
 cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_LOG=OFF -DGRAPHICS_DEBUG=OFF .
 make
-cp -r res ../data/latex
\ No newline at end of file
+cp -r res ../data/latex