3.0

6 files changed, 80 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 312b0cc6c65a..f0bd2a343e83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = apostrophe
 	pkgdesc = A distraction free Markdown editor for GNU/Linux made with GTK+
-	pkgver = 2.6.3
-	pkgrel = 6
+	pkgver = 3.0
+	pkgrel = 1
 	url = https://world.pages.gitlab.gnome.org/apostrophe
 	arch = any
 	license = GPL-3.0-or-later
-	checkdepends = appstream-glib
 	makedepends = gobject-introspection
 	makedepends = meson
-	makedepends = sassc
-	depends = gspell
-	depends = libhandy
-	depends = otf-fira-mono
-	depends = otf-fira-sans
+	depends = gtksourceview5
+	depends = libadwaita
+	depends = libspelling
 	depends = python-cairo
 	depends = python-chardet
 	depends = python-gobject
@@ -21,12 +18,16 @@ pkgbase = apostrophe
 	depends = python-pypandoc
 	depends = python-regex
 	depends = python-setuptools
-	depends = webkit2gtk-4.1
+	depends = webkitgtk-6.0
 	optdepends = mathjax: for formula preview
 	optdepends = texlive-bin: for the pdftex module
-	source = https://gitlab.gnome.org/World/apostrophe/-/archive/v2.6.3/apostrophe-v2.6.3.tar.gz
-	source = Allow-building-with-webkitgtk-4.1.patch
-	sha256sums = 6f73c80146af0820ec705ec8b32ec64f0f323f51de6b6a4cfd4d02f0719876f3
-	sha256sums = c5c64aa312a17fcf761b0da956147f91532c8c43b33d608ca3acb6f10bd53d12
+	optdepends = ttf-fira-mono: recommended Mono font
+	optdepends = ttf-fira-sans: recommended Sans font
+	source = https://gitlab.gnome.org/World/apostrophe/-/archive/v3.0/apostrophe-v3.0.tar.gz
+	source = 0001-Use-system-font.patch
+	source = 2-rm-reveal-check.patch
+	sha256sums = 5f06a923ab2bffa16ba623f05b7ac67ea75b49891cee99048c157a15dae29f19
+	sha256sums = e909c05f259a874afd5e414fd13b0f162972e59c61c23e6d619e502254fcd4fe
+	sha256sums = a3e2eea5fca084f53fd6d0f9e61ace8e14b4c83d9c2f1d5ea74c8589c8c10b8f
 
 pkgname = apostrophe
