[arch-commits] Commit in kobodeluxe/repos (7 files)
Eric Bélanger
eric at archlinux.org
Fri Jan 9 00:47:54 UTC 2009
Date: Thursday, January 8, 2009 @ 19:47:54
Author: eric
Revision: 23389
fixed svn conflict
Added:
kobodeluxe/repos/extra-x86_64/ChangeLog
(from rev 23387, kobodeluxe/trunk/ChangeLog)
kobodeluxe/repos/extra-x86_64/kobodeluxe-gcc-4.3.patch
(from rev 23387, kobodeluxe/trunk/kobodeluxe-gcc-4.3.patch)
kobodeluxe/repos/extra-x86_64/kobodeluxe.install
(from rev 23387, kobodeluxe/trunk/kobodeluxe.install)
Modified:
kobodeluxe/repos/extra-x86_64/ (properties)
kobodeluxe/repos/extra-x86_64/PKGBUILD
Deleted:
kobodeluxe/repos/extra-x86_64/compile-problem
kobodeluxe/repos/extra-x86_64/kobodeluxe-0.4_pre10-gcc41.patch
----------------------------------+
ChangeLog | 8 +++
PKGBUILD | 41 +++++++++++++-----
compile-problem | 10 ----
kobodeluxe-0.4_pre10-gcc41.patch | 11 ----
kobodeluxe-gcc-4.3.patch | 83 +++++++++++++++++++++++++++++++++++++
kobodeluxe.install | 21 +++++++++
6 files changed, 143 insertions(+), 31 deletions(-)
Property changes on: kobodeluxe/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /kobodeluxe/trunk:1
+ /kobodeluxe/trunk:1-23388
Copied: kobodeluxe/repos/extra-x86_64/ChangeLog (from rev 23387, kobodeluxe/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2009-01-09 00:47:54 UTC (rev 23389)
@@ -0,0 +1,8 @@
+2009-01-06 Eric Belanger <eric at archlinux.org>
+
+ * kobodeluxe 0.5.1-2
+ * Fixed build issue
+ * Added game group support
+ * Added .desktop file and icons
+ * Improved package description
+ * Added ChangeLog
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-01-08 23:24:29 UTC (rev 23388)
+++ extra-x86_64/PKGBUILD 2009-01-09 00:47:54 UTC (rev 23389)
@@ -1,23 +1,44 @@
# $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
pkgname=kobodeluxe
-orgname=KoboDeluxe
pkgver=0.5.1
-pkgrel=1
-pkgdesc="kobodeluxe is an enhanced version of Akira Higuchi's game XKobo"
+pkgrel=2
+pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up"
arch=('i686' 'x86_64')
url="http://www.olofson.net/kobodl/"
license=('GPL' 'LGPL')
depends=('gcc-libs' 'libjpeg' 'libpng' 'sdl' 'sdl_image' 'sdl_mixer')
-source=(http://www.olofson.net/kobodl/download/$orgname-$pkgver.tar.gz)
+install=kobodeluxe.install
+source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz kobodeluxe-gcc-4.3.patch)
+md5sums=('cf765559461213d651c7be042507b767' '2b76306ec997fdc64986b4425e5b7814')
+sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75' '274dc8e7909bc6f9fab31306c85d992af8b62674')
build() {
- cd $startdir/src/$orgname-$pkgver
- ./configure --prefix=/usr --sharedstatedir=/usr/share/kobo-deluxe
+ cd ${srcdir}/KoboDeluxe-${pkgver}
+ patch -p0 < ../kobodeluxe-gcc-4.3.patch
+ ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games || return 1
make || return 1
- make DESTDIR=$startdir/pkg/ install
+ make DESTDIR=${pkgdir} install || return 1
+
+ tar -xzf icons.tar.gz
+ install -D -m644 icons/KDE/kobo-deluxe.desktop ${pkgdir}/usr/share/applications/kobo-deluxe.desktop
+ install -D -m644 icons/KDE/icons/128x128/kobodl.png ${pkgdir}/usr/share/icons/hicolor/128x128/kobodl.png
+ install -D -m644 icons/KDE/icons/16x16/kobodl.png ${pkgdir}/usr/share/icons/hicolor/16x16/kobodl.png
+ install -D -m644 icons/KDE/icons/22x22/kobodl.png ${pkgdir}/usr/share/icons/hicolor/22x22/kobodl.png
+ install -D -m644 icons/KDE/icons/32x32/kobodl.png ${pkgdir}/usr/share/icons/hicolor/32x32/kobodl.png
+ install -D -m644 icons/KDE/icons/48x48/kobodl.png ${pkgdir}/usr/share/icons/hicolor/48x48/kobodl.png
+ install -D -m644 icons/KDE/icons/64x64/kobodl.png ${pkgdir}/usr/share/icons/hicolor/64x64/kobodl.png
+ install -D -m644 icons/Ubuntu/kobo-icon.xpm ${pkgdir}/usr/share/pixmaps/kobo-icon.xpm
+ ln -s /usr/share/icons/hicolor/48x48/kobodl.png ${pkgdir}/usr/share/icons/kobodl.png
+
+ chown root:games ${pkgdir}/usr/bin/kobodl
+ chmod 2755 ${pkgdir}/usr/bin/kobodl
+ chown root:games ${pkgdir}/var/games
+ chmod 775 ${pkgdir}/var/games
+ chown root:games ${pkgdir}/var/games/kobo-deluxe
+ chmod 775 ${pkgdir}/var/games/kobo-deluxe
+ chown root:games ${pkgdir}/var/games/kobo-deluxe/scores
+ chmod 775 ${pkgdir}/var/games/kobo-deluxe/scores
}
-
-md5sums=('cf765559461213d651c7be042507b767')
Deleted: extra-x86_64/compile-problem
===================================================================
--- extra-x86_64/compile-problem 2009-01-08 23:24:29 UTC (rev 23388)
+++ extra-x86_64/compile-problem 2009-01-09 00:47:54 UTC (rev 23389)
@@ -1,10 +0,0 @@
-if g++ -DHAVE_CONFIG_H -I. -I. -I. -DKOBO_DATA_DIR=\""/usr/share/games/kobo-deluxe"\" -DKOBO_SCORE_DIR=\""/usr/games/kobo-deluxe/scores"\" -DKOBO_CONFIG_DIR=\""HOME>>"\" -DKOBO_CONFIG_FILE=\"".kobodlrc"\" -DSYSCONF_DIR=\""/usr/etc"\" -Isound -Igraphics -Ieel -Idata -march=i686 -O2 -pipe -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -MT manage.o -MD -MP -MF ".deps/manage.Tpo" \
- -c -o manage.o `test -f 'manage.cpp' || echo './'`manage.cpp; \
- then mv ".deps/manage.Tpo" ".deps/manage.Po"; \
- else rm -f ".deps/manage.Tpo"; exit 1; \
- fi
-scenes.h:58: warning: non-local variable 'const _scene scene []' uses anonymous type
-scenes.h:56: warning: 'typedef const struct<anonymous> _scene' does not refer to the unqualified type, so it is not used for linkage
-gamestate.h:32: error: ISO C++ forbids declaration of 'gamestatemanager_t' with no type
-gamestate.h:32: error: expected ';' before '*' token
-make[2]: *** [manage.o] Error 1
\ No newline at end of file
Deleted: extra-x86_64/kobodeluxe-0.4_pre10-gcc41.patch
===================================================================
--- extra-x86_64/kobodeluxe-0.4_pre10-gcc41.patch 2009-01-08 23:24:29 UTC (rev 23388)
+++ extra-x86_64/kobodeluxe-0.4_pre10-gcc41.patch 2009-01-09 00:47:54 UTC (rev 23389)
@@ -1,11 +0,0 @@
---- KoboDeluxe-0.4pre10/gamestate.h.orig 2006-03-19 16:06:44.000000000 +0100
-+++ KoboDeluxe-0.4pre10/gamestate.h 2006-03-19 16:06:50.000000000 +0100
-@@ -24,6 +24,8 @@
-
- #include "window.h"
-
-+class gamestatemanager_t;
-+
- class gamestate_t
- {
- friend class gamestatemanager_t;
Copied: kobodeluxe/repos/extra-x86_64/kobodeluxe-gcc-4.3.patch (from rev 23387, kobodeluxe/trunk/kobodeluxe-gcc-4.3.patch)
===================================================================
--- extra-x86_64/kobodeluxe-gcc-4.3.patch (rev 0)
+++ extra-x86_64/kobodeluxe-gcc-4.3.patch 2009-01-09 00:47:54 UTC (rev 23389)
@@ -0,0 +1,83 @@
+--- enemies.h
++++ enemies.h
+@@ -70,9 +70,9 @@
+ extern const enemy_kind bomb2;
+ extern const enemy_kind bombdeto;
+ extern const enemy_kind cannon;
+-extern const enemy_kind pipe1;
++extern const enemy_kind pipeone;
+ extern const enemy_kind core;
+-extern const enemy_kind pipe2;
++extern const enemy_kind pipetwo;
+ extern const enemy_kind rock;
+ extern const enemy_kind ring;
+ extern const enemy_kind enemy_m1;
+@@ -430,7 +430,7 @@
+
+ inline int _enemy::is_pipe()
+ {
+- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
++ return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
+ }
+
+
+--- enemy.cpp
++++ enemy.cpp
+@@ -713,7 +713,7 @@
+
+ void _enemy::kill_cannon()
+ {
+- enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
++ enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
+ sound.g_base_node_explo(x, y);
+ release();
+ }
+@@ -755,10 +755,10 @@
+
+ void _enemy::kill_core()
+ {
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
+ sound.g_base_core_explo(x, y);
+ release();
+@@ -851,7 +851,7 @@
+ screen.set_map(x1, y1, m ^ a);
+ release();
+ }
+-const enemy_kind pipe1 = {
++const enemy_kind pipeone = {
+ 0,
+ &_enemy::make_pipe1,
+ &_enemy::move_pipe1,
+@@ -978,19 +978,19 @@
+ }
+ p ^= a;
+ if(p & U_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+ if(p & R_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+ if(p & D_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ if(p & L_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+ manage.add_score(10);
+ release();
+ }
+
+
+-const enemy_kind pipe2 = {
++const enemy_kind pipetwo = {
+ 0,
+ &_enemy::make_pipe2,
+ &_enemy::move_pipe2,
Copied: kobodeluxe/repos/extra-x86_64/kobodeluxe.install (from rev 23387, kobodeluxe/trunk/kobodeluxe.install)
===================================================================
--- extra-x86_64/kobodeluxe.install (rev 0)
+++ extra-x86_64/kobodeluxe.install 2009-01-09 00:47:54 UTC (rev 23389)
@@ -0,0 +1,21 @@
+post_install() {
+ post_upgrade
+}
+
+post_upgrade() {
+ if [ -d usr/share/kobo-deluxe/kobo-deluxe/scores ] ; then
+ for i in usr/share/kobo-deluxe/kobo-deluxe/scores/* ; do
+ mv $i var/games/kobo-deluxe/scores/
+ done
+ rmdir usr/share/kobo-deluxe/kobo-deluxe/scores
+ rmdir usr/share/kobo-deluxe/kobo-deluxe
+ chgrp -R games /var/games/kobo-deluxe/scores/
+ fi
+ # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that.
+ [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_remove() {
+ # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that.
+ [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
More information about the arch-commits
mailing list