[arch-commits] Commit in critter/repos (5 files)

Tue Jul 7 13:16:40 UTC 2020

Date: Tuesday, July 7, 2020 @ 13:16:40
  Author: felixonmars
Revision: 658398

archrelease: copy trunk to community-staging-x86_64

Added:
  critter/repos/community-staging-x86_64/
  critter/repos/community-staging-x86_64/PKGBUILD
    (from rev 658396, critter/trunk/PKGBUILD)
  critter/repos/community-staging-x86_64/criticalmass-1.0.2-libpng15.patch
    (from rev 658396, critter/trunk/criticalmass-1.0.2-libpng15.patch)
  critter/repos/community-staging-x86_64/critter-gcc43.patch
    (from rev 658396, critter/trunk/critter-gcc43.patch)
  critter/repos/community-staging-x86_64/critter.desktop
    (from rev 658397, critter/trunk/critter.desktop)

-----------------------------------+
 PKGBUILD                          |   46 ++++++++++++++++++++++++
 criticalmass-1.0.2-libpng15.patch |   31 ++++++++++++++++
 critter-gcc43.patch               |   69 ++++++++++++++++++++++++++++++++++++
 critter.desktop                   |    9 ++++
 4 files changed, 155 insertions(+)

Copied: critter/repos/community-staging-x86_64/PKGBUILD (from rev 658396, critter/trunk/PKGBUILD)
===================================================================

--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 13:16:40 UTC (rev 658398)
@@ -0,0 +1,46 @@
+# Maintainer: Laurent Carlier <Lordheavym at gmail.com>
+# Contributor: Allan McRae <mcrae_allan at hotmail.com>
+# Contributor: Daniel J Griffiths <griffithsdj at archlinux.us>
+
+pkgname=critter
+_origname=CriticalMass
+pkgver=1.0.2
+pkgrel=11
+pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
+arch=('x86_64')
+url="https://sourceforge.net/projects/criticalmass"
+license=('GPL')
+depends=('sdl_image' 'sdl_mixer' 'libgl')
+makedepends=('mesa')
+source=(https://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2
+        critter-gcc43.patch
+        criticalmass-1.0.2-libpng15.patch
+        critter.desktop)
+md5sums=('e2aff114bffa717fb79c82e1dc473ebe'
+         'e936920acce56bfa3b0123ca8b1193a6'
+         '76448ba5b7a42aec8fd2a5d1bc31b8e2'
+         '98c17809aed964c445adad09827035df')
+
+build() {
+  cd ${srcdir}/$_origname-${pkgver}
+
+  patch -Np1 -i ../critter-gcc43.patch
+  patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch
+  sed -i 's|png12|png16|g' configure.in
+  sed -e '/CFLAGS=""/d' -e '/CXXFLAGS=""/d' -i configure.in
+  export CXXFLAGS+=' -std=gnu++98'
+  ./autogen.sh
+
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd ${srcdir}/$_origname-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png
+  install -Dm644 ../critter.desktop \
+    ${pkgdir}/usr/share/applications/critter.desktop
+}

Copied: critter/repos/community-staging-x86_64/criticalmass-1.0.2-libpng15.patch (from rev 658396, critter/trunk/criticalmass-1.0.2-libpng15.patch)
===================================================================
--- community-staging-x86_64/criticalmass-1.0.2-libpng15.patch	                        (rev 0)
+++ community-staging-x86_64/criticalmass-1.0.2-libpng15.patch	2020-07-07 13:16:40 UTC (rev 658398)
@@ -0,0 +1,31 @@
+--- game/main.cpp
++++ game/main.cpp
+@@ -28,6 +28,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+ {
+     //if onlineCheck is not set, default it to true
+--- utilssdl/PNG.cpp
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+     png_size_t check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);

