Updating notekit

3 files changed, 1 insertions, 75 deletions

diff --git a/notekit/notekit/meson-no-clatexmath.patch b/notekit/notekit/meson-no-clatexmath.patch
deleted file mode 100644
index 262f218..0000000
--- a/notekit/notekit/meson-no-clatexmath.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ac11a91ec90e86f40b840405d9c287ca5796e700 Mon Sep 17 00:00:00 2001
-From: Lyes Saadi <mail@lyes.eu>
-Date: Wed, 21 Apr 2021 22:38:51 +0100
-Subject: [PATCH] Adding a meson option to not build with cLaTeXMath
-
-By adding -Dclatexmath=false, this patch allows one to not build with
-cLaTeXMath using meson. The option defaults to true to avoid breaking
-current builds of NoteKit. Another good approach would be to add a latex
-option with would accept ["none", "clatexmath", "lasem"] as options.
-lasem, though, no longer seems to be a priority nor a commonly choosed
-option to compile with by distributions maintainers. And since the cmake
-build backend will continue to exist due to its usage by upstream, and
-is the recommended build tool, adding this option does not currently
-seems to be of high importance, as the meson build backend is mainly
-used by distribution maintainers.
----
- meson.build       | 14 +++++++++-----
- meson_options.txt |  1 +
- 2 files changed, 10 insertions(+), 5 deletions(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index 31db358..5a9f407 100644
---- a/meson.build
-+++ b/meson.build
-@@ -4,29 +4,33 @@ project('notekit', 'cpp',
- )
- 
- conf_data = configuration_data()
--conf_data.set('HAVE_CLATEXMATH', true)
- 
- deps = [
- 	dependency('gtkmm-3.0'),
- 	dependency('gtksourceviewmm-3.0'),
- 	dependency('jsoncpp'),
- 	dependency('zlib'),
--	dependency('fontconfig'),
--	dependency('clatexmath', version: '>=0.0.3')
-+	dependency('fontconfig')
- ]
- 
-+if get_option('clatexmath')
-+	deps += dependency('clatexmath', version: '>=0.0.3')
-+	conf_data.set('HAVE_CLATEXMATH', true)
-+endif
- 
- configure_file(input : 'config.h.meson.in',
- 	output : 'config.h',
- 	configuration : conf_data
- )
- 
--
- subdir('freedesktop')
- 
- install_subdir('data/', install_dir: get_option('datadir')/'notekit')
- install_subdir('sourceview/', install_dir: get_option('datadir')/'notekit')
--meson.add_install_script('symlink-clatexmath.sh')
-+
-+#if get_option('clatexmath')
-+#	meson.add_install_script('symlink-clatexmath.sh')
-+#endif
- 
- executable('notekit',
- 	'drawing.cpp',
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..b3860a0
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1 @@
-+option('clatexmath', type : 'boolean', value : true, description : 'Use cLaTeXMath')
diff --git a/notekit/notekit/notekit.spec b/notekit/notekit/notekit.spec
index 8f91aeb..1c81daf 100644
--- a/notekit/notekit/notekit.spec
+++ b/notekit/notekit/notekit.spec
@@ -21,9 +21,6 @@ License:    GPLv3+ and Charter
 URL:        %{forgeurl}
 Source0:    %{forgesource}
 
-# https://github.com/blackhole89/notekit/pull/87
-Patch0:     meson-no-clatexmath.patch
-
 BuildRequires:  meson
 BuildRequires:  gcc-c++
 BuildRequires:  desktop-file-utils
diff --git a/notekit/notekit/sources b/notekit/notekit/sources
index 57469b5..1b6a37f 100644
--- a/notekit/notekit/sources
+++ b/notekit/notekit/sources
@@ -1 +1 @@
-SHA512 (notekit-0.1-alpha.tar.gz) = 078c95fff288eeabf98be6fb20e0910c33a7ca20eb2feef34b8b6e5853115bfa9a95cabaa0159274137e4559f843102e309422340d7ea8d815aa782d3b220166
+SHA512 (notekit-66a31147f83b93542f0c53f0eda65b1576bc4756.tar.gz) = b218fe521b497b11b1e62987c9598307a97c49ad10339dd627b2caa5e2b5b2f5890d7b2ab01b46dd98970065c9c333c7cf45c418a1f16c5b17147e76fe8fd213