[arch-commits] Commit in warmux/repos (8 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Sun Apr 28 10:57:49 UTC 2013 

    Date: Sunday, April 28, 2013 @ 12:57:49
  Author: lcarlier
Revision: 89262

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  warmux/repos/community-staging-i686/
  warmux/repos/community-staging-i686/PKGBUILD
    (from rev 89261, warmux/trunk/PKGBUILD)
  warmux/repos/community-staging-i686/gcc-fix.patch
    (from rev 89261, warmux/trunk/gcc-fix.patch)
  warmux/repos/community-staging-i686/include-zlib.patch
    (from rev 89261, warmux/trunk/include-zlib.patch)
  warmux/repos/community-staging-x86_64/
  warmux/repos/community-staging-x86_64/PKGBUILD
    (from rev 89261, warmux/trunk/PKGBUILD)
  warmux/repos/community-staging-x86_64/gcc-fix.patch
    (from rev 89261, warmux/trunk/gcc-fix.patch)
  warmux/repos/community-staging-x86_64/include-zlib.patch
    (from rev 89261, warmux/trunk/include-zlib.patch)

---------------------------------------------+
 community-staging-i686/PKGBUILD             |   41 ++++++++++++++++++++++++++
 community-staging-i686/gcc-fix.patch        |   36 ++++++++++++++++++++++
 community-staging-i686/include-zlib.patch   |   11 ++++++
 community-staging-x86_64/PKGBUILD           |   41 ++++++++++++++++++++++++++
 community-staging-x86_64/gcc-fix.patch      |   36 ++++++++++++++++++++++
 community-staging-x86_64/include-zlib.patch |   11 ++++++
 6 files changed, 176 insertions(+)

Copied: warmux/repos/community-staging-i686/PKGBUILD (from rev 89261, warmux/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,41 @@
+# $Id$
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: pukyxd 
+# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
+
+pkgname=warmux
+pkgver=11.04.1
+pkgrel=6
+pkgdesc="A clone of the worms game"
+arch=('i686' 'x86_64')
+url="http://www.wormux.org/"
+license=('GPL')
+makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
+replaces=('wormux')
+source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	include-zlib.patch
+	gcc-fix.patch)
+md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
+         'c8285955e880f80e3c68312715a3061c'
+         'ab50d613d3fa3f71262b1d2fc71641b1')
+
+build() { 
+  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
+
+  # libpng 1.5 fix
+  patch -Np1 -i ../include-zlib.patch
+  # gcc fix
+  patch -Np1 -i ../gcc-fix.patch
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
+
+  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
+
+  make DESTDIR="${pkgdir}" install
+  rm -r ${pkgdir}/usr/share/warmux
+}

Copied: warmux/repos/community-staging-i686/gcc-fix.patch (from rev 89261, warmux/trunk/gcc-fix.patch)
===================================================================
--- community-staging-i686/gcc-fix.patch	                        (rev 0)
+++ community-staging-i686/gcc-fix.patch	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,36 @@
+## i-love-you-lordheavy.patch [diff]
+diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
+--- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
++++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
+@@ -81,7 +81,7 @@
+ }
+ 
+ // Build an action from a network packet
+-Action::Action(const char *buffer, DistantComputer* _creator)
++Action::Action(char *buffer, DistantComputer* _creator)
+ {
+   m_creator = _creator;
+ 
+diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
+--- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
+@@ -168,7 +168,7 @@
+   Action(Action_t type, Double value1, Double value2);
+ 
+   // Build an action from a network packet
+-  Action(const char* buffer, DistantComputer* _creator);
++  Action(char* buffer, DistantComputer* _creator);
+ 
+   ~Action();
+ 
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
++++ warmux-11.04.1+repack/tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>

Copied: warmux/repos/community-staging-i686/include-zlib.patch (from rev 89261, warmux/trunk/include-zlib.patch)
===================================================================
--- community-staging-i686/include-zlib.patch	                        (rev 0)
+++ community-staging-i686/include-zlib.patch	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,11 @@
+diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
+--- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
++++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"

Copied: warmux/repos/community-staging-x86_64/PKGBUILD (from rev 89261, warmux/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,41 @@
+# $Id$
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: pukyxd 
+# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
+
+pkgname=warmux
+pkgver=11.04.1
+pkgrel=6
+pkgdesc="A clone of the worms game"
+arch=('i686' 'x86_64')
+url="http://www.wormux.org/"
+license=('GPL')
+makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
+replaces=('wormux')
+source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	include-zlib.patch
+	gcc-fix.patch)
+md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
+         'c8285955e880f80e3c68312715a3061c'
+         'ab50d613d3fa3f71262b1d2fc71641b1')
+
+build() { 
+  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
+
+  # libpng 1.5 fix
+  patch -Np1 -i ../include-zlib.patch
+  # gcc fix
+  patch -Np1 -i ../gcc-fix.patch
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
+
+  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
+
+  make DESTDIR="${pkgdir}" install
+  rm -r ${pkgdir}/usr/share/warmux
+}

Copied: warmux/repos/community-staging-x86_64/gcc-fix.patch (from rev 89261, warmux/trunk/gcc-fix.patch)
===================================================================
--- community-staging-x86_64/gcc-fix.patch	                        (rev 0)
+++ community-staging-x86_64/gcc-fix.patch	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,36 @@
+## i-love-you-lordheavy.patch [diff]
+diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
+--- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
++++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
+@@ -81,7 +81,7 @@
+ }
+ 
+ // Build an action from a network packet
+-Action::Action(const char *buffer, DistantComputer* _creator)
++Action::Action(char *buffer, DistantComputer* _creator)
+ {
+   m_creator = _creator;
+ 
+diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
+--- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
+@@ -168,7 +168,7 @@
+   Action(Action_t type, Double value1, Double value2);
+ 
+   // Build an action from a network packet
+-  Action(const char* buffer, DistantComputer* _creator);
++  Action(char* buffer, DistantComputer* _creator);
+ 
+   ~Action();
+ 
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
++++ warmux-11.04.1+repack/tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>

Copied: warmux/repos/community-staging-x86_64/include-zlib.patch (from rev 89261, warmux/trunk/include-zlib.patch)
===================================================================
--- community-staging-x86_64/include-zlib.patch	                        (rev 0)
+++ community-staging-x86_64/include-zlib.patch	2013-04-28 10:57:49 UTC (rev 89262)
@@ -0,0 +1,11 @@
+diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
+--- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
++++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"

More information about the arch-commits mailing list