Copied: critter/repos/community-staging-x86_64/critter-gcc43.patch (from rev 658396, critter/trunk/critter-gcc43.patch)
===================================================================
--- community-staging-x86_64/critter-gcc43.patch	                        (rev 0)
+++ community-staging-x86_64/critter-gcc43.patch	2020-07-07 13:16:40 UTC (rev 658398)
@@ -0,0 +1,69 @@
+diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp CriticalMass-1.0.2/tinyxml/tinyxml.cpp
+--- CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp	2003-03-03 12:34:58.000000000 +1000
++++ CriticalMass-1.0.2/tinyxml/tinyxml.cpp	2008-04-01 22:26:47.000000000 +1000
+@@ -22,7 +22,8 @@
+ */
+ 
+ #include "tinyxml.h"
+-
++#include <cstring>
++#include <cstdlib>
+ 
+ TiXmlNode::TiXmlNode( NodeType _type )
+ {
+diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp
+--- CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp	2003-03-03 12:34:58.000000000 +1000
++++ CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp	2008-04-01 22:27:02.000000000 +1000
+@@ -24,7 +24,7 @@
+ 
+ #include "tinyxml.h"
+ #include <ctype.h>
+-
++#include <cstring>
+ const char* TiXmlBase::SkipWhiteSpace( const char* p )
+ {
+ 	while ( p && *p && 
+diff -Naur CriticalMass-1.0.2-old/utils/ResourceManager.cpp CriticalMass-1.0.2/utils/ResourceManager.cpp
+--- CriticalMass-1.0.2-old/utils/ResourceManager.cpp	2005-01-02 12:59:29.000000000 +1000
++++ CriticalMass-1.0.2/utils/ResourceManager.cpp	2008-04-01 22:27:19.000000000 +1000
+@@ -15,6 +15,7 @@
+ #include <iomanip>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <cstring>
+ 
+ #include <Trace.hpp>
+ #include <ResourceManager.hpp>
+diff -Naur CriticalMass-1.0.2-old/utils/Value.hpp CriticalMass-1.0.2/utils/Value.hpp
+--- CriticalMass-1.0.2-old/utils/Value.hpp	2004-12-18 12:41:24.000000000 +1000
++++ CriticalMass-1.0.2/utils/Value.hpp	2008-04-01 22:27:39.000000000 +1000
+@@ -17,6 +17,7 @@
+ 
+ #include <stdio.h>
+ #include <string>
++#include <cstdlib>
+ 
+ #include <Trace.hpp>
+ 
+diff -Naur CriticalMass-1.0.2-old/utils/zStream.cpp CriticalMass-1.0.2/utils/zStream.cpp
+--- CriticalMass-1.0.2-old/utils/zStream.cpp	2005-08-01 06:06:14.000000000 +1000
++++ CriticalMass-1.0.2/utils/zStream.cpp	2008-04-01 22:28:03.000000000 +1000
+@@ -17,6 +17,7 @@
+ #include <zStream.hpp>
+ #include <zStreamBufferImplLZMA.hpp>
+ #include <zStreamBufferImplZLib.hpp>
++#include <cstdlib>
+ 
+ ofstream &operator<<( ofstream &outfile, Uint32 i)
+ {       
+diff -Naur CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp
+--- CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp	2005-08-01 06:06:14.000000000 +1000
++++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp	2008-04-01 22:28:23.000000000 +1000
+@@ -14,6 +14,7 @@
+ //
+ #include <Trace.hpp>
+ #include <zStreamBufferImplZLib.hpp>
++#include <cstdlib>
+ 
+ bool ziStreamBufferImplZLib::init( void)
+ {

Copied: critter/repos/community-staging-x86_64/critter.desktop (from rev 658397, critter/trunk/critter.desktop)
===================================================================
--- community-staging-x86_64/critter.desktop	                        (rev 0)
+++ community-staging-x86_64/critter.desktop	2020-07-07 13:16:40 UTC (rev 658398)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Critical Mass
+Comment=SDL/OpenGL space shoot'em up game
+Exec=critter
+Icon=critter
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Game;

