Skip to content

Commit f194cdf

Browse files
committed
Try to fix CI (1)
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 Fix CI and bump deb package version. 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.
1 parent df9a4eb commit f194cdf

File tree

5 files changed

+48
-2
lines changed

5 files changed

+48
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
with:
2020
path: ~/cLaTeXMath/
2121
key: ${{ runner.os }}-clatexmath
22+
- name: Updating apt package lists
23+
run: sudo apt-get update
2224
- name: Downloading dependencies 📥
2325
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
2426
- name: Download the latest version of Meson 🧰

.github/workflows/latest-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14+
- name: updating apt package archives
15+
run: sudo apt-get update
1416
- name: setting the dependencies up
1517
run: sudo apt install libfontconfig1-dev zlib1g-dev libjsoncpp-dev libgtksourceviewmm-3.0-dev libtinyxml2-dev libgtkmm-3.0-dev cmake ninja-build
1618
- name: installing cLaTeXMath

.github/workflows/package-deb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
automatic_release_tag: "latest-deb"
2626
prerelease: true
2727
title: "Ubuntu 18.04 package for development version"
28-
files: ../notekit_0.1-1_amd64.deb
28+
files: ../notekit_0.2_amd64.deb
2929

debian/changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
notekit (0.2) unstable; urgency=medium
2+
3+
* Various bugfixes.
4+
* Add support for inline images and image pasting.
5+
* Misc improvements.
6+
7+
-- Matvey Soloviev <blackhole89@gmail.com> Tue, 23 Nov 2021 16:20:00 -0500
8+
19
notekit (0.1-1) unstable; urgency=medium
210

311
* Initial release

install-clatexmath.sh

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@
22
git clone https://github.com/NanoMichael/cLaTeXMath.git
33
cd cLaTeXMath
44
git reset --hard HEAD
5+
# patch out C++17 feature use in code, but compile with -std=c++17
6+
(cat <<EOF
7+
diff --git a/CMakeLists.txt b/CMakeLists.txt
8+
index 9654360..a070437 100644
9+
--- a/CMakeLists.txt
10+
+++ b/CMakeLists.txt
11+
@@ -25,10 +25,6 @@ else ()
12+
# needs extra lib to use std::filesystem
13+
target_link_libraries(LaTeX PUBLIC "stdc++fs")
14+
endif ()
15+
- if ("\${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 8)
16+
- # dose not have full c++17 features
17+
- set(COMPILER_SUPPORTS_CXX17 OFF)
18+
- endif ()
19+
endif ()
20+
21+
if (COMPILER_SUPPORTS_CXX17)
22+
diff --git a/src/config.h b/src/config.h
23+
index b43a395..d8aabe5 100644
24+
--- a/src/config.h
25+
+++ b/src/config.h
26+
@@ -40,10 +40,6 @@
27+
#include "vcruntime.h"
28+
#endif
29+
30+
-#if (__cplusplus >= 201703L) || (defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17)
31+
-#define CLATEX_CXX17 1
32+
-#else
33+
#define CLATEX_CXX17 0
34+
-#endif
35+
36+
#endif // CONFIG_H_INCLUDED
37+
EOF
38+
) | patch -p1
539
cmake -DCMAKE_BUILD_TYPE=Release -DHAVE_LOG=OFF -DGRAPHICS_DEBUG=OFF .
640
make
7-
cp -r res ../data/latex
41+
cp -r res ../data/latex

0 commit comments

Comments
 (0)