diff --git a/.gitignore b/.gitignore
index 3bf9370e442f..8e90664e2508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!Allow-building-with-webkitgtk-4.1.patch
+!*.patch
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/2-rm-reveal-check.patch b/2-rm-reveal-check.patch
new file mode 100644
index 000000000000..a040b52ebb1d
--- /dev/null
+++ b/2-rm-reveal-check.patch
@@ -0,0 +1,13 @@
+--- meson.build	2024-01-12 14:18:57.598799803 +0800
++++ meson.build	2024-01-12 14:38:59.351937376 +0800
+@@ -60,9 +60,7 @@
+ #bindir = join_paths(get_option('prefix'), get_option('bindir'))
+ podir = meson.source_root() / 'po'
+ 
+-if not fs.exists(join_paths(pkgdatadir, 'libs/reveal.js'))
+-  error('No valid reveal.js installation found')
+-endif
++
+ 
+ subdir('data')
+ #subdir('help')
diff --git a/Allow-building-with-webkitgtk-4.1.patch b/Allow-building-with-webkitgtk-4.1.patch
deleted file mode 100644
index 9e409b8e7cd3..000000000000
--- a/Allow-building-with-webkitgtk-4.1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Wed, 31 Aug 2022 06:24:41 -0400
-Subject: Allow building with webkitgtk 4.1
-
-4.1 is the same as 4.0 except that it uses libsoup3
-
-https://gitlab.gnome.org/World/apostrophe/-/merge_requests/256
----
- apostrophe/inline_preview.py   | 5 ++++-
- apostrophe/preview_handler.py  | 5 ++++-
- apostrophe/preview_web_view.py | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/apostrophe/inline_preview.py b/apostrophe/inline_preview.py
-index 6e2fcc8..55ef85c 100644
---- a/apostrophe/inline_preview.py
-+++ b/apostrophe/inline_preview.py
-@@ -22,7 +22,10 @@ from urllib.parse import unquote
- import gi
- 
- gi.require_version("Gtk", "3.0")
--gi.require_version("WebKit2", "4.0")
-+try:
-+    gi.require_version('WebKit2', '4.1')
-+except ValueError:
-+    gi.require_version('WebKit2', '4.0')
- from gi.repository import Gtk, Gdk, GdkPixbuf, GLib
- from gi.repository import WebKit2
- from apostrophe import latex_to_PNG, markup_regex
-diff --git a/apostrophe/preview_handler.py b/apostrophe/preview_handler.py
-index f2edd61..a1b9981 100644
---- a/apostrophe/preview_handler.py
-+++ b/apostrophe/preview_handler.py
-@@ -22,7 +22,10 @@ import gi
- from apostrophe.preview_renderer import PreviewRenderer
- from apostrophe.settings import Settings
- 
--gi.require_version('WebKit2', '4.0')
-+try:
-+    gi.require_version('WebKit2', '4.1')
-+except ValueError:
-+    gi.require_version('WebKit2', '4.0')
- from gi.repository import WebKit2, GLib, Gtk, GObject
- 
- from apostrophe.preview_converter import PreviewConverter
-diff --git a/apostrophe/preview_web_view.py b/apostrophe/preview_web_view.py
-index bfd932c..f2c7146 100644
---- a/apostrophe/preview_web_view.py
-+++ b/apostrophe/preview_web_view.py
-@@ -17,7 +17,10 @@ import webbrowser
- 
- import gi
- 
--gi.require_version('WebKit2', '4.0')
-+try:
-+    gi.require_version('WebKit2', '4.1')
-+except ValueError:
-+    gi.require_version('WebKit2', '4.0')
- from gi.repository import WebKit2, GLib, GObject
- 
- 
diff --git a/PKGBUILD b/PKGBUILD
index 444d234400a1..133f91be7813 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=apostrophe
-pkgver=2.6.3
-pkgrel=6
+pkgver=3.0
+pkgrel=1
 pkgdesc="A distraction free Markdown editor for GNU/Linux made with GTK+"
 arch=('any')
 url="https://world.pages.gitlab.gnome.org/apostrophe"
 license=('GPL-3.0-or-later')
 depends=(
-  'gspell'
-  'libhandy'
-  'otf-fira-mono'
-  'otf-fira-sans'
+  'gtksourceview5'
+  'libadwaita'
+  'libspelling'
   'python-cairo'
   'python-chardet'
   'python-gobject'
@@ -19,22 +18,24 @@ depends=(
   'python-pypandoc'
   'python-regex'
   'python-setuptools'
-  'webkit2gtk-4.1'
+  'webkitgtk-6.0'
 )
 makedepends=(
   'gobject-introspection'
   'meson'
-  'sassc'
 )
-checkdepends=('appstream-glib')
 optdepends=(
   'mathjax: for formula preview'
   'texlive-bin: for the pdftex module'
+  'ttf-fira-mono: recommended Mono font'
+  'ttf-fira-sans: recommended Sans font'
 )
 source=("https://gitlab.gnome.org/World/apostrophe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
-        'Allow-building-with-webkitgtk-4.1.patch')
-sha256sums=('6f73c80146af0820ec705ec8b32ec64f0f323f51de6b6a4cfd4d02f0719876f3'
-            'c5c64aa312a17fcf761b0da956147f91532c8c43b33d608ca3acb6f10bd53d12')
+        '0001-Use-system-font.patch'
+        '2-rm-reveal-check.patch')
+sha256sums=('5f06a923ab2bffa16ba623f05b7ac67ea75b49891cee99048c157a15dae29f19'
+            'e909c05f259a874afd5e414fd13b0f162972e59c61c23e6d619e502254fcd4fe'
+            'a3e2eea5fca084f53fd6d0f9e61ace8e14b4c83d9c2f1d5ea74c8589c8c10b8f')
 
 prepare() {
   cd "$pkgname-v$pkgver"
@@ -48,7 +49,11 @@ prepare() {
   # W: hidden-file-or-dir
   rm apostrophe/.pylintrc
 
-  patch -Np1 -i ../Allow-building-with-webkitgtk-4.1.patch
+  # 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 meson.build < "$srcdir/2-rm-reveal-check.patch"
 }
 
 build() {