summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosip Ponjavic2018-03-07 16:04:08 +0100
committerJosip Ponjavic2018-03-07 16:04:08 +0100
commit82ba5a202022c632d69e768c1bb646fbaac40e9c (patch)
tree61748bad05aa5b0b3dea8e4c05dd2e96efec0a89
parent87270b814d12b242516910d9af2ba592186dd87e (diff)
downloadaur-82ba5a202022c632d69e768c1bb646fbaac40e9c.tar.gz
add new git submodules
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD38
2 files changed, 35 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index afdaa82aaa86..43d7757afc19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = marker-git
pkgdesc = Markdown editor for linux made with Gtk+-3.0
- pkgver = 2018.01.28.r16.g7aa8870a
+ pkgver = 2018.01.28.r69.g215ddd13
pkgrel = 1
url = https://github.com/fabiocolacio/Marker
arch = x86_64
@@ -14,6 +14,12 @@ pkgbase = marker-git
provides = marker
conflicts = marker
source = 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
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = SKIP
pkgname = marker-git
diff --git a/PKGBUILD b/PKGBUILD
index 3dfc42d71706..13e7cbf4c25a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor:
pkgname=marker-git
-pkgver=2018.01.28.r16.g7aa8870a
+pkgver=2018.01.28.r69.g215ddd13
pkgrel=1
pkgdesc='Markdown editor for linux made with Gtk+-3.0'
arch=('x86_64')
@@ -13,21 +13,39 @@ makedepends=('git' 'meson')
optdepends=('pandoc: export to HTML, PDF, RTF, OTF, DOCX, LaTeX')
provides=("${pkgname%-*}")
conflicts=("${pkgname%-*}")
-source=("git+${url}.git")
-sha256sums=('SKIP')
+source=("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
- git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+ cd Marker
+ git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd Marker
+ git submodule init
+ git config submodule.src/scidown.url "$srcdir/scidown"
+ git submodule update src/scidown
+ cd src/scidown
+ git submodule init
+ git config submodule.src/charter.url "$srcdir/charter"
+ git submodule update src/charter
+ cd src/charter
+ git submodule init
+ git config submodule.src/tinyexpr.url "$srcdir/tinyexpr"
+ git submodule update src/tinyexpr
}
build() {
- cd Marker
- meson --prefix=/usr build
- ninja -C build
+ cd Marker
+ meson --prefix=/usr build
+ ninja -C build
}
package() {
- cd Marker
- DESTDIR="$pkgdir" ninja install -C build
+ cd Marker
+ DESTDIR="$pkgdir" ninja install -C build
}