[arch-commits] Commit in gnome-games/trunk (4 files)
Jan Steffens
heftig at archlinux.org
Thu Mar 3 19:12:27 UTC 2011
Date: Thursday, March 3, 2011 @ 14:12:27
Author: heftig
Revision: 112087
upgpkg: gnome-games 2.91.90-1
Update for gnome-unstable
Modified:
gnome-games/trunk/PKGBUILD
gnome-games/trunk/gnome-games.install
Deleted:
gnome-games/trunk/03_missing_icons.patch
gnome-games/trunk/scores.png
------------------------+
03_missing_icons.patch | 38 --------------------------------------
PKGBUILD | 41 +++++++++++++++--------------------------
gnome-games.install | 4 +++-
3 files changed, 18 insertions(+), 65 deletions(-)
Deleted: 03_missing_icons.patch
===================================================================
--- 03_missing_icons.patch 2011-03-03 18:22:48 UTC (rev 112086)
+++ 03_missing_icons.patch 2011-03-03 19:12:27 UTC (rev 112087)
@@ -1,38 +0,0 @@
-Index: gnome-games-2.30.2/libgames-support/games-stock.c
-===================================================================
---- gnome-games-2.30.2.orig/libgames-support/games-stock.c 2010-07-04 11:33:16.880062363 +0200
-+++ gnome-games-2.30.2/libgames-support/games-stock.c 2010-07-04 12:23:59.035567621 +0200
-@@ -282,15 +282,14 @@ games_stock_init (void)
- #ifdef HAVE_GTK_ICON_FACTORY_ADD_ALIAS
- { GAMES_STOCK_REDO_MOVE, GTK_STOCK_REDO },
- { GAMES_STOCK_UNDO_MOVE, GTK_STOCK_UNDO },
-+ { GAMES_STOCK_RESUME_GAME, GTK_STOCK_MEDIA_PLAY },
- #endif
- #ifndef HAVE_HILDON
- { GAMES_STOCK_NETWORK_GAME, GTK_STOCK_NETWORK },
- { GAMES_STOCK_NETWORK_LEAVE, GTK_STOCK_STOP },
- { GAMES_STOCK_PLAYER_LIST, GTK_STOCK_INFO },
-
-- { GAMES_STOCK_PAUSE_GAME, "stock_timer_stopped" },
-- { GAMES_STOCK_RESUME_GAME, "stock_timer" },
-- { GAMES_STOCK_SCORES, "stock_scores" },
-+ { GAMES_STOCK_PAUSE_GAME, GTK_STOCK_MEDIA_PAUSE },
- #endif /* !HAVE_HILDON */
- };
-
-@@ -298,6 +297,7 @@ games_stock_init (void)
- const char *stock_icon_aliases_bidi[][3] = {
- { GAMES_STOCK_REDO_MOVE, GTK_STOCK_REDO "-ltr", GTK_STOCK_REDO "-rtl" },
- { GAMES_STOCK_UNDO_MOVE, GTK_STOCK_UNDO "-ltr", GTK_STOCK_UNDO "-rtl" },
-+ { GAMES_STOCK_RESUME_GAME, GTK_STOCK_MEDIA_PLAY "-ltr", GTK_STOCK_MEDIA_PLAY "-rtl" },
- };
- #endif
-
-@@ -306,6 +306,7 @@ games_stock_init (void)
- #ifndef HAVE_HILDON
- { GAMES_STOCK_TELEPORT, "teleport" },
- { GAMES_STOCK_RTELEPORT, "teleport-random" },
-+ { GAMES_STOCK_SCORES, "scores" },
- #endif /* !HAVE_HILDON */
- { GAMES_STOCK_DEAL_CARDS, "cards-deal" }
- };
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-03 18:22:48 UTC (rev 112086)
+++ PKGBUILD 2011-03-03 19:12:27 UTC (rev 112087)
@@ -2,51 +2,40 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-games
-pkgver=2.32.1
-pkgrel=2
+pkgver=2.91.90
+pkgrel=1
pkgdesc="Some Games for GNOME"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('pygtk' 'libsm' 'gconf>=2.32.0' 'guile>=1.8.7' 'filesystem>=2010.09' 'desktop-file-utils' 'libcanberra>=0.25' 'clutter-gtk>=0.10.8' 'hicolor-icon-theme' 'librsvg>=2.32.0' 'python-rsvg>=2.32.0' 'python2-gconf')
-makedepends=('gnome-doc-utils>=0.20.1' 'intltool' 'glproto' 'gobject-introspection')
-optdepends=('python-gtkglext: glchess 3D mode')
-provides=('glchess' 'gnome-sudoku')
-conflicts=('glchess' 'gnome-sudoku')
+depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra'
+ 'clutter-gtk' 'hicolor-icon-theme' 'librsvg')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+provides=('glchess')
+conflicts=('glchess')
options=('!emptydirs' '!libtool')
install=gnome-games.install
url="http://www.gnome.org"
groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
- 03_missing_icons.patch
- scores.png)
-sha256sums=('1a3b2e82102eed3780f05db4378111c475456678deed82fd4ca379da1c5593d9'
- '05d63319773e5389b87672a20b03c4c1e91a33fd1678b5e76335bf7e4daa46a6'
- '2f818741bbf20fc83a68d71908de76f5f1b2b9e27691a4767aebf0e4a39fee85')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('118a9639947fd92687dc5c9998b987eb643b58f339f9c4ffe2c2815d2dfa9677')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/03_missing_icons.patch"
- PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-scrollkeeper \
--disable-static \
--with-scores-user=root --with-scores-group=games \
- --enable-introspection=yes \
- --enable-omitgames=swell-foop,lightsoff
+ --enable-introspection=yes
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
# Remove all scores, we generate them from postinstall
rm -rf "${pkgdir}/var"
- sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
- $pkgdir/usr/lib/python2.7/site-packages/gnome_sudoku/{tracker_info,number_box}.py
-
- sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $pkgdir/usr/bin/{gnome-sudoku,glchess}
-
- install -m755 -d "${pkgdir}/usr/share/icons/hicolor/24x24/actions"
- install -m644 "${srcdir}/scores.png" "${pkgdir}/usr/share/icons/hicolor/24x24/actions/"
-
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
Modified: gnome-games.install
===================================================================
--- gnome-games.install 2011-03-03 18:22:48 UTC (rev 112086)
+++ gnome-games.install 2011-03-03 19:12:27 UTC (rev 112087)
@@ -88,9 +88,10 @@
quadrapassel.scores)
post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
usr/sbin/gconfpkg --install ${pkgname}
update-desktop-database -q
- gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
for sz in Large Medium Small; do
if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then
@@ -142,6 +143,7 @@
}
post_remove() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
update-desktop-database -q
gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
Deleted: scores.png
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list