bump, fix charter

2 files changed, 13 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 961d4c382393..e60cd770a5b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = marker-git
 	pkgdesc = Markdown editor for linux made with Gtk+-3.0
-	pkgver = 2018.03.09.r78.g54ba2b64
+	pkgver = 2018.03.09.r87.g4e0d3ef6
 	pkgrel = 1
 	url = https://github.com/fabiocolacio/Marker
 	arch = x86_64
@@ -13,7 +13,8 @@ pkgbase = marker-git
 	optdepends = pandoc: export to HTML, PDF, RTF, OTF, DOCX, LaTeX
 	provides = marker
 	conflicts = marker
-	source = git+https://github.com/fabiocolacio/Marker.git
+	options = !buildflags
+	source = marker::git+https://github.com/fabiocolacio/Marker.git
 	source = scidown::git+https://github.com/Mandarancio/scidown.git
 	source = charter::git+https://github.com/Mandarancio/charter.git
 	source = tinyexpr::git+https://github.com/codeplea/tinyexpr.git
diff --git a/PKGBUILD b/PKGBUILD
index 32682e0fc263..e20751bff2a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor:
 
 pkgname=marker-git
-pkgver=2018.03.09.r78.g54ba2b64
+pkgver=2018.03.09.r87.g4e0d3ef6
 pkgrel=1
 pkgdesc='Markdown editor for linux made with Gtk+-3.0'
 arch=('x86_64')
@@ -13,19 +13,20 @@ makedepends=('git' 'meson')
 optdepends=('pandoc: export to HTML, PDF, RTF, OTF, DOCX, LaTeX')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
-source=("git+${url}.git"
+options=(!buildflags)
+source=("${pkgname%-*}::git+${url}.git"
         'scidown::git+https://github.com/Mandarancio/scidown.git'
         'charter::git+https://github.com/Mandarancio/charter.git'
         'tinyexpr::git+https://github.com/codeplea/tinyexpr.git')
 sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 pkgver() {
-    cd Marker
+    cd ${pkgname%-*}
     git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cd Marker
+    cd ${pkgname%-*}
     git submodule init
     git config submodule.src/scidown.url "$srcdir/scidown"
     git submodule update src/scidown
@@ -37,15 +38,16 @@ prepare() {
     git submodule init
     git config submodule.src/tinyexpr.url "$srcdir/tinyexpr"
     git submodule update src/tinyexpr
+
+    #fix "Cant get charter to work #187"
+    sed -i 's/en_US/C/' ${srcdir}/${pkgname%-*}/src/scidown/src/charter/src/svg.c
 }
 
 build() {
-    cd Marker
-    meson --prefix=/usr build
+    arch-meson ${pkgname%-*} build
     ninja -C build
 }
 
 package() {
-    cd Marker
-    DESTDIR="$pkgdir" ninja install -C build
+    DESTDIR="$pkgdir" ninja -C build install
 }