From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 19 Aug 2013 22:06:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into master_PKGBUILD
X-Git-Tag: 0.3.0^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=701363347fa3f231ed8b973503935d596aae57eb;hp=963e93e8e813df31730ee2fd092f58b348e0593f

Merge remote-tracking branch 'upstream/master' into master_PKGBUILD
---

diff --git a/distro/archlinux/git/PKGBUILD b/distro/archlinux/git/PKGBUILD
index ac00fef..da247d7 100644
--- a/distro/archlinux/git/PKGBUILD
+++ b/distro/archlinux/git/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>
 
 pkgname=gmqcc-git
-pkgver=0.2.612.g160e7cf
+pkgver=0.3.0
 pkgver(){
     cd gmqcc
     git describe --tags | sed -e 's/^gmqcc\-//' -e 's/-/./g'
diff --git a/distro/archlinux/release/PKGBUILD b/distro/archlinux/release/PKGBUILD
index 2c933bf..62c7160 100644
--- a/distro/archlinux/release/PKGBUILD
+++ b/distro/archlinux/release/PKGBUILD
@@ -2,25 +2,17 @@
 # Contributor: Wolfgang Bumiller <blub@speed.at>
 
 pkgname=gmqcc
-pkgver=0.2.9
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="An Improved Quake C Compiler"
 arch=('i686' 'x86_64')
 depends=('glibc')
 url="https://github.com/graphitemaster/gmqcc.git"
 license=('MIT')
-source=(gmqcc-$pkgver.zip::https://github.com/graphitemaster/gmqcc/zipball/$pkgver
-	    build_fix.patch) # commit 4c4aa5534c34
+source=(gmqcc-$pkgver.zip::https://github.com/graphitemaster/gmqcc/zipball/$pkgver)
+sha1sums=('27f59ce53c77bc2cf97eb49704b1bc9e8d892d2e')
 
-sha1sums=('adf972360c0b3d2f032a688952f6fb4715e4d45b'
-		 '0b69dc8b786c7617fe17e6a5fd70407d1c4153d6')
-
-_gitname=graphitemaster-gmqcc-219508e/
-
-prepare() {
-	cd "$srcdir"/"$_gitname"
-	patch -p1 <../build_fix.patch
-}
+_gitname=graphitemaster-gmqcc-963e93e/
 
 build() {
 	msg "Starting compilation..."
diff --git a/distro/archlinux/release/build_fix.patch b/distro/archlinux/release/build_fix.patch
deleted file mode 100644
index ec3af0d..0000000
--- a/distro/archlinux/release/build_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/test.c b/test.c
-index 0af7477..7722af2 100644
---- a/test.c
-+++ b/test.c
-@@ -116,9 +116,9 @@ FILE ** task_popen(const char *command, const char *mode) {
-         close(errhandle[0]);
- 
-         /* see piping documentation for this sillyness :P */
--        close(0), dup(inhandle [0]);
--        close(1), dup(outhandle[1]);
--        close(2), dup(errhandle[1]);
-+        close(0); (void)!dup(inhandle [0]);
-+        close(1); (void)!dup(outhandle[1]);
-+        close(2); (void)!dup(errhandle[1]);
- 
-         execvp(*argv, argv);
-         exit(EXIT_FAILURE);
-