[arch-commits] Commit in megaglest/repos (6 files)
Sven-Hendrik Haase
svenstaro at nymeria.archlinux.org
Wed Jun 26 17:55:14 UTC 2013
Date: Wednesday, June 26, 2013 @ 19:55:13
Author: svenstaro
Revision: 93166
archrelease: copy trunk to community-i686, community-x86_64
Added:
megaglest/repos/community-i686/PKGBUILD
(from rev 93165, megaglest/trunk/PKGBUILD)
megaglest/repos/community-x86_64/PKGBUILD
(from rev 93165, megaglest/trunk/PKGBUILD)
Deleted:
megaglest/repos/community-i686/PKGBUILD
megaglest/repos/community-i686/lol.patch
megaglest/repos/community-x86_64/PKGBUILD
megaglest/repos/community-x86_64/lol.patch
----------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 41 ----------------------
community-i686/lol.patch | 43 -----------------------
community-x86_64/PKGBUILD | 41 ----------------------
community-x86_64/lol.patch | 43 -----------------------
5 files changed, 78 insertions(+), 168 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-06-26 17:53:31 UTC (rev 93165)
+++ community-i686/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=megaglest
-pkgver=3.7.1
-pkgrel=2
-pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/megaglest/"
-license=('GPL3')
-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')
-
-build() {
- 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
- make
-}
-
-package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
- cd build
- make DESTDIR="$pkgdir" install
-}
-
-# vim: sw=2:ts=2 et:
Copied: megaglest/repos/community-i686/PKGBUILD (from rev 93165, megaglest/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+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/"
+license=('GPL3')
+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")
+md5sums=('1da8707d435ffb2342f03ca466d4eeed')
+
+build() {
+ cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake .. \
+ -DWANT_SVN_STAMP=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+
+ cd build
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: sw=2:ts=2 et:
Deleted: community-i686/lol.patch
===================================================================
--- community-i686/lol.patch 2013-06-26 17:53:31 UTC (rev 93165)
+++ community-i686/lol.patch 2013-06-26 17:55:13 UTC (rev 93166)
@@ -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()
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-06-26 17:53:31 UTC (rev 93165)
+++ community-x86_64/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=megaglest
-pkgver=3.7.1
-pkgrel=2
-pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/megaglest/"
-license=('GPL3')
-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')
-
-build() {
- 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
- make
-}
-
-package() {
- cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
- cd build
- make DESTDIR="$pkgdir" install
-}
-
-# vim: sw=2:ts=2 et:
Copied: megaglest/repos/community-x86_64/PKGBUILD (from rev 93165, megaglest/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-06-26 17:55:13 UTC (rev 93166)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
+
+pkgname=megaglest
+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/"
+license=('GPL3')
+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")
+md5sums=('1da8707d435ffb2342f03ca466d4eeed')
+
+build() {
+ cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake .. \
+ -DWANT_SVN_STAMP=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
+
+ cd build
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: sw=2:ts=2 et:
Deleted: community-x86_64/lol.patch
===================================================================
--- community-x86_64/lol.patch 2013-06-26 17:53:31 UTC (rev 93165)
+++ community-x86_64/lol.patch 2013-06-26 17:55:13 UTC (rev 93166)
@@ -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()
More information about the arch-commits
mailing list