2.6

3 files changed, 25 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8566b7becfab..7453569f4a60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apostrophe
 	pkgdesc = A distraction free Markdown editor for GNU/Linux made with GTK+
-	pkgver = 2.5
-	pkgrel = 3
+	pkgver = 2.6
+	pkgrel = 1
 	url = https://world.pages.gitlab.gnome.org/apostrophe
 	changelog = apostrophe-NEWS
 	arch = any
@@ -11,7 +11,7 @@ pkgbase = apostrophe
 	makedepends = gobject-introspection
 	makedepends = sassc
 	depends = gspell
-	depends = libhandy
+	depends = libhandy>=1.6
 	depends = otf-fira-mono
 	depends = otf-fira-sans
 	depends = python-cairo
@@ -24,9 +24,7 @@ pkgbase = apostrophe
 	depends = webkit2gtk
 	optdepends = texlive-latexextra: for the pdftex module
 	optdepends = mathjax: for formula preview
-	source = https://gitlab.gnome.org/World/apostrophe/-/archive/v2.5/apostrophe-v2.5.tar.gz
-	source = apostrophe.patch
-	sha256sums = 366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4
-	sha256sums = 6471631544fd666074ade2aec0e15c48a09735f8305ce64e8ba5091b28c20039
+	source = https://gitlab.gnome.org/World/apostrophe/-/archive/v2.6/apostrophe-v2.6.tar.gz
+	sha256sums = 2cf98031a4b66afe45d0dd476e0122e328940db0907d20153722f64ed4713ea1
 
 pkgname = apostrophe
diff --git a/PKGBUILD b/PKGBUILD
index aaecd35be3b9..b1df6b6c2211 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=apostrophe
-pkgver=2.5
-pkgrel=3
+pkgver=2.6
+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=('GPL3')
-depends=('gspell' 'libhandy' 'otf-fira-mono' 'otf-fira-sans' 'python-cairo'
+depends=('gspell' 'libhandy>=1.6' 'otf-fira-mono' 'otf-fira-sans' 'python-cairo'
          'python-gobject' 'python-levenshtein' 'python-pyenchant' 'python-pypandoc'
          'python-regex' 'python-setuptools' 'webkit2gtk')
 makedepends=('meson' 'gobject-introspection' 'sassc')
@@ -14,14 +14,11 @@ optdepends=('texlive-latexextra: for the pdftex module'
             'mathjax: for formula preview')
 checkdepends=('appstream-glib')
 changelog="$pkgname-NEWS"
-source=("https://gitlab.gnome.org/World/apostrophe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
-        "$pkgname.patch")
-sha256sums=('366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4'
-            '6471631544fd666074ade2aec0e15c48a09735f8305ce64e8ba5091b28c20039')
+source=("https://gitlab.gnome.org/World/apostrophe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz")
+sha256sums=('2cf98031a4b66afe45d0dd476e0122e328940db0907d20153722f64ed4713ea1')
 
 prepare() {
   cd "$pkgname-v$pkgver"
-  patch -Np1 -i "$srcdir/$pkgname.patch"
 
   # Bug 1953395 - Apostrophe can't export to HTML
   sed -i 's|/app/share/fonts/FiraSans-Regular.ttf|/usr/share/fonts/mozilla-fira/FiraSans-Regular.otf|' \
diff --git a/apostrophe-NEWS b/apostrophe-NEWS
index 7c027a08afa4..07f100d22bc8 100644
--- a/apostrophe-NEWS
+++ b/apostrophe-NEWS
@@ -1,3 +1,18 @@
+Version 2.6
+~~~~~~~~~~~~~~~
+Released: 2022-03-19
+
+Features:
+- Implemented multiwindow support
+- Save window state on exit
+- Ported to libhandy
+- Improved the overall UI
+- New animations
+- Follow the Dark Mode global preference
+- Add an "automatic" color mode
+- Improve the High Contrast styles
+- Improve inline preview markup
+
 Version 2.5
 ~~~~~~~~~~~~~~~
 Released: 2021-08-28