forked from pool/cherrytree
Dominique Leuenberger
a00012c929
- Update to version 0.99.21+git20201121.e0afb5a6: * Fix typos in README, (gh#giuspen/cherrytree#1357) * Fix 7za sources License.txt issue, (gh#giuspen/cherrytree#1356). * Fix unit tests after latest changes for new arg option --new-window. * Adds --new-window option, (gh#giuspen/cherrytree#1355). * Fix issue with clipboard on windows, (gh#giuspen/cherrytree#1336, gh#giuspen/cherrytree#1344 and gh#giuspen/cherrytree#1341). * Suppress error when test a wrong password, (gh#giuspen/cherrytree#1350). * Table will contain right amount of column widths; removes table to xml copy-paste, (gh#giuspen/cherrytree#1349). * Fixes crash in html parser due to <li> without <ul>, (gh#giuspen/cherrytree#1348). * Fix crash when triying to move a table column, (gh#giuspen/cherrytree#1342). * Fix crash when pasting HTML, (gh#giuspen/cherrytree#1346). * Translation updates. - Added cherrytree-set-git-version.patch and rebase since we are pulling from git again. OBS-URL: https://build.opensuse.org/request/show/849863 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=127
13 lines
571 B
Diff
13 lines
571 B
Diff
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2020-11-21 07:41:58.000000000 -0600
|
|
+++ b/CMakeLists.txt 2020-11-21 08:27:00.146401506 -0600
|
|
@@ -4,7 +4,7 @@
|
|
|
|
file(READ "debian/changelog" CHANGELOG)
|
|
string(REGEX MATCH "cherrytree +\\(([0-9]+)\\.([0-9]+)\\.([0-9]+)[-+]" _ ${CHANGELOG})
|
|
-set(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3})
|
|
+option(CT_VERSION ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3})
|
|
set(CT_VERSION_WINDOWS ${CMAKE_MATCH_1},${CMAKE_MATCH_2},${CMAKE_MATCH_3},0)
|
|
message(STATUS "CT_VERSION = ${CT_VERSION}")
|
|
|