upgpkg: 2018.04.25-1

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e3b6286918c..dd5d69b62504 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = marker
 	pkgdesc = Markdown editor for linux made with Gtk+-3.0
-	pkgver = 2018.03.09
+	pkgver = 2018.04.25
 	pkgrel = 1
 	url = https://github.com/fabiocolacio/Marker
 	arch = x86_64
 	license = GPL3
+	makedepends = git
 	makedepends = meson
 	depends = gtksourceview3
 	depends = gtkspell3
 	depends = webkit2gtk
 	optdepends = pandoc: export to HTML, PDF, RTF, OTF, DOCX, LaTeX
-	source = marker-2018.03.09.tar.xz::https://github.com/fabiocolacio/Marker/releases/download/2018.03.09/Marker.2018.03.09.tar.xz
-	sha256sums = 3ea9a962735ad7ad6ba6fbe3686a7aada9d1fbdb20ee90b1fca3623253cd3513
+	options = !buildflags
+	source = marker::git+https://github.com/fabiocolacio/Marker.git#tag=2018.04.25
+	sha256sums = SKIP
 
 pkgname = marker
 
diff --git a/PKGBUILD b/PKGBUILD
index 44ab8e1d6891..44fb94828136 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,32 @@
 # Contributor:
 
 pkgname=marker
-pkgver=2018.03.09
+pkgver=2018.04.25
 pkgrel=1
 pkgdesc='Markdown editor for linux made with Gtk+-3.0'
 arch=('x86_64')
 url='https://github.com/fabiocolacio/Marker'
 license=('GPL3')
 depends=('gtksourceview3' 'gtkspell3' 'webkit2gtk')
-makedepends=('meson')
+makedepends=('git' 'meson')
 optdepends=('pandoc: export to HTML, PDF, RTF, OTF, DOCX, LaTeX')
-source=("$pkgname-$pkgver.tar.xz::$url/releases/download/$pkgver/Marker.$pkgver.tar.xz")
-sha256sums=('3ea9a962735ad7ad6ba6fbe3686a7aada9d1fbdb20ee90b1fca3623253cd3513')
+options=(!buildflags)
+source=("${pkgname}::git+${url}.git#tag=${pkgver}")
+sha256sums=('SKIP')
+
+prepare() {
+    cd ${pkgname}
+    git submodule update --init --recursive
+
+    #fix "Cant get charter to work #187"
+    sed -i 's/en_US/C/' src/scidown/src/charter/src/svg.c
+}
 
 build() {
-  cd Marker
-  meson --prefix=/usr build
-  ninja -C build
+    arch-meson ${pkgname} build
+    ninja -C build
 }
 
 package() {
-  cd Marker
-  DESTDIR="$pkgdir" ninja install -C build
+    DESTDIR="$pkgdir" ninja -C build install
 }