[arch-commits] Commit in kobodeluxe/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Sat May 7 08:05:30 UTC 2011
Date: Saturday, May 7, 2011 @ 04:05:30
Author: eric
Revision: 122903
upgpkg: kobodeluxe 0.5.1-3
Added hicolor-icon-theme and gtk-update-icon-cache depends, Fixed install scriptlet, Added build patch
Added:
kobodeluxe/trunk/kobodeluxe-0.5.1-glibc2.10.patch
Modified:
kobodeluxe/trunk/PKGBUILD
kobodeluxe/trunk/kobodeluxe.install
Deleted:
kobodeluxe/trunk/ChangeLog
----------------------------------+
ChangeLog | 8 ----
PKGBUILD | 62 ++++++++++++++++++++-----------------
kobodeluxe-0.5.1-glibc2.10.patch | 11 ++++++
kobodeluxe.install | 9 ++---
4 files changed, 49 insertions(+), 41 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2011-05-07 07:41:13 UTC (rev 122902)
+++ ChangeLog 2011-05-07 08:05:30 UTC (rev 122903)
@@ -1,8 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-07 07:41:13 UTC (rev 122902)
+++ PKGBUILD 2011-05-07 08:05:30 UTC (rev 122903)
@@ -1,44 +1,50 @@
# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=kobodeluxe
pkgver=0.5.1
-pkgrel=2
+pkgrel=3
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')
+depends=('libjpeg' 'libpng' 'sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache')
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')
+source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz \
+ kobodeluxe-gcc-4.3.patch kobodeluxe-0.5.1-glibc2.10.patch)
+md5sums=('cf765559461213d651c7be042507b767'
+ '2b76306ec997fdc64986b4425e5b7814'
+ '56115c9a1e3db1b95b731fdcb11f3f4f')
+sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75'
+ '274dc8e7909bc6f9fab31306c85d992af8b62674'
+ '9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0')
build() {
- cd ${srcdir}/KoboDeluxe-${pkgver}
+ 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=${pkgdir} install || return 1
+ patch -p0 < ../kobodeluxe-0.5.1-glibc2.10.patch
+ ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games
+ make
+}
+
+package() {
+ cd "${srcdir}/KoboDeluxe-${pkgver}"
+ make DESTDIR="${pkgdir}" install
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
+ 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}/kobodl.png"
+ done
+ 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
+ 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"
}
Added: kobodeluxe-0.5.1-glibc2.10.patch
===================================================================
--- kobodeluxe-0.5.1-glibc2.10.patch (rev 0)
+++ kobodeluxe-0.5.1-glibc2.10.patch 2011-05-07 08:05:30 UTC (rev 122903)
@@ -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
Modified: kobodeluxe.install
===================================================================
--- kobodeluxe.install 2011-05-07 07:41:13 UTC (rev 122902)
+++ kobodeluxe.install 2011-05-07 08:05:30 UTC (rev 122903)
@@ -4,18 +4,17 @@
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/
+ 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
+ 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
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
More information about the arch-commits
mailing list