Updating NoteKit and adding (broken) cLaTeXMath

5 files changed, 139 insertions, 97 deletions

diff --git a/notekit/clatexmath/cLaTeXMath.spec b/notekit/clatexmath/cLaTeXMath.spec
new file mode 100644
index 0000000..cdea523
--- /dev/null
+++ b/notekit/clatexmath/cLaTeXMath.spec
@@ -0,0 +1,68 @@
+%global forgeurl    https://github.com/NanoMichael/cLaTeXMath
+%global commit      44ea33777c9f3ffde8f1d2149ce30362accebe63
+
+Name:           cLaTeXMath
+Version:        0
+Release:        1%{?dist}
+Summary:        A dynamic and cross-platform LaTeX rendering library
+
+%forgemeta
+
+License:        MIT and OFL and Knuth and DoubleStroke
+URL:            %{forgeurl}
+Source0:        %{forgesource}
+
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(gtkmm-3.0)
+BuildRequires:  pkgconfig(gtksourceviewmm-3.0)
+
+%global _description %{expand:
+It is a dynamic, cross-platform, and embeddable LaTeX rendering library. Its
+main purpose is to display mathematical formulas written in LaTeX. It can be
+embedded in applications on various platforms (Android, iOS, Windows, Linux GTK,
+Qt...). The following pictures demonstrate the application run in Ubuntu (using
+GTK) and Windows.}
+
+%description %_description
+
+%package devel
+Summary:        %{summary}
+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+Requires:       pkgconfig(fontconfig)
+Requires:       pkgconfig(gtkmm-3.0)
+Requires:       pkgconfig(gtksourceviewmm-3.0)
+
+%description devel %_description
+
+
+%prep
+%forgeautosetup
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+
+%files
+%doc README.md
+%{_datadir}/clatexmath
+%{_libdir}/libclatexmath.so.0
+%{_libdir}/libclatexmath.so.0.0.1
+
+
+%files devel
+%{_includedir}/clatexmath
+%{_libdir}/libclatexmath.so
+%{_libdir}/pkgconfig/clatexmath.pc
+
+
+%changelog
+* Wed Nov 18 2020 Lyes Saadi <fedora@lyes.eu>
+- Initial package
diff --git a/notekit/generate-notekit-tarball.sh b/notekit/generate-notekit-tarball.sh
deleted file mode 100755
index 3a100a3..0000000
--- a/notekit/generate-notekit-tarball.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-VERSION=$1
-
-wget https://github.com/blackhole89/notekit/archive/$VERSION/notekit-$VERSION.tar.gz
-
-tar -xzvf notekit-$VERSION.tar.gz
-
-rm -rf notekit-$VERSION/data/fonts
-
-tar -czvf notekit-$VERSION-no-font.tar.gz notekit-$VERSION
-
-# Cleaning
-rm -rf notekit-$VERSION/
-rm -f notekit-$VERSION.tar.gz
diff --git a/notekit/notekit-5ecb6323e1d315f9f444e73b86b73e6a4e9f16c3-no-font.tar.gz b/notekit/notekit-5ecb6323e1d315f9f444e73b86b73e6a4e9f16c3-no-font.tar.gz
deleted file mode 100644
index e81c832..0000000
--- a/notekit/notekit-5ecb6323e1d315f9f444e73b86b73e6a4e9f16c3-no-font.tar.gz
+++ /dev/null
diff --git a/notekit/notekit.spec b/notekit/notekit.spec
deleted file mode 100644
index 1aad703..0000000
--- a/notekit/notekit.spec
+++ /dev/null
@@ -1,82 +0,0 @@
-%global forgeurl    https://github.com/blackhole89/notekit/
-%global commit      5ecb6323e1d315f9f444e73b86b73e6a4e9f16c3
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-#forgemeta
-
-Name:       notekit
-Version:    0
-Release:    1.git%{shortcommit}%{?dist}
-Summary:    A GTK3 hierarchical markdown notetaking application with tablet support.
-
-License:    GPLv3+
-URL:        %{forgeurl}
-# NoteKit bundle some fonts with a custom License. To generate a clean tarball:
-# ./generate-notekit-tarball.sh %{commit}
-Source0:    notekit-%{commit}-no-font.tar.gz
-Source1:    generate-notekit-tarball.sh
-
-BuildRequires:  cmake
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc-c++
-BuildRequires:  gtkmm30-devel
-BuildRequires:  gtksourceviewmm3-devel
-BuildRequires:  jsoncpp-devel
-BuildRequires:  make
-BuildRequires:  zlib-devel
-Requires:       hicolor-icon-theme
-Requires:       gtkmm30
-Requires:       gtksourceviewmm3
-Requires:       jsoncpp
-Requires:       libz.so.1
-
-%description
-This program is a structured notetaking application based on GTK+ 3.
-Write your notes in instantly-formatted Markdown, organise them in a
-tree of folders that can be instantly navigated from within the program,
-and add hand-drawn notes by mouse, touchscreen or digitiser.
-
-%prep
-%autosetup -n notekit-%{commit}
-sed -i 's/${CL_TMP_VAR}/"${CL_TMP_VAR}"/' CMakeLists.txt
-
-%build
-%cmake
-%cmake_build
-
-%install
-%cmake_install
-
-# Apply patch to stylesheet
-sed -i 's/Bitstream Charter/serif/' %{buildroot}%{_datadir}/notekit/data/stylesheet.css
-
-# Desktop File
-install -Dpm 0644 -t %{buildroot}%{_datadir}/applications/ freedesktop/%{name}.desktop
-
-# Icons
-install -Dpm 0644 -t %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ freedesktop/%{name}.svg
-install -Dpm 0644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/ freedesktop/%{name}.png
-rm data/icons/hicolor/index.theme
-cp -pr data/icons %{buildroot}%{_datadir}
-
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-
-%files
-%doc README.md
-%license LICENSE
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*
-%{_datadir}/%{name}/
-
-%changelog
-* Thu Oct 22 2020 Lyes Saadi <fedora@lyes.eu> - 0-1.git5ecb632
-- Updating to latest commit
-- Replacing the patch by a simple sed
-
-* Tue May 05 2020 Lyes Saadi <fedora@lyes.eu> - master-2
-- Updating to latest commit
-- Making the spec file compliant to Fedora's Guidelines
-
-* Wed Sep 11 2019 Lyes Saadi <fedora@lyes.eu> - master-1
-- Creating the spec file
diff --git a/notekit/notekit/notekit.spec b/notekit/notekit/notekit.spec
new file mode 100644
index 0000000..13c1a13
--- /dev/null
+++ b/notekit/notekit/notekit.spec
@@ -0,0 +1,71 @@
+%global forgeurl    https://github.com/blackhole89/notekit/
+%global commit      f3457107c04a3ecb1108edc0b51d7acd919cbc5b
+
+%global uuid        com.github.blackhole89.notekit
+
+Name:       notekit
+Version:    0
+Release:    2%{?dist}
+Summary:    Hierarchical markdown notetaking application with tablet support
+
+%forgemeta
+
+License:    GPLv3+ and Charter
+URL:        %{forgeurl}
+Source0:    %{forgesource}
+Patch0:     https://patch-diff.githubusercontent.com/raw/blackhole89/notekit/pull/60.diff
+
+BuildRequires:  meson
+BuildRequires:  git-core
+BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+BuildRequires:  cLaTeXMath-devel
+BuildRequires:  gtkmm30-devel
+BuildRequires:  gtksourceviewmm3-devel
+BuildRequires:  jsoncpp-devel
+BuildRequires:  zlib-devel
+Requires:       hicolor-icon-theme
+
+%description
+This program is a structured notetaking application based on GTK+ 3.
+Write your notes in instantly-formatted Markdown, organise them in a
+tree of folders that can be instantly navigated from within the program,
+and add hand-drawn notes by mouse, touchscreen or digitiser.
+
+%prep
+%forgeautosetup -S git
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{name}
+%{_metainfodir}/%{uuid}.metainfo.xml
+%{_datadir}/applications/%{uuid}.desktop
+%{_datadir}/icons/hicolor/*
+%{_datadir}/%{name}/
+
+%changelog
+* Wed Nov 18 2020 Lyes Saadi <fedora@lyes.eu> -0-2
+- Updating to latest commit
+- Switching to meson
+- Enabling cLaTeXMath
+- Adding metainfo
+- Adding back Charter fonts as I recently learned to read
+
+* Thu Oct 22 2020 Lyes Saadi <fedora@lyes.eu> - 0-1.git5ecb632
+- Updating to latest commit
+- Replacing the patch by a simple sed
+
+* Tue May 05 2020 Lyes Saadi <fedora@lyes.eu> - master-2
+- Updating to latest commit
+- Making the spec file compliant to Fedora's Guidelines
+
+* Wed Sep 11 2019 Lyes Saadi <fedora@lyes.eu> - master-1
+- Creating the spec file