[arch-commits] Commit in megaglest/trunk (PKGBUILD lol.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, June 26, 2013 @ 19:53:31
  Author: svenstaro
Revision: 93165

upgpkg: megaglest 3.8.0beta1-1

Updating to 3.8.0beta1

Modified:
  megaglest/trunk/PKGBUILD
Deleted:
  megaglest/trunk/lol.patch

-----------+
 PKGBUILD  |   20 +++++++++-----------
 lol.patch |   43 -------------------------------------------
 2 files changed, 9 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-26 15:07:19 UTC (rev 93164)
+++ PKGBUILD	2013-06-26 17:53:31 UTC (rev 93165)
@@ -3,8 +3,9 @@
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=megaglest
-pkgver=3.7.1
-pkgrel=2
+pkgver=3.8.0beta1
+_pkgver=3.8.0-beta1
+pkgrel=1
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/megaglest/"
@@ -12,27 +13,24 @@
 depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew'
 'libircclient' 'miniupnpc' 'wxgtk' 'glu')
 makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
-        lol.patch)
-md5sums=('e7a960ec73784aa0f7b951d2ad963456'
-         '68fd326b73ed1c75981004fbdef6b73a')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz")
+md5sums=('1da8707d435ffb2342f03ca466d4eeed')
 
 build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
+  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
 
-  #patch -Np1 < "$srcdir/lol.patch"
-
   [[ -d build ]] && rm -r build
   mkdir build && cd build
+
   cmake .. \
     -DWANT_SVN_STAMP=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
+  cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
 
   cd build
   make DESTDIR="$pkgdir" install

Deleted: lol.patch
===================================================================
--- lol.patch	2013-06-26 15:07:19 UTC (rev 93164)
+++ lol.patch	2013-06-26 17:53:31 UTC (rev 93165)
@@ -1,43 +0,0 @@
-diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
-index 8fcfb27..3cb7a41 100644
---- a/source/shared_lib/include/graphics/math_util.h
-+++ b/source/shared_lib/include/graphics/math_util.h
-@@ -184,10 +184,10 @@ public:
- 
- 	Rect2<T> computeBoundingRect() const{
- 		return Rect2i(
--			min(p[0].x, p[1].x), 
--			min(p[0].y, p[2].y), 
--			max(p[2].x, p[3].x), 
--			max(p[1].y, p[3].y));
-+			std::min(p[0].x, p[1].x),
-+			std::min(p[0].y, p[2].y),
-+			std::max(p[2].x, p[3].x),
-+			std::max(p[1].y, p[3].y));
- 	}
- 
- 	bool isInside(const Vec2<T> &pt) const{
-diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
-index b09c972..ddebd03 100644
---- a/source/shared_lib/sources/platform/posix/ircclient.cpp
-+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
-@@ -13,6 +13,7 @@
- #include "ircclient.h"
- #include "util.h"
- #include "platform_common.h"
-+#include "libirc_rfcnumeric.h"
- #include "libircclient.h"
- 
- #include <stdio.h>
-diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
-index 05478fc..c27aa62 100644
---- a/source/shared_lib/sources/util/util.cpp
-+++ b/source/shared_lib/sources/util/util.cpp
-@@ -19,6 +19,7 @@
- #include <stdarg.h>
- #include <time.h>
- #include <fcntl.h> // for open()
-+#include <unistd.h>
- 
- #ifdef WIN32
-   #include <io.h> // for open()