summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabioLolix2018-05-28 07:17:33 +0200
committerFabioLolix2018-05-28 07:17:33 +0200
commit55b9dae16dc528ed0920f79d3295366b104eed60 (patch)
tree3aa96d14d0342d4dec3268350fdd6d725fff1574
parenta15d936977a55c9f8bc108df2e4f31c9da8af05d (diff)
downloadaur-55b9dae16dc528ed0920f79d3295366b104eed60.tar.gz
v0.9.7, fix build
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD36
2 files changed, 35 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3888d6f6ef5..ec4385fe1fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = textosaurus
pkgdesc = Simple cross-platform text editor based on Qt and Scintilla
- pkgver = 0.9.3.1
+ pkgver = 0.9.7
pkgrel = 1
epoch = 1
url = https://github.com/martinrotter/textosaurus
@@ -15,7 +15,17 @@ pkgbase = textosaurus
conflicts = textosaurus
conflicts = textosaurus-git
replaces = textilosaurus
- source = git+https://github.com/martinrotter/textosaurus#commit=1710f53c81dbcf4788fd23ebaabf6ec77a4a3fb6
+ source = git+https://github.com/martinrotter/textosaurus#tag=0.9.7
+ source = git+https://github.com/martinrotter/transka.git
+ source = git+https://github.com/martinrotter/7za.git
+ source = git+https://github.com/martinrotter/nsis.git
+ source = git+https://github.com/martinrotter/sed.git
+ source = git+https://github.com/martinrotter/scintilla
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
+ md5sums = SKIP
md5sums = SKIP
pkgname = textosaurus
diff --git a/PKGBUILD b/PKGBUILD
index f80eff72bad..8d514d91ba0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=textosaurus
epoch=1
-pkgver=0.9.3.1
+pkgver=0.9.7
pkgrel=1
pkgdesc="Simple cross-platform text editor based on Qt and Scintilla"
arch=('x86_64' 'i686')
@@ -13,30 +13,40 @@ makedepends=('git' 'qt5-tools')
provides=('textosaurus')
conflicts=('textosaurus' 'textosaurus-git')
replaces=('textilosaurus')
-_commit=1710f53c81dbcf4788fd23ebaabf6ec77a4a3fb6
-source=("git+https://github.com/martinrotter/textosaurus#commit=$_commit")
-md5sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
+source=("git+https://github.com/martinrotter/textosaurus#tag=$pkgver"
+ "git+https://github.com/martinrotter/transka.git"
+ "git+https://github.com/martinrotter/7za.git"
+ "git+https://github.com/martinrotter/nsis.git"
+ "git+https://github.com/martinrotter/sed.git"
+ "git+https://github.com/martinrotter/scintilla")
+md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
prepare() {
cd "${srcdir}/${pkgname}"
- install -d build
git submodule init
+
+ git config 'submodule.resources/scripts/transka.url' "${srcdir}/transka"
+ git config 'submodule.resources/scripts/7za.url' "${srcdir}/7za"
+ git config 'submodule.resources/scripts/nsis.url' "${srcdir}/nsis"
+ git config 'submodule.resources/scripts/sed.url' "${srcdir}/sed"
+ git config 'submodule.src/libtextosaurus/3rd-party/scintilla.url' "${srcdir}/scintilla"
+
git submodule update
}
build() {
- cd "${srcdir}/${pkgname}/build"
- qmake ../textosaurus.pro -r CONFIG+=release PREFIX=/usr
+ cd "${srcdir}/${pkgname}"
+ qmake build.pro -r CONFIG+=release PREFIX=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}/build"
+ cd "${srcdir}/${pkgname}"
make install INSTALL_ROOT="${pkgdir}/"
}