adopted package.updated to 0.4.1. Added not upstream patch.

2 files changed, 24 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 779f8d3b242d..af0a47c51b96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = simple-diary-gtk
 	pkgdesc = Simple and lightweight diary app
-	pkgver = 0.2.1
+	pkgver = 0.4.1
 	pkgrel = 1
-	url = https://github.com/johan-bjareholt/simple-diary-gtk
+	url = https://github.com/johan-bjareholt/${pkgname}
 	arch = x86_64
 	license = GPL3
 	makedepends = appstream-glib
@@ -10,8 +10,9 @@ pkgbase = simple-diary-gtk
 	depends = libhandy
 	depends = md4c
 	depends = webkit2gtk
-	source = https://github.com/johan-bjareholt/simple-diary-gtk/archive/v0.2.1/simple-diary-gtk-0.2.1.tar.gz
-	sha256sums = 4b51b1b0f4d2c1607e034a6037cad94d34b91256a17bb946a1d4889dae95936d
+	depends = gtkmdview
+	conflicts = simple-diary-gtk-git
+	source = https://github.com/johan-bjareholt/simple-diary-gtk/archive/v0.4.1/simple-diary-gtk-0.4.1.tar.gz
+	sha256sums = a32000eac64bdbd2ea37d0e37c10b112f0b621dc7b316df67be4937eace1dc48
 
 pkgname = simple-diary-gtk
-
diff --git a/PKGBUILD b/PKGBUILD
index 9d72aef2fe57..a30a9509821c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,34 @@
+# Maintainer: kleintux <reg-archlinux AT klein DOT tuxli DOT ch> 
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=simple-diary-gtk
-pkgver=0.2.1
+pkgver=0.4.1
 pkgrel=1
 pkgdesc='Simple and lightweight diary app'
 arch=('x86_64')
-url='https://github.com/johan-bjareholt/simple-diary-gtk'
+url='https://github.com/johan-bjareholt/${pkgname}'
 license=('GPL3')
-depends=('libhandy' 'md4c' 'webkit2gtk')
+depends=('libhandy' 'md4c' 'webkit2gtk' 'gtkmdview')
 makedepends=('appstream-glib' 'meson')
-source=("https://github.com/johan-bjareholt/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('4b51b1b0f4d2c1607e034a6037cad94d34b91256a17bb946a1d4889dae95936d')
+source=("https://github.com/johan-bjareholt/${pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('a32000eac64bdbd2ea37d0e37c10b112f0b621dc7b316df67be4937eace1dc48')
+conflicts=("${pkgname}-git")
+
+#temporary see https://github.com/johan-bjareholt/simple-diary-gtk/commit/7c229e33113af4b40932a367452599b05831a749
+prepare() {
+  sed -i '28s/.*/"%s", message);/' ${pkgname}-${pkgver}/src/utils.c
+}
 
 build() {
-  arch-meson $pkgname-$pkgver build
+  arch-meson ${pkgname}-${pkgver} build
   meson compile -C build
 }
 
-check() {
-  meson test -C build --print-errorlogs
-}
+#temporary see https://github.com/johan-bjareholt/simple-diary-gtk/commit/7c229e33113af4b40932a367452599b05831a749
+#check() {
+#  meson test -C build --print-errorlogs
+#}
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  DESTDIR="${pkgdir}" meson install -C build
 }