summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD26
3 files changed, 17 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a217729e1fbf..558d95171a1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-pkgbase = slade-git
- pkgdesc = SLADE3 Doom editor (git version)
- pkgver = 3.1.2+25+g26eb6709
+pkgbase = slade
+ pkgdesc = SLADE3 Doom editor
+ pkgver = 3.1.2
pkgrel = 1
url = http://slade.mancubus.net/
arch = i686
arch = x86_64
license = GPL
makedepends = cmake
- makedepends = git
makedepends = p7zip
depends = bzip2
depends = curl
depends = fluidsynth
depends = freeimage
depends = ftgl
- depends = glew
+ depends = glew>=2.1
+ depends = glew<2.2
depends = glu
depends = gtk3
depends = libgl
@@ -23,10 +23,8 @@ pkgbase = slade-git
depends = webkit2gtk
depends = wxgtk3>=3.0
depends = zlib
- provides = slade
- conflicts = slade
- source = slade::git://github.com/sirjuddington/SLADE.git
- sha256sums = SKIP
+ source = https://github.com/sirjuddington/SLADE/archive/3.1.2.tar.gz
+ sha256sums = 213d8ac065e3ec06e7e7df39695a58296f7ca435c10244389b21d9f91ed49724
-pkgname = slade-git
+pkgname = slade
diff --git a/.gitignore b/.gitignore
index 6138a8d38091..5642e2f2619b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-slade
-
/*.tar.gz
/*.tar.bz2
/*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index fa0073de6a79..5deecaede5e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Jan Cholasta <grubber at grubber cz>
_name=slade
-pkgname=${_name}-git
-pkgver=3.1.2+25+g26eb6709
+pkgname=${_name}
+pkgver=3.1.2
pkgrel=1
-pkgdesc='SLADE3 Doom editor (git version)'
+pkgdesc='SLADE3 Doom editor'
arch=('i686' 'x86_64')
url='http://slade.mancubus.net/'
license=('GPL')
@@ -13,7 +13,8 @@ depends=('bzip2'
'fluidsynth'
'freeimage'
'ftgl'
- 'glew'
+ 'glew>=2.1'
+ 'glew<2.2'
'glu'
'gtk3'
'libgl'
@@ -23,21 +24,12 @@ depends=('bzip2'
'wxgtk3>=3.0'
'zlib')
makedepends=('cmake'
- 'git'
'p7zip')
-provides=("${_name}")
-conflicts=("${_name}")
-source=("${_name}::git://github.com/sirjuddington/SLADE.git")
-sha256sums=('SKIP')
-
-pkgver() {
- cd slade
-
- git describe --long --tags | sed -r 's/-/+/g'
-}
+source=("https://github.com/sirjuddington/SLADE/archive/${pkgver}.tar.gz")
+sha256sums=('213d8ac065e3ec06e7e7df39695a58296f7ca435c10244389b21d9f91ed49724')
build() {
- cd slade
+ cd SLADE-${pkgver}
ln -sf /usr/bin/wx-config-gtk3 wx-config
@@ -49,7 +41,7 @@ build() {
}
package() {
- cd slade
+ cd SLADE-${pkgver}
make install DESTDIR="$pkgdir"
}