2.6.1

5 files changed, 23 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7453569f4a60..a7acfae94463 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = apostrophe
 	pkgdesc = A distraction free Markdown editor for GNU/Linux made with GTK+
-	pkgver = 2.6
+	pkgver = 2.6.1
 	pkgrel = 1
 	url = https://world.pages.gitlab.gnome.org/apostrophe
 	changelog = apostrophe-NEWS
@@ -24,7 +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.6/apostrophe-v2.6.tar.gz
-	sha256sums = 2cf98031a4b66afe45d0dd476e0122e328940db0907d20153722f64ed4713ea1
+	source = https://gitlab.gnome.org/World/apostrophe/-/archive/v2.6.1/apostrophe-v2.6.1.tar.gz
+	sha256sums = f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
 
 pkgname = apostrophe
diff --git a/.gitignore b/.gitignore
index f8ef36f9d81b..5cb45e05c55d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!apostrophe.patch
 !apostrophe-NEWS
diff --git a/PKGBUILD b/PKGBUILD
index b1df6b6c2211..78c4ea3dc356 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=apostrophe
-pkgver=2.6
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="A distraction free Markdown editor for GNU/Linux made with GTK+"
 arch=('any')
@@ -15,7 +15,7 @@ optdepends=('texlive-latexextra: for the pdftex module'
 checkdepends=('appstream-glib')
 changelog="$pkgname-NEWS"
 source=("https://gitlab.gnome.org/World/apostrophe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz")
-sha256sums=('2cf98031a4b66afe45d0dd476e0122e328940db0907d20153722f64ed4713ea1')
+sha256sums=('f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c')
 
 prepare() {
   cd "$pkgname-v$pkgver"
diff --git a/apostrophe-NEWS b/apostrophe-NEWS
index 07f100d22bc8..c76f2706e7da 100644
--- a/apostrophe-NEWS
+++ b/apostrophe-NEWS
@@ -1,3 +1,21 @@
+Version 2.6.1
+~~~~~~~~~~~~~~~
+Released: 2022-03-20
+
+Bugfixes:
+- A small bug in 2.6 which didn't allow to save files
+
+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.6
 ~~~~~~~~~~~~~~~
 Released: 2022-03-19
diff --git a/apostrophe.patch b/apostrophe.patch
deleted file mode 100644
index cc3888602587..000000000000
--- a/apostrophe.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff '--color=auto' --unified --recursive --text apostrophe-v2.5/data/meson.build apostrophe-v2.5.patched/data/meson.build
---- apostrophe-v2.5/data/meson.build	2021-08-29 04:14:59.000000000 +0200
-+++ apostrophe-v2.5.patched/data/meson.build	2022-01-18 20:28:16.437498834 +0100
-@@ -2,7 +2,6 @@
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_file = i18n.merge_file(
--  'desktop',
-   input: configure_file(
-     input: 'org.gnome.gitlab.somas.Apostrophe.desktop.in.in',
-     output: '@BASENAME@',
-@@ -46,7 +45,6 @@
- # )
- 
- appdata_file = i18n.merge_file(
--  'appdata',
-   input: metainfo_configured,
-   output: '@0@.metainfo.xml'.format(application_id),
-   po_dir: podir,