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

Evangelos Foutras foutrelis at nymeria.archlinux.org
Mon May 20 22:16:28 UTC 2013 

    Date: Tuesday, May 21, 2013 @ 00:16:28
  Author: foutrelis
Revision: 91300

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

Added:
  supertux/repos/community-i686/PKGBUILD
    (from rev 91299, supertux/trunk/PKGBUILD)
  supertux/repos/community-i686/supertux2-0.3.3-squirrel-gcc47.patch
    (from rev 91299, supertux/trunk/supertux2-0.3.3-squirrel-gcc47.patch)
  supertux/repos/community-x86_64/PKGBUILD
    (from rev 91299, supertux/trunk/PKGBUILD)
  supertux/repos/community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch
    (from rev 91299, supertux/trunk/supertux2-0.3.3-squirrel-gcc47.patch)
Deleted:
  supertux/repos/community-i686/PKGBUILD
  supertux/repos/community-i686/supertux2-0.3.3-squirrel-gcc47.patch
  supertux/repos/community-x86_64/PKGBUILD
  supertux/repos/community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch

-------------------------------------------------------+
 /PKGBUILD                                             |   86 ++++++++++++++++
 /supertux2-0.3.3-squirrel-gcc47.patch                 |   72 +++++++++++++
 community-i686/PKGBUILD                               |   35 ------
 community-i686/supertux2-0.3.3-squirrel-gcc47.patch   |   36 ------
 community-x86_64/PKGBUILD                             |   35 ------
 community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch |   36 ------
 6 files changed, 158 insertions(+), 142 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-20 22:16:15 UTC (rev 91299)
+++ community-i686/PKGBUILD	2013-05-20 22:16:28 UTC (rev 91300)
@@ -1,35 +0,0 @@
-# $Id$
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=7
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: supertux/repos/community-i686/PKGBUILD (from rev 91299, supertux/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-20 22:16:28 UTC (rev 91300)
@@ -0,0 +1,43 @@
+# $Id$
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+# Contributor: vande198
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=supertux
+pkgver=0.3.3
+pkgrel=8
+pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
+arch=('i686' 'x86_64')
+url="http://super-tux.sourceforge.net/"
+license=('GPL')
+depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
+makedepends=('cmake' 'boost' 'mesa' 'optipng')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
+        supertux2-0.3.3-squirrel-gcc47.patch)
+md5sums=('f3f803e629ee51a9de0b366a036e393d'
+         'eb06315514be4f200428f14b927beb66')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
+  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
+  sed -i '/types\.h/d' src/addon/addon_manager.cpp
+
+  # Fix invalid PNG image to work with libpng 1.6
+  optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/supertux2-0.3.3-squirrel-gcc47.patch
===================================================================
--- community-i686/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:15 UTC (rev 91299)
+++ community-i686/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:28 UTC (rev 91300)
@@ -1,36 +0,0 @@
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
-@@ -136,8 +136,4 @@
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
-@@ -2,6 +2,8 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));

Copied: supertux/repos/community-i686/supertux2-0.3.3-squirrel-gcc47.patch (from rev 91299, supertux/trunk/supertux2-0.3.3-squirrel-gcc47.patch)
===================================================================
--- community-i686/supertux2-0.3.3-squirrel-gcc47.patch	                        (rev 0)
+++ community-i686/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:28 UTC (rev 91300)
@@ -0,0 +1,36 @@
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-20 22:16:15 UTC (rev 91299)
+++ community-x86_64/PKGBUILD	2013-05-20 22:16:28 UTC (rev 91300)
@@ -1,35 +0,0 @@
-# $Id$
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=7
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: supertux/repos/community-x86_64/PKGBUILD (from rev 91299, supertux/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-20 22:16:28 UTC (rev 91300)
@@ -0,0 +1,43 @@
+# $Id$
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+# Contributor: vande198
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=supertux
+pkgver=0.3.3
+pkgrel=8
+pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
+arch=('i686' 'x86_64')
+url="http://super-tux.sourceforge.net/"
+license=('GPL')
+depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
+makedepends=('cmake' 'boost' 'mesa' 'optipng')
+source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
+        supertux2-0.3.3-squirrel-gcc47.patch)
+md5sums=('f3f803e629ee51a9de0b366a036e393d'
+         'eb06315514be4f200428f14b927beb66')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
+  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
+  sed -i '/types\.h/d' src/addon/addon_manager.cpp
+
+  # Fix invalid PNG image to work with libpng 1.6
+  optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch
===================================================================
--- community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:15 UTC (rev 91299)
+++ community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:28 UTC (rev 91300)
@@ -1,36 +0,0 @@
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
-@@ -136,8 +136,4 @@
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
-@@ -2,6 +2,8 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));

Copied: supertux/repos/community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch (from rev 91299, supertux/trunk/supertux2-0.3.3-squirrel-gcc47.patch)
===================================================================
--- community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch	                        (rev 0)
+++ community-x86_64/supertux2-0.3.3-squirrel-gcc47.patch	2013-05-20 22:16:28 UTC (rev 91300)
@@ -0,0 +1,36 @@
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
+@@ -0,0 +1,8 @@
++/*	see copyright notice in squirrel.h */
++#ifndef _SQMEM_H_
++#define _SQMEM_H_
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
++#endif //_SQMEM_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
+@@ -136,8 +136,4 @@
+ extern SQObjectPtr _minusone_;
+ 
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+-
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
+--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
+@@ -2,6 +2,8 @@
+ #ifndef _SQUTILS_H_
+ #define _SQUTILS_H_
+ 
++#include "sqmem.h"
++
+ #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
+ #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
+ #define SQ_MALLOC(__size) sq_vm_malloc((__size));

More information about the arch-commits mailing list