summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD15
2 files changed, 12 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index de4724bf90fb..206ab4fa1c27 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Dec 18 02:54:23 UTC 2018
pkgbase = sasm
pkgdesc = Simple crossplatform IDE for NASM, GAS, FASM assembly languages
- pkgver = 3.10.1
+ pkgver = 3.14.0
pkgrel = 1
url = http://dman95.github.io/SASM/english.html
arch = i686
@@ -12,9 +10,8 @@ pkgbase = sasm
depends = nasm
depends = gdb
depends = gcc
- conflicts = fasm
- source = sasm-3.10.1.tar.gz::https://github.com/Dman95/SASM/archive/v3.10.1.tar.gz
- sha256sums = 7bd7f3a01f217026362024b53505688fd3757a7dd8cc4e163b55d81a01c078d3
+ depends = fasm
+ source = sasm-3.14.0.tar.gz::https://github.com/Dman95/SASM/archive/v3.14.0.tar.gz
+ sha256sums = 6c087bda9a7dfc7da2b8342c57c36f56fd2fa37414dfc2ab0da6aef28f97fc3d
pkgname = sasm
-
diff --git a/PKGBUILD b/PKGBUILD
index d07fc7640034..c798dad75f0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,25 @@
# Contributor: V0K3 <v0k3@inventati.org>
pkgname=sasm
-pkgver=3.10.1
+pkgver=3.14.0
pkgrel=1
pkgdesc="Simple crossplatform IDE for NASM, GAS, FASM assembly languages"
arch=('i686' 'x86_64')
url="http://dman95.github.io/SASM/english.html"
license=('GPL3')
-depends=('qt5-base' 'nasm' 'gdb' 'gcc')
-conflicts=('fasm')
+depends=('qt5-base' 'nasm' 'gdb' 'gcc' 'fasm')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Dman95/SASM/archive/v${pkgver}.tar.gz")
-sha256sums=('7bd7f3a01f217026362024b53505688fd3757a7dd8cc4e163b55d81a01c078d3')
+sha256sums=('6c087bda9a7dfc7da2b8342c57c36f56fd2fa37414dfc2ab0da6aef28f97fc3d')
build() {
- cd "${srcdir}/${pkgname^^}-${pkgver}"
- qmake PREFIX="/usr"
+ cd "${pkgname^^}-${pkgver}"
+ qmake PREFIX=/usr
make
}
package() {
- cd "${srcdir}/${pkgname^^}-${pkgver}"
+ cd "${pkgname^^}-${pkgver}"
make INSTALL_ROOT="${pkgdir}" install
+ # Don't provide fasm in the package, require it instead
+ rm "${pkgdir}"/usr/bin/fasm
}