Fixes and improvements

- Use system font
- Add comments about reveal.js patch
- Use improved dependency arrays

3 files changed, 80 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 494fca8e42f9..890ecd7dd264 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apostrophe-git
 	pkgdesc = A distraction free Markdown editor for GNU/Linux made with GTK+
 	pkgver = 2.6.3.r202.gcc6bef4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://world.pages.gitlab.gnome.org/apostrophe
 	arch = any
 	license = GPL3
@@ -9,10 +9,7 @@ pkgbase = apostrophe-git
 	makedepends = git
 	makedepends = meson
 	makedepends = gobject-introspection
-	makedepends = sassc
 	depends = libadwaita
-	depends = otf-fira-mono
-	depends = otf-fira-sans
 	depends = python-cairo
 	depends = python-chardet
 	depends = python-gobject
@@ -22,14 +19,15 @@ pkgbase = apostrophe-git
 	depends = python-regex
 	depends = python-setuptools
 	depends = webkitgtk-6.0
-	depends = nodejs-reveal.js
-	optdepends = texlive-bin: for the pdftex module
 	optdepends = mathjax: for formula preview
+	optdepends = texlive-bin: for the pdftex module
 	provides = apostrophe
 	conflicts = apostrophe
 	source = git+https://gitlab.gnome.org/World/apostrophe.git
+	source = 0001-Use-system-font.patch
 	source = 2-rm-reveal-check.patch
 	sha256sums = SKIP
+	sha256sums = e909c05f259a874afd5e414fd13b0f162972e59c61c23e6d619e502254fcd4fe
 	sha256sums = a3e2eea5fca084f53fd6d0f9e61ace8e14b4c83d9c2f1d5ea74c8589c8c10b8f
 
 pkgname = apostrophe-git
diff --git a/0001-Use-system-font.patch b/0001-Use-system-font.patch
new file mode 100644
index 000000000000..d8ffdd50f708
--- /dev/null
+++ b/0001-Use-system-font.patch
@@ -0,0 +1,34 @@
+From 2bda071943a224ac424b1c46828acd35ee04f3e7 Mon Sep 17 00:00:00 2001
+From: Kimiblock <pn3535@icloud.com>
+Date: Tue, 29 Aug 2023 20:38:16 +0800
+Subject: [PATCH] Use system font
+
+---
+ data/media/css/gtk/style.css | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/media/css/gtk/style.css b/data/media/css/gtk/style.css
+index 9b6840d..c0357ec 100644
+--- a/data/media/css/gtk/style.css
++++ b/data/media/css/gtk/style.css
+@@ -32,7 +32,7 @@
+ }
+ 
+ .apostrophe-editor {
+-  font-family: 'Fira Mono', monospace;
++  font-family: monospace;
+   font-size: 1.091em;
+   /*text-decoration-color: @error_color;
+   background: @base_color;
+@@ -88,7 +88,7 @@
+ } 
+ 
+ .lexikon {
+-  font-family: serif;
++  font-family: sans-serif;
+   font-size: 12px;
+   background: @theme_selected_bg_color;
+   border: 4px solid @theme_selected_bg_color;
+-- 
+2.42.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 6cc57542e9c1..476796d5b397 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,54 @@
-# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 # Co-Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
-# Contributor: Kimiblock
+# Co-Maintainer: Kimiblock
 # Contributor: Philip Goto <philip.goto@gmail.com>
 pkgname=apostrophe-git
 pkgver=2.6.3.r202.gcc6bef4
-pkgrel=2
+pkgrel=3
 pkgdesc="A distraction free Markdown editor for GNU/Linux made with GTK+"
 arch=('any')
 url="https://world.pages.gitlab.gnome.org/apostrophe"
 license=('GPL3')
-depends=('libadwaita' 'otf-fira-mono' 'otf-fira-sans' 'python-cairo'
-         'python-chardet' 'python-gobject' 'python-levenshtein' 'python-pyenchant'
-         'python-pypandoc' 'python-regex' 'python-setuptools' 'webkitgtk-6.0' 'nodejs-reveal.js')
-makedepends=('git' 'meson' 'gobject-introspection' 'sassc')
-checkdepends=('appstream-glib')
-optdepends=('texlive-bin: for the pdftex module'
-            'mathjax: for formula preview')
+depends=(
+  'libadwaita'
+  'python-cairo'
+  'python-chardet'
+  'python-gobject'
+  'python-levenshtein'
+  'python-pyenchant'
+  'python-pypandoc'
+  'python-regex'
+  'python-setuptools'
+  'webkitgtk-6.0'
+)
+makedepends=(
+  'git'
+  'meson'
+  'gobject-introspection'
+)
+checkdepends=(
+  'appstream-glib'
+)
+optdepends=(
+  'mathjax: for formula preview'
+  'texlive-bin: for the pdftex module'
+)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://gitlab.gnome.org/World/apostrophe.git'
-        2-rm-reveal-check.patch)
+        '0001-Use-system-font.patch'
+        '2-rm-reveal-check.patch')
 sha256sums=('SKIP'
+            'e909c05f259a874afd5e414fd13b0f162972e59c61c23e6d619e502254fcd4fe'
             'a3e2eea5fca084f53fd6d0f9e61ace8e14b4c83d9c2f1d5ea74c8589c8c10b8f')
 
 pkgver() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "${pkgname%-git}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "${pkgname%-git}"
 
   # Bug 1953395 - Apostrophe can't export to HTML
   sed -i 's|/app/share/fonts/FiraSans-Regular.ttf|/usr/share/fonts/OTF/FiraSans-Regular.otf|' \
@@ -40,7 +59,16 @@ prepare() {
   # W: hidden-file-or-dir
   rm apostrophe/.pylintrc
 
-  patch "${srcdir}/apostrophe/meson.build" < "${srcdir}/2-rm-reveal-check.patch"
+  # Use system monospace & sans font instead of hard dependency on Fira Mono / Fira Sans
+  patch -Np1 -i "$srcdir/0001-Use-system-font.patch"
+
+  ## WIP
+
+  # Why are we pretending we don't need reveal.js?
+  # It's only for HTML 5 Slideshow and would be an optional dependency
+  # The nodejs-reveal.js AUR package does not cover this dependency as 
+  # upstream is looking for it in "prefix/share/apostrophe/libs/reveal.js, fully unzipped"
+  patch "$srcdir/apostrophe/meson.build" < "$srcdir/2-rm-reveal-check.patch"
 }
 
 build() {