[arch-commits] Commit in kobodeluxe/repos/community-x86_64 (7 files)
Alexander Rødseth
arodseth at gemini.archlinux.org
Fri Feb 11 09:56:48 UTC 2022
Date: Friday, February 11, 2022 @ 09:56:48
Author: arodseth
Revision: 1131819
archrelease: copy trunk to community-x86_64
Added:
kobodeluxe/repos/community-x86_64/PKGBUILD
(from rev 1131818, kobodeluxe/trunk/PKGBUILD)
kobodeluxe/repos/community-x86_64/kobodeluxe-0.5.1-glibc2.10.patch
(from rev 1131818, kobodeluxe/trunk/kobodeluxe-0.5.1-glibc2.10.patch)
kobodeluxe/repos/community-x86_64/kobodeluxe-gcc-4.3.patch
(from rev 1131818, kobodeluxe/trunk/kobodeluxe-gcc-4.3.patch)
Deleted:
kobodeluxe/repos/community-x86_64/PKGBUILD
kobodeluxe/repos/community-x86_64/kobodeluxe-0.5.1-glibc2.10.patch
kobodeluxe/repos/community-x86_64/kobodeluxe-gcc-4.3.patch
kobodeluxe/repos/community-x86_64/kobodeluxe.install
----------------------------------+
PKGBUILD | 97 ++++++++++-----------
kobodeluxe-0.5.1-glibc2.10.patch | 22 ++--
kobodeluxe-gcc-4.3.patch | 166 ++++++++++++++++++-------------------
kobodeluxe.install | 15 ---
4 files changed, 143 insertions(+), 157 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-11 09:56:40 UTC (rev 1131818)
+++ PKGBUILD 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -1,48 +0,0 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=kobodeluxe
-pkgver=0.5.1
-pkgrel=8
-pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up"
-arch=('x86_64')
-url="http://www.olofson.net/kobodl/"
-license=('GPL' 'LGPL')
-depends=('sdl_image' 'hicolor-icon-theme')
-install=kobodeluxe.install
-source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz
- kobodeluxe-gcc-4.3.patch kobodeluxe-0.5.1-glibc2.10.patch)
-sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75'
- '274dc8e7909bc6f9fab31306c85d992af8b62674'
- '9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0')
-
-prepare() {
- cd KoboDeluxe-${pkgver}
- tar -xf icons.tar.gz
- patch -p0 -i "${srcdir}/kobodeluxe-gcc-4.3.patch"
- patch -p0 -i "${srcdir}/kobodeluxe-0.5.1-glibc2.10.patch"
-}
-
-build() {
- cd KoboDeluxe-${pkgver}
- ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games
- make
-}
-
-package() {
- cd KoboDeluxe-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 icons/KDE/kobo-deluxe.desktop "${pkgdir}/usr/share/applications/kobo-deluxe.desktop"
- for i in 16 22 32 48 64 128 ; do
- install -D -m644 icons/KDE/icons/${i}x${i}/kobodl.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/kobodl.png"
- done
-
- 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"
-}
Copied: kobodeluxe/repos/community-x86_64/PKGBUILD (from rev 1131818, kobodeluxe/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -0,0 +1,49 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=kobodeluxe
+pkgver=0.5.1
+pkgrel=10
+pkgdesc='3rd person scrolling 2D shooter'
+arch=(x86_64)
+url='http://www.olofson.net/kobodl/'
+license=(GPL LGPL)
+depends=(hicolor-icon-theme sdl_image)
+source=("http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz"
+ kobodeluxe-gcc-4.3.patch
+ kobodeluxe-0.5.1-glibc2.10.patch)
+b2sums=('7dd17b4613a467428b09274f7374b921c2d2b40cfed83b019b665e61240bfa097160e3bd4ca09a48264b1ec02653a8ef6218d753dc5631fa8d2f9001856fcb91'
+ '566b474b40eea4bf7abb3d414beb3bac38576a534ac105db8814eb890f5ad2ffd77d245a083395c60b4b73f07e0cadf52e6c40befb0664254da7f4f168f1d559'
+ 'c539d01a3f3dbedaf90503aba74a4a54754fb9d9e82dace7b0b6a5832aed757c260415816cf41ff75a3cfdee3b7616303f031647706f7b514e98c0e85a6beb01')
+
+prepare() {
+ cd KoboDeluxe-$pkgver
+ patch -p0 -i ../kobodeluxe-gcc-4.3.patch
+ patch -p0 -i ../kobodeluxe-0.5.1-glibc2.10.patch
+ tar xf icons.tar.gz
+ # Fix paths, thanks Gentoo!
+ sed -i \
+ -e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
+ -e 's:\$(sharedstatedir)/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \
+ configure
+ sed -i -e 's:kobo-deluxe:kobodeluxe:' data/{gfx,sfx}/Makefile.in
+}
+
+build() {
+ cd KoboDeluxe-$pkgver
+ ./configure --localstatedir=/var --prefix=/usr --sharedstatedir=/var/games
+ make
+}
+
+package() {
+ cd KoboDeluxe-$pkgver
+ DESTDIR="$pkgdir" make install
+ ln -s /usr/bin/kobodl "$pkgdir/usr/bin/kobodeluxe"
+ install -D -m644 icons/KDE/kobo-deluxe.desktop \
+ "$pkgdir/usr/share/applications/kobodeluxe.desktop"
+ for i in 16 22 32 48 64 128 ; do
+ install -Dm644 icons/KDE/icons/${i}x$i/kobodl.png \
+ "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/kobodl.png"
+ done
+}
Deleted: kobodeluxe-0.5.1-glibc2.10.patch
===================================================================
--- kobodeluxe-0.5.1-glibc2.10.patch 2022-02-11 09:56:40 UTC (rev 1131818)
+++ kobodeluxe-0.5.1-glibc2.10.patch 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -1,11 +0,0 @@
---- graphics/window.cpp
-+++ graphics/window.cpp
-@@ -398,7 +398,7 @@
- */
- if(token)
- {
-- char *tok = strchr(txt, token);
-+ const char *tok = strchr(txt, token);
- if(tok)
- tokpos = tok-txt;
- else
Copied: kobodeluxe/repos/community-x86_64/kobodeluxe-0.5.1-glibc2.10.patch (from rev 1131818, kobodeluxe/trunk/kobodeluxe-0.5.1-glibc2.10.patch)
===================================================================
--- kobodeluxe-0.5.1-glibc2.10.patch (rev 0)
+++ kobodeluxe-0.5.1-glibc2.10.patch 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -0,0 +1,11 @@
+--- graphics/window.cpp
++++ graphics/window.cpp
+@@ -398,7 +398,7 @@
+ */
+ if(token)
+ {
+- char *tok = strchr(txt, token);
++ const char *tok = strchr(txt, token);
+ if(tok)
+ tokpos = tok-txt;
+ else
Deleted: kobodeluxe-gcc-4.3.patch
===================================================================
--- kobodeluxe-gcc-4.3.patch 2022-02-11 09:56:40 UTC (rev 1131818)
+++ kobodeluxe-gcc-4.3.patch 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -1,83 +0,0 @@
---- 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/community-x86_64/kobodeluxe-gcc-4.3.patch (from rev 1131818, kobodeluxe/trunk/kobodeluxe-gcc-4.3.patch)
===================================================================
--- kobodeluxe-gcc-4.3.patch (rev 0)
+++ kobodeluxe-gcc-4.3.patch 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -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,
Deleted: kobodeluxe.install
===================================================================
--- kobodeluxe.install 2022-02-11 09:56:40 UTC (rev 1131818)
+++ kobodeluxe.install 2022-02-11 09:56:48 UTC (rev 1131819)
@@ -1,15 +0,0 @@
-post_install() {
- post_upgrade
-}
-
-post_upgrade() {
- if [ -d usr/share/kobo-deluxe/kobo-deluxe/scores ] ; then
- mkdir -p var/games/kobo-deluxe/scores/
- 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
-}
More information about the arch-commits
mailing list