Date: Saturday, March 28, 2015 @ 11:59:26
Author: jlichtblau
Revision: 130104
archrelease: copy trunk to community-i686
Added:
flobopuyo/repos/community-i686/PKGBUILD
(from rev 130103, flobopuyo/trunk/PKGBUILD)
flobopuyo/repos/community-i686/flobopuyo-0.20-gcc4.patch
(from rev 130103, flobopuyo/trunk/flobopuyo-0.20-gcc4.patch)
flobopuyo/repos/community-i686/flobopuyo-0.20-libs.patch
(from rev 130103, flobopuyo/trunk/flobopuyo-0.20-libs.patch)
flobopuyo/repos/community-i686/flobopuyo-makefile.patch
(from rev 130103, flobopuyo/trunk/flobopuyo-makefile.patch)
flobopuyo/repos/community-i686/flobopuyo.changelog
(from rev 130103, flobopuyo/trunk/flobopuyo.changelog)
flobopuyo/repos/community-i686/flobopuyo.desktop
(from rev 130103, flobopuyo/trunk/flobopuyo.desktop)
flobopuyo/repos/community-i686/flobopuyo.png
(from rev 130103, flobopuyo/trunk/flobopuyo.png)
Deleted:
flobopuyo/repos/community-i686/PKGBUILD
flobopuyo/repos/community-i686/flobopuyo-0.20-gcc4.patch
flobopuyo/repos/community-i686/flobopuyo-0.20-libs.patch
flobopuyo/repos/community-i686/flobopuyo-makefile.patch
flobopuyo/repos/community-i686/flobopuyo.changelog
flobopuyo/repos/community-i686/flobopuyo.desktop
flobopuyo/repos/community-i686/flobopuyo.png
---------------------------+
PKGBUILD | 96 ++++++++-------
flobopuyo-0.20-gcc4.patch | 50 ++++----
flobopuyo-0.20-libs.patch | 272 ++++++++++++++++++++++----------------------
flobopuyo-makefile.patch | 42 +++---
flobopuyo.changelog | 38 +++---
flobopuyo.desktop | 18 +-
6 files changed, 260 insertions(+), 256 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-28 10:51:07 UTC (rev 130103)
+++ PKGBUILD 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer : Jaroslav Lichtblau <svetlemo...@archlinux.org>
-# Contributor: Angelo Theodorou <enc...@users.sourceforge.net>
-# contributor: Laurent Carlier <lordhea...@gmail.com>
-
-pkgname=flobopuyo
-pkgver=0.20
-pkgrel=7
-pkgdesc="Clone of the famous PuyoPuyo"
-arch=('i686' 'x86_64')
-url="http://freshmeat.net/projects/$pkgname/";
-license=('GPL')
-depends=('glu' 'sdl_image' 'sdl_mixer')
-makedepends=('mesa' 'patch')
-changelog=$pkgname.changelog
-source=(http://www.sourcefiles.org/Games/Puzzle/$pkgname-$pkgver.tgz
- $pkgname-makefile.patch $pkgname-0.20-gcc4.patch
- $pkgname-0.20-libs.patch
- $pkgname.desktop
- $pkgname.png)
-md5sums=('88961898c9dd48b60464f6f10f695b8b'
- '4c6667be791681d43bb7ea1b6f9f9072'
- 'bb8afd6e04bde08fd33e22c466674878'
- 'b7c0fd71cd948bbc43a86742ffad6d86'
- 'b18b185000c30bd3b7ff324052c95896'
- 'd9abe591e6cdd654269474444df1ec9d')
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- patch -Np0 < "${srcdir}"/$pkgname-makefile.patch
- patch -Np1 < "${srcdir}"/$pkgname-$pkgver-gcc4.patch
- patch -Np1 < "${srcdir}"/$pkgname-$pkgver-libs.patch
-
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 man/${pkgname}.6 "${pkgdir}"/usr/share/man/man6/$pkgname.6
- install -D "${srcdir}"/$pkgname.desktop
"${pkgdir}"/usr/share/applications/$pkgname.desktop
- install -D "${srcdir}"/$pkgname.png
"${pkgdir}"/usr/share/pixmaps/$pkgname.png
-}
Copied: flobopuyo/repos/community-i686/PKGBUILD (from rev 130103,
flobopuyo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer : Jaroslav Lichtblau <svetlemo...@archlinux.org>
+# Contributor: Angelo Theodorou <enc...@users.sourceforge.net>
+# contributor: Laurent Carlier <lordhea...@gmail.com>
+
+pkgname=flobopuyo
+pkgver=0.20
+pkgrel=8
+pkgdesc="Clone of the famous PuyoPuyo"
+arch=('i686' 'x86_64')
+url="http://freshmeat.net/projects/$pkgname/";
+license=('GPL')
+depends=('glu' 'sdl_image' 'sdl_mixer')
+makedepends=('mesa' 'patch')
+changelog=$pkgname.changelog
+source=(http://www.sourcefiles.org/Games/Puzzle/$pkgname-$pkgver.tgz
+ $pkgname-makefile.patch $pkgname-0.20-gcc4.patch
+ $pkgname-0.20-libs.patch
+ $pkgname.desktop
+ $pkgname.png)
+md5sums=('88961898c9dd48b60464f6f10f695b8b'
+ '4c6667be791681d43bb7ea1b6f9f9072'
+ 'bb8afd6e04bde08fd33e22c466674878'
+ 'b7c0fd71cd948bbc43a86742ffad6d86'
+ 'b18b185000c30bd3b7ff324052c95896'
+ 'd9abe591e6cdd654269474444df1ec9d')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ patch -Np0 < "${srcdir}"/$pkgname-makefile.patch
+ patch -Np1 < "${srcdir}"/$pkgname-$pkgver-gcc4.patch
+ patch -Np1 < "${srcdir}"/$pkgname-$pkgver-libs.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 man/${pkgname}.6 "${pkgdir}"/usr/share/man/man6/$pkgname.6
+ install -D "${srcdir}"/$pkgname.desktop
"${pkgdir}"/usr/share/applications/$pkgname.desktop
+ install -D "${srcdir}"/$pkgname.png
"${pkgdir}"/usr/share/pixmaps/$pkgname.png
+}
Deleted: flobopuyo-0.20-gcc4.patch
===================================================================
--- flobopuyo-0.20-gcc4.patch 2015-03-28 10:51:07 UTC (rev 130103)
+++ flobopuyo-0.20-gcc4.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,25 +0,0 @@
-Index: flobopuyo-0.20/IosVector.cpp
-===================================================================
---- flobopuyo-0.20.orig/IosVector.cpp
-+++ flobopuyo-0.20/IosVector.cpp
-@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()
- void IosVector::dumpVector() const {
- fprintf(stderr, "Size: %d\n", getSize());
- for (int i = 0, j = getSize() ; i < j ; i++)
-- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
-+ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
- fprintf(stderr, "\n");
- }
-Index: flobopuyo-0.20/PuyoGame.cpp
-===================================================================
---- flobopuyo-0.20.orig/PuyoGame.cpp
-+++ flobopuyo-0.20/PuyoGame.cpp
-@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
- return (PuyoState)newItem;
- }
- else
-- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
-+ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
- }
-
- PuyoPuyo::PuyoPuyo(PuyoState state)
Copied: flobopuyo/repos/community-i686/flobopuyo-0.20-gcc4.patch (from rev
130103, flobopuyo/trunk/flobopuyo-0.20-gcc4.patch)
===================================================================
--- flobopuyo-0.20-gcc4.patch (rev 0)
+++ flobopuyo-0.20-gcc4.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,25 @@
+Index: flobopuyo-0.20/IosVector.cpp
+===================================================================
+--- flobopuyo-0.20.orig/IosVector.cpp
++++ flobopuyo-0.20/IosVector.cpp
+@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()
+ void IosVector::dumpVector() const {
+ fprintf(stderr, "Size: %d\n", getSize());
+ for (int i = 0, j = getSize() ; i < j ; i++)
+- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
+ fprintf(stderr, "\n");
+ }
+Index: flobopuyo-0.20/PuyoGame.cpp
+===================================================================
+--- flobopuyo-0.20.orig/PuyoGame.cpp
++++ flobopuyo-0.20/PuyoGame.cpp
+@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
+ return (PuyoState)newItem;
+ }
+ else
+- return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
+ }
+
+ PuyoPuyo::PuyoPuyo(PuyoState state)
Deleted: flobopuyo-0.20-libs.patch
===================================================================
--- flobopuyo-0.20-libs.patch 2015-03-28 10:51:07 UTC (rev 130103)
+++ flobopuyo-0.20-libs.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,136 +0,0 @@
---- flobopuyo-0.20/Makefile.orig 2004-10-08 18:41:12.000000000 -0400
-+++ flobopuyo-0.20/Makefile 2008-08-06 19:48:47.000000000 -0400
-@@ -41,15 +41,13 @@
- ##############
-
- SDL_CONFIG=sdl-config
--CC=g++
--CXX=g++
-
--CFLAGS= -DDATADIR=\"${DATADIR}\"
--LDFLAGS=
-+CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
-
- ifneq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
--LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
-+CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/usr/include
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
- endif
-
- HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
-@@ -71,46 +69,46 @@
- ################
- # Mac OS X
- ifeq ($(PLATFORM), Darwin)
--CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
-+CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
- endif
-
- ################
- # Win32
- ifeq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1
-I$(WINSDLINCLUDE)
--LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1
-lSDL_image -lSDL_mixer -lSDL -lSDLmain
-+CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1
-I$(WINSDLINCLUDE)
-+LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
-+LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL
-lSDLmain
- endif
-
- ifeq ($(ENABLE_AUDIO), true)
--CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
- OBJFILES:=$(OBJFILES)
- endif
-
- ifeq ($(ENABLE_OPENGL), true)
--CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
-+CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
- OBJFILES:=$(OBJFILES) glSDL.o
- ifeq ($(PLATFORM), Linux)
--LDFLAGS:=$(LDFLAGS) -lGL
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) -lGL
- endif
- endif
-
- ifeq ($(ENABLE_DGA), true)
- ifeq ($(PLATFORM), Linux)
--CFLAGS:=$(CFLAGS) -DUSE_DGA=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
- endif
- endif
-
- ifeq ($(DEBUG), true)
--CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
-+CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
- LDFLAGS:=$(LDFLAGS) -g
- endif
-
--CXXFLAGS=${CFLAGS}
--
- all: prelude flobopuyo
-
- flobopuyo: ${OBJFILES}
-- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo
-lSDL_mixer -lSDL_image ${OBJFILES}
-+ @echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo
$(LIBS) -lSDL_mixer -lSDL_image
- @echo "--------------------------------------"
- @echo " Compilation finished"
- @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e
"--------------------------------------\n There have been some warnings:\n" &&
cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------"
|| true
-@@ -121,14 +119,14 @@
- prelude:
- @rm -f WARNINGS
- @touch WARNINGS
-- @echo "Compiling with CFLAGS=$(CFLAGS)"
-+ @echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
- @echo "Compiling with LDFLAGS=$(LDFLAGS)"
-
- %.o:%.c
-- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS &&
false)
-+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
-
- %.o:%.cpp
-- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS &&
false)
-+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
-
- PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
- HiScores.o:HiScores.cpp HiScores.h preferences.h
-@@ -155,10 +153,10 @@
- IosException.o:IosException.cpp
- IosVector.o:IosVector.cpp
- glSDL.o:glSDL.c
-- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- @rm -f EXT_WARNINGS
- SDL_prim.o:SDL_prim.c
-- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- @rm -f EXT_WARNINGS
- corona.o:corona.cpp
- corona32.o:corona32.cpp
-@@ -178,7 +176,6 @@
- rm -f .DS_Store */.DS_Store */*/.DS_Store .gdb_history
-
- install: flobopuyo
-- strip flobopuyo
- mkdir -p ${INSTALL_BINDIR}
- mkdir -p ${INSTALL_DATADIR}
- cp -r data/* ${INSTALL_DATADIR}
-@@ -191,7 +188,7 @@
- chmod a+rx ${INSTALL_BINDIR}/flobopuyo
-
- flobopuyo-static: prelude ${OBJFILES}
-- @echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static
${OBJFILES}\
-+ @echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static
${OBJFILES}\
- /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a
/sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a
/sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
- @echo "--------------------------------------"
- @echo " Compilation finished"
-@@ -207,7 +204,6 @@
- rm -rf $(bundle_name)/Contents/Resources/data/CVS
$(bundle_name)/Contents/Resources/data/*/CVS
- rm -rf $(bundle_name)/Contents/Resources/data/.xvpics
$(bundle_name)/Contents/Resources/data/*/.xvpics
- rm -f $(bundle_name)/Contents/Resources/data/.DS_Store
$(bundle_name)/Contents/Resources/data/*/.DS_Store
-- strip $(bundle_name)/Contents/MacOS/flobopuyo
-
- mac-package: bundle
- mkdir -p $(macimage_name)
Copied: flobopuyo/repos/community-i686/flobopuyo-0.20-libs.patch (from rev
130103, flobopuyo/trunk/flobopuyo-0.20-libs.patch)
===================================================================
--- flobopuyo-0.20-libs.patch (rev 0)
+++ flobopuyo-0.20-libs.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,136 @@
+--- flobopuyo-0.20/Makefile.orig 2004-10-08 18:41:12.000000000 -0400
++++ flobopuyo-0.20/Makefile 2008-08-06 19:48:47.000000000 -0400
+@@ -41,15 +41,13 @@
+ ##############
+
+ SDL_CONFIG=sdl-config
+-CC=g++
+-CXX=g++
+
+-CFLAGS= -DDATADIR=\"${DATADIR}\"
+-LDFLAGS=
++CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
+
+ ifneq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
+-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
++CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/usr/include
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
+ endif
+
+ HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
+@@ -71,46 +69,46 @@
+ ################
+ # Mac OS X
+ ifeq ($(PLATFORM), Darwin)
+-CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
++CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
+ endif
+
+ ################
+ # Win32
+ ifeq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1
-I$(WINSDLINCLUDE)
+-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1
-lSDL_image -lSDL_mixer -lSDL -lSDLmain
++CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1
-I$(WINSDLINCLUDE)
++LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
++LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL
-lSDLmain
+ endif
+
+ ifeq ($(ENABLE_AUDIO), true)
+-CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
++CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
+ OBJFILES:=$(OBJFILES)
+ endif
+
+ ifeq ($(ENABLE_OPENGL), true)
+-CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
++CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
+ OBJFILES:=$(OBJFILES) glSDL.o
+ ifeq ($(PLATFORM), Linux)
+-LDFLAGS:=$(LDFLAGS) -lGL
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) -lGL
+ endif
+ endif
+
+ ifeq ($(ENABLE_DGA), true)
+ ifeq ($(PLATFORM), Linux)
+-CFLAGS:=$(CFLAGS) -DUSE_DGA=1
++CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
+ endif
+ endif
+
+ ifeq ($(DEBUG), true)
+-CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
++CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
+ LDFLAGS:=$(LDFLAGS) -g
+ endif
+
+-CXXFLAGS=${CFLAGS}
+-
+ all: prelude flobopuyo
+
+ flobopuyo: ${OBJFILES}
+- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo
-lSDL_mixer -lSDL_image ${OBJFILES}
++ @echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo
$(LIBS) -lSDL_mixer -lSDL_image
+ @echo "--------------------------------------"
+ @echo " Compilation finished"
+ @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e
"--------------------------------------\n There have been some warnings:\n" &&
cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------"
|| true
+@@ -121,14 +119,14 @@
+ prelude:
+ @rm -f WARNINGS
+ @touch WARNINGS
+- @echo "Compiling with CFLAGS=$(CFLAGS)"
++ @echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
+ @echo "Compiling with LDFLAGS=$(LDFLAGS)"
+
+ %.o:%.c
+- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS &&
false)
++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+
+ %.o:%.cpp
+- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS &&
false)
++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+
+ PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
+ HiScores.o:HiScores.cpp HiScores.h preferences.h
+@@ -155,10 +153,10 @@
+ IosException.o:IosException.cpp
+ IosVector.o:IosVector.cpp
+ glSDL.o:glSDL.c
+- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ @rm -f EXT_WARNINGS
+ SDL_prim.o:SDL_prim.c
+- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ @rm -f EXT_WARNINGS
+ corona.o:corona.cpp
+ corona32.o:corona32.cpp
+@@ -178,7 +176,6 @@
+ rm -f .DS_Store */.DS_Store */*/.DS_Store .gdb_history
+
+ install: flobopuyo
+- strip flobopuyo
+ mkdir -p ${INSTALL_BINDIR}
+ mkdir -p ${INSTALL_DATADIR}
+ cp -r data/* ${INSTALL_DATADIR}
+@@ -191,7 +188,7 @@
+ chmod a+rx ${INSTALL_BINDIR}/flobopuyo
+
+ flobopuyo-static: prelude ${OBJFILES}
+- @echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static
${OBJFILES}\
++ @echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static
${OBJFILES}\
+ /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a
/sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a
/sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
+ @echo "--------------------------------------"
+ @echo " Compilation finished"
+@@ -207,7 +204,6 @@
+ rm -rf $(bundle_name)/Contents/Resources/data/CVS
$(bundle_name)/Contents/Resources/data/*/CVS
+ rm -rf $(bundle_name)/Contents/Resources/data/.xvpics
$(bundle_name)/Contents/Resources/data/*/.xvpics
+ rm -f $(bundle_name)/Contents/Resources/data/.DS_Store
$(bundle_name)/Contents/Resources/data/*/.DS_Store
+- strip $(bundle_name)/Contents/MacOS/flobopuyo
+
+ mac-package: bundle
+ mkdir -p $(macimage_name)
Deleted: flobopuyo-makefile.patch
===================================================================
--- flobopuyo-makefile.patch 2015-03-28 10:51:07 UTC (rev 130103)
+++ flobopuyo-makefile.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,21 +0,0 @@
---- Makefile 2004-10-09 01:41:12.000000000 +0300
-+++ Makefile 2005-03-04 05:51:21.000000000 +0200
-@@ -6,15 +6,15 @@
- # Settings
-
- ENABLE_AUDIO=true
--ENABLE_OPENGL=false
-+ENABLE_OPENGL=true
- ENABLE_DGA=false
-
- DEBUG_MODE=false
-
- # Unix/Linux settings
--PREFIX=/usr/local
-+PREFIX=/usr
- DATADIR=$(PREFIX)/share/games/flobopuyo
--INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
-+INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
- INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
-
- # Mac settings
Copied: flobopuyo/repos/community-i686/flobopuyo-makefile.patch (from rev
130103, flobopuyo/trunk/flobopuyo-makefile.patch)
===================================================================
--- flobopuyo-makefile.patch (rev 0)
+++ flobopuyo-makefile.patch 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,21 @@
+--- Makefile 2004-10-09 01:41:12.000000000 +0300
++++ Makefile 2005-03-04 05:51:21.000000000 +0200
+@@ -6,15 +6,15 @@
+ # Settings
+
+ ENABLE_AUDIO=true
+-ENABLE_OPENGL=false
++ENABLE_OPENGL=true
+ ENABLE_DGA=false
+
+ DEBUG_MODE=false
+
+ # Unix/Linux settings
+-PREFIX=/usr/local
++PREFIX=/usr
+ DATADIR=$(PREFIX)/share/games/flobopuyo
+-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
+ INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
+
+ # Mac settings
Deleted: flobopuyo.changelog
===================================================================
--- flobopuyo.changelog 2015-03-28 10:51:07 UTC (rev 130103)
+++ flobopuyo.changelog 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,19 +0,0 @@
-2014-05-25 Jaroslav Lichtblau <svetlemo...@archlinux.org>
- * flobopuyo 0.20-7 FS#39303 fixed
-
-2010-11-24 Jaroslav Lichtblau <svetlemo...@archlinux.org>
- * flobopuyo 0.20-5
- * home page and source file fix
-
-2010-07-13 Laurent Carlier <lordhea...@gmail.com>
- * Rebuild for i686 and x86_64
- * Add .desktop file and icon
-
-2008-09-15 Ronald van Haren <ronald.archlinux.org>
- * added x86_64 version & a couple of patches to build it
-
-2008-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org>
- * Added provided man page to the package
-
-2008-09-11 Jaroslav Lichtblau <svetlemo...@archlinux.org>
- * Package moved to [community]
Copied: flobopuyo/repos/community-i686/flobopuyo.changelog (from rev 130103,
flobopuyo/trunk/flobopuyo.changelog)
===================================================================
--- flobopuyo.changelog (rev 0)
+++ flobopuyo.changelog 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,19 @@
+2014-05-25 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * flobopuyo 0.20-7 FS#39303 fixed
+
+2010-11-24 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * flobopuyo 0.20-5
+ * home page and source file fix
+
+2010-07-13 Laurent Carlier <lordhea...@gmail.com>
+ * Rebuild for i686 and x86_64
+ * Add .desktop file and icon
+
+2008-09-15 Ronald van Haren <ronald.archlinux.org>
+ * added x86_64 version & a couple of patches to build it
+
+2008-09-14 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * Added provided man page to the package
+
+2008-09-11 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+ * Package moved to [community]
Deleted: flobopuyo.desktop
===================================================================
--- flobopuyo.desktop 2015-03-28 10:51:07 UTC (rev 130103)
+++ flobopuyo.desktop 2015-03-28 10:59:26 UTC (rev 130104)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Flobopuyo
-Comment=A remake of the famous PuyoPuyo
-Exec=flobopuyo
-Icon=flobopuyo
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;
-StartupNotify=false
Copied: flobopuyo/repos/community-i686/flobopuyo.desktop (from rev 130103,
flobopuyo/trunk/flobopuyo.desktop)
===================================================================
--- flobopuyo.desktop (rev 0)
+++ flobopuyo.desktop 2015-03-28 10:59:26 UTC (rev 130104)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Flobopuyo
+Comment=A remake of the famous PuyoPuyo
+Exec=flobopuyo
+Icon=flobopuyo
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;
+StartupNotify=false
Deleted: flobopuyo.png
===================================================================
(Binary files differ)
Copied: flobopuyo/repos/community-i686/flobopuyo.png (from rev 130103,
flobopuyo/trunk/flobopuyo.png)
===================================================================
(Binary files differ)
