[arch-commits] Commit in supertux/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Sunday, August 4, 2013 @ 00:26:15
  Author: svenstaro
Revision: 95025

upgpkg: supertux 0.3.4-1

Updating to 0.3.4

Modified:
  supertux/trunk/PKGBUILD
Deleted:
  supertux/trunk/supertux2-0.3.3-squirrel-gcc47.patch

--------------------------------------+
 PKGBUILD                             |   21 +++----------------
 supertux2-0.3.3-squirrel-gcc47.patch |   36 ---------------------------------
 2 files changed, 4 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-03 22:19:23 UTC (rev 95024)
+++ PKGBUILD	2013-08-03 22:26:15 UTC (rev 95025)
@@ -5,30 +5,17 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=supertux
-pkgver=0.3.3
-pkgrel=9
+pkgver=0.3.4
+pkgrel=1
 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')
+source=(https://supertux.googlecode.com/files/supertux-${pkgver}.tar.bz2)
+md5sums=('108af4c1fd985e8842a15cd819b9b157')
 
-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}"
 

Deleted: supertux2-0.3.3-squirrel-gcc47.patch
===================================================================
--- supertux2-0.3.3-squirrel-gcc47.patch	2013-08-03 22:19:23 UTC (rev 95024)
+++ supertux2-0.3.3-squirrel-gcc47.patch	2013-08-03 22:26:15 UTC (rev 95025)
@@ -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));