Fixes & improvements ...

- Add patch to build with reveal.js
- Restore hardcoded Fira fonts

1 files changed, 15 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fb68460a3626..3a7d11ac5178 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@
 # Contributor: Kimiblock
 # Contributor: Philip Goto <philip.goto@gmail.com>
 pkgname=apostrophe-git
-pkgver=2.6.3.r327.g5666e17
+pkgver=3.0.r0.gdff1c5e
 pkgrel=1
+_reveal_ver=5.1.0
 pkgdesc="A distraction free Markdown editor for GNU/Linux made with GTK+"
 arch=('any')
 url="https://world.pages.gitlab.gnome.org/apostrophe"
@@ -21,6 +22,8 @@ depends=(
   'python-pypandoc'
   'python-regex'
   'python-setuptools'
+  'ttf-fira-mono'
+  'ttf-fira-sans'
   'webkitgtk-6.0'
 )
 makedepends=(
@@ -28,21 +31,18 @@ makedepends=(
   'gobject-introspection'
   'meson'
 )
-checkdepends=('appstream')
 optdepends=(
   'mathjax: for formula preview'
   'texlive-bin: for the pdftex module'
-  'ttf-fira-mono: recommended Mono font'
-  'ttf-fira-sans: recommended Sans font'
 )
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://gitlab.gnome.org/World/apostrophe.git'
-        '0001-Use-system-font.patch'
-        '2-rm-reveal-check.patch')
+        "https://github.com/hakimel/reveal.js/archive/${_reveal_ver}/reveal.js-${_reveal_ver}.tar.gz"
+        'embed-reveal.patch')
 sha256sums=('SKIP'
-            'e909c05f259a874afd5e414fd13b0f162972e59c61c23e6d619e502254fcd4fe'
-            'a3e2eea5fca084f53fd6d0f9e61ace8e14b4c83d9c2f1d5ea74c8589c8c10b8f')
+            'ddc83539ec50583eac9a972e88f892971b37c44e70dd0c08be069e2688684b71'
+            'd9f140a58a2f65395450a4907263b8c925d6186f90c59e37cc378141be695f5c')
 
 pkgver() {
   cd "${pkgname%-git}"
@@ -51,21 +51,11 @@ pkgver() {
 
 prepare() {
   cd "${pkgname%-git}"
+  mkdir -p "${pkgname%-git}/libs/reveal.js"
+  cp -r "$srcdir/reveal.js-${_reveal_ver}"/* "${pkgname%-git}/libs/reveal.js"
 
-  # Bug 1953395 - Apostrophe can't export to HTML
-  sed -i 's|/app/share/fonts/FiraSans-Regular.ttf|/usr/share/fonts/OTF/FiraSans-Regular.otf|' \
-    data/media/css/web/base.css
-  sed -i 's|/app/share/fonts/FiraMono-Regular.ttf|/usr/share/fonts/OTF/FiraMono-Regular.otf|' \
-    data/media/css/web/base.css
-
-  # W: hidden-file-or-dir
-  rm apostrophe/.pylintrc
-
-  # Use system monospace & sans font instead of hard dependency on Fira Mono / Fira Sans
-  patch -Np1 -i "$srcdir/0001-Use-system-font.patch"
-
-  ## TODO Find a way to package reveal.js
-  patch "$srcdir/apostrophe/meson.build" < "$srcdir/2-rm-reveal-check.patch"
+  # Point Meson to the reveal.js files
+  patch meson.build < "$srcdir/embed-reveal.patch"
 }
 
 build() {
@@ -79,4 +69,7 @@ check() {
 
 package() {
   meson install -C build --destdir "$pkgdir"
+
+  install -d "$pkgdir/usr/share/${pkgname%-git}/libs/reveal.js"
+  cp -r "reveal.js-${_reveal_ver}"/* "$pkgdir/usr/share/${pkgname%-git}/libs/reveal.js"
 }