[arch-commits] Commit in gnome-games/trunk (3 files)

Jan Steffens heftig at archlinux.org
Sun Mar 11 03:40:42 EDT 2012


    Date: Sunday, March 11, 2012 @ 03:40:42
  Author: heftig
Revision: 153009

3.3.5

Modified:
  gnome-games/trunk/PKGBUILD
  gnome-games/trunk/gnome-games.install
Deleted:
  gnome-games/trunk/gnome-sudoku-fix.patch

------------------------+
 PKGBUILD               |   31 +++++++++----------------
 gnome-games.install    |   58 ++++++++++-------------------------------------
 gnome-sudoku-fix.patch |   29 -----------------------
 3 files changed, 25 insertions(+), 93 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-11 07:34:58 UTC (rev 153008)
+++ PKGBUILD	2012-03-11 07:40:42 UTC (rev 153009)
@@ -1,44 +1,37 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-games
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.3.5
+pkgrel=1
 pkgdesc="Some Games for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
+depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
+makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
 options=('!emptydirs' '!libtool')
 install=gnome-games.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gnome-sudoku-fix.patch)
-sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b'
-            '00daafd11078355e16f384fe98dab69ee7e03037c8c311e7180f8f896965a715')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('fb7040584396bc8e9afdf0330d44ed94eb01f957391bcebe2d8518f271c5d810')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch"
+  cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-static \
+      --localstatedir=/var --disable-static --disable-schemas-compile \
       --with-scores-user=root --with-scores-group=games \
       --enable-introspection=yes
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
   # Remove all scores, we generate them from postinstall
   rm -rf "$pkgdir/var"
 
-  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
-
   sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
 }

Modified: gnome-games.install
===================================================================
--- gnome-games.install	2012-03-11 07:34:58 UTC (rev 153008)
+++ gnome-games.install	2012-03-11 07:40:42 UTC (rev 153009)
@@ -1,5 +1,4 @@
-pkgname=gnome-games
-scores=(glines.Large.scores
+_scores=(glines.Large.scores
 	glines.Medium.scores
 	glines.Small.scores
 	gnibbles.1.0.scores
@@ -88,66 +87,35 @@
 	quadrapassel.scores)
 
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   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
-      mv "opt/gnome/var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
-    elif [ -e "var/games/same-gnome.${sz}.scores" ]; then
-      mv "var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
     fi
-  done
-  if [ -e "opt/gnome/var/games/gnometris.scores" ]; then
-    mv "opt/gnome/var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  elif [ -e "var/games/gnometris.scores" ]; then
-    mv "var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  fi
 
-  for score in "${scores[@]}" ; do
-    if [ -e "var/games/${score}" ]; then
-      continue
-    fi
-    if [ -e "opt/gnome/var/games/${score}" ]; then
-      mv "opt/gnome/var/games/${score}" var/games/
-    else
-      touch "var/games/${score}"
-    fi
-    chown root:games "var/games/${score}"
-    chmod 664 "var/games/${score}"
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
   done
 }
 
 pre_upgrade() {
-  pre_remove $1
+  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-
-  if [ -f usr/share/ggz/gnect-client.dsc ]; then
-    ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null
-  fi
-}
-
 post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
 
-  for score in "${scores[@]}" ; do
-    rm -f "var/games/${score}"
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
   done
 }

Deleted: gnome-sudoku-fix.patch
===================================================================
--- gnome-sudoku-fix.patch	2012-03-11 07:34:58 UTC (rev 153008)
+++ gnome-sudoku-fix.patch	2012-03-11 07:40:42 UTC (rev 153009)
@@ -1,29 +0,0 @@
-From 8ab5a3a28281e6b1b649d9ef93628b3433ddd887 Mon Sep 17 00:00:00 2001
-From: John (J5) Palmieri <johnp at redhat.com>
-Date: Mon, 02 Jan 2012 18:39:05 +0000
-Subject: fix type check so gnome-sudoku works with pygobject >= 3.0.3
-
-gnome-sudoku was using if type(grid) == str to check if it needed
-to convert the game board to a list.  Unicode fixes in the latest
-pygobject returns unicode strings for any string stored in a
-TreeStore. The fix was to correctly check for any string using
-isinstance(grid, basestring)
-
-Note this will not work in python3 so needs to be looked at when
-porting
----
-diff --git a/gnome-sudoku/src/lib/sudoku.py b/gnome-sudoku/src/lib/sudoku.py
-index a345593..7d28608 100644
---- a/gnome-sudoku/src/lib/sudoku.py
-+++ b/gnome-sudoku/src/lib/sudoku.py
-@@ -130,7 +130,7 @@ class SudokuGrid(object):
-         for n, col in enumerate([[(x, y) for y in range(self.group_size)] for x in range(self.group_size)]):
-             self.col_coords[n] = col
-         if grid:
--            if type(grid) == str:
-+            if isinstance(grid, basestring):
-                 g = re.split("\s+", grid)
-                 side = int(math.sqrt(len(g)))
-                 grid = []
---
-cgit v0.9.0.2



More information about the arch-commits mailing list