summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Walladge2016-03-07 18:23:36 +1030
committerSamuel Walladge2016-03-07 18:23:36 +1030
commit23126a3fdd64dff648afb891b933c44d60d437ec (patch)
tree3d70ec8347f07f0eade383fbf1628e268cc21537
parent64d764bbc63bb7293443e7dc36e59eaf54d8c490 (diff)
downloadaur-23126a3fdd64dff648afb891b933c44d60d437ec.tar.gz
build problems fxed upsteam, removed patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD17
-rw-r--r--openspades.patch35
3 files changed, 7 insertions, 53 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54a3b55fd09..164d9b365b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Mar 7 00:31:55 UTC 2016
+# Mon Mar 7 07:52:26 UTC 2016
pkgbase = openspades-git
pkgdesc = A clone of Voxlap Ace of Spades 0.75 (git version)
- pkgver = 0.0.12.84.g355d1f2
- pkgrel = 2
+ pkgver = 0.0.12.86.g86de403
+ pkgrel = 3
url = https://github.com/yvt/openspades
install = openspades.install
arch = i686
@@ -24,9 +24,7 @@ pkgbase = openspades-git
provides = openspades
conflicts = openspades
source = openspades-git::git+https://github.com/yvt/openspades.git
- source = openspades.patch
md5sums = SKIP
- md5sums = f8b429ee14d92598fd684fcf4ce3097e
pkgname = openspades-git
diff --git a/PKGBUILD b/PKGBUILD
index d97278d46c8..ed2ac39046a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: kusakata <shohei atmark kusakata period com>
pkgname=openspades-git
-pkgver=0.0.12.84.g355d1f2
-pkgrel=2
+pkgver=0.0.12.86.g86de403
+pkgrel=3
pkgdesc="A clone of Voxlap Ace of Spades 0.75 (git version)"
arch=('i686' 'x86_64')
url="https://github.com/yvt/openspades"
@@ -14,17 +14,8 @@ makedepends=('cmake' 'git' 'unzip' 'wget')
provides=('openspades')
conflicts=('openspades')
install=openspades.install
-source=("$pkgname"::'git+https://github.com/yvt/openspades.git'
- 'openspades.patch')
-md5sums=('SKIP'
- 'f8b429ee14d92598fd684fcf4ce3097e')
-
-prepare() {
- # Note: this being the git version, possibly soon be fixed/modified upstream and patch becomes obsolete/invalid
- # if patching or building with this patch fails, please notify the package maintainer
- cd "${srcdir}/${pkgname}"
- patch -p1 -i ${srcdir}/openspades.patch
-}
+source=("$pkgname"::'git+https://github.com/yvt/openspades.git')
+md5sums=('SKIP')
pkgver() {
cd "$pkgname"
diff --git a/openspades.patch b/openspades.patch
deleted file mode 100644
index 7923b0ac982..00000000000
--- a/openspades.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -aur openspades-0.0.12.pristine/Sources/Client/Client_Input.cpp openspades-0.0.12.new/Sources/Client/Client_Input.cpp
---- openspades-0.0.12.pristine/Sources/Client/Client_Input.cpp 2016-03-07 10:11:47.126752964 +1030
-+++ openspades-0.0.12.new/Sources/Client/Client_Input.cpp 2016-03-07 10:13:31.009665382 +1030
-@@ -38,6 +38,7 @@
-
- #include "NetClient.h"
-
-+using namespace std;
-
- SPADES_SETTING(cg_mouseSensitivity, "1");
- SPADES_SETTING(cg_zoomedMouseSensScale, "0.6");
-diff -aur openspades-0.0.12.pristine/Sources/Client/Corpse.cpp openspades-0.0.12.new/Sources/Client/Corpse.cpp
---- openspades-0.0.12.pristine/Sources/Client/Corpse.cpp 2016-03-07 10:11:47.126752964 +1030
-+++ openspades-0.0.12.new/Sources/Client/Corpse.cpp 2016-03-07 10:13:31.049663957 +1030
-@@ -27,6 +27,8 @@
- #include "../Core/Debug.h"
- #include "../Core/Settings.h"
-
-+using namespace std;
-+
- SPADES_SETTING(r_corpseLineCollision, "1");
-
- namespace spades {
-diff -aur openspades-0.0.12.pristine/Sources/Draw/SWMapRenderer.cpp openspades-0.0.12.new/Sources/Draw/SWMapRenderer.cpp
---- openspades-0.0.12.pristine/Sources/Draw/SWMapRenderer.cpp 2016-03-07 10:11:47.133419386 +1030
-+++ openspades-0.0.12.new/Sources/Draw/SWMapRenderer.cpp 2016-03-07 10:13:31.092995748 +1030
-@@ -31,6 +31,8 @@
- #include "SWUtils.h"
- #include <cstdint>
-
-+using namespace std;
-+
- SPADES_SETTING(r_swUndersampling, "0");
-
- namespace spades {