[arch-commits] Commit in gnome-games/repos (6 files)

Ionut Biru ibiru at archlinux.org
Mon Apr 23 05:06:45 EDT 2012


    Date: Monday, April 23, 2012 @ 05:06:44
  Author: ibiru
Revision: 156819

db-move: moved gnome-games from [testing] to [extra] (i686)

Added:
  gnome-games/repos/extra-i686/PKGBUILD
    (from rev 156695, gnome-games/repos/testing-i686/PKGBUILD)
  gnome-games/repos/extra-i686/gnome-games.install
    (from rev 156695, gnome-games/repos/testing-i686/gnome-games.install)
Deleted:
  gnome-games/repos/extra-i686/PKGBUILD
  gnome-games/repos/extra-i686/gnome-games.install
  gnome-games/repos/extra-i686/gnome-sudoku-fix.patch
  gnome-games/repos/testing-i686/

------------------------+
 PKGBUILD               |   81 ++++++-------
 gnome-games.install    |  275 ++++++++++++++++++++---------------------------
 gnome-sudoku-fix.patch |   29 ----
 3 files changed, 159 insertions(+), 226 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-23 09:06:42 UTC (rev 156818)
+++ extra-i686/PKGBUILD	2012-04-23 09:06:44 UTC (rev 156819)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.2.1
-pkgrel=2
-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')
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch"
-  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
-  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"
-
-  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"
-}

Copied: gnome-games/repos/extra-i686/PKGBUILD (from rev 156695, gnome-games/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-23 09:06:44 UTC (rev 156819)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-games
+pkgver=3.4.1
+pkgrel=1
+pkgdesc="Some Games for GNOME"
+arch=('i686' 'x86_64')
+license=('GPL')
+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)
+sha256sums=('01726b0631205ccbd9f02938f7ccb1d7bd0c4c001cb4596f871fed7c3afc25d4')
+
+build() {
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games \
+      --enable-introspection=yes
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+
+  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
+}

Deleted: extra-i686/gnome-games.install
===================================================================
--- extra-i686/gnome-games.install	2012-04-23 09:06:42 UTC (rev 156818)
+++ extra-i686/gnome-games.install	2012-04-23 09:06:44 UTC (rev 156819)
@@ -1,153 +0,0 @@
-pkgname=gnome-games
-scores=(glines.Large.scores
-	glines.Medium.scores
-	glines.Small.scores
-	gnibbles.1.0.scores
-	gnibbles.1.1.scores
-	gnibbles.2.0.scores
-	gnibbles.2.1.scores
-	gnibbles.3.0.scores
-	gnibbles.3.1.scores
-	gnibbles.4.0.scores
-	gnibbles.4.1.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnomine.Custom.scores
-	gnomine.Large.scores
-	gnomine.Medium.scores
-	gnomine.Small.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.2.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.3.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gtali.Colors.scores
-	gtali.Regular.scores
-	mahjongg.bridges.scores
-	mahjongg.cloud.scores
-	mahjongg.confounding.scores
-	mahjongg.difficult.scores
-	mahjongg.dragon.scores
-	mahjongg.easy.scores
-	mahjongg.pyramid.scores
-	mahjongg.tictactoe.scores
-	mahjongg.ziggurat.scores
-	swell-foop.Large.scores
-	swell-foop.Medium.scores
-	swell-foop.Small.scores
-	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 -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"
-    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}"
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-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
-  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}"
-  done
-}

Copied: gnome-games/repos/extra-i686/gnome-games.install (from rev 156695, gnome-games/repos/testing-i686/gnome-games.install)
===================================================================
--- extra-i686/gnome-games.install	                        (rev 0)
+++ extra-i686/gnome-games.install	2012-04-23 09:06:44 UTC (rev 156819)
@@ -0,0 +1,122 @@
+_scores=(glines.Large.scores
+	glines.Medium.scores
+	glines.Small.scores
+	gnibbles.1.0.scores
+	gnibbles.1.1.scores
+	gnibbles.2.0.scores
+	gnibbles.2.1.scores
+	gnibbles.3.0.scores
+	gnibbles.3.1.scores
+	gnibbles.4.0.scores
+	gnibbles.4.1.scores
+	gnobots2.classic_robots-safe.scores
+	gnobots2.classic_robots-super-safe.scores
+	gnobots2.classic_robots.scores
+	gnobots2.nightmare-safe.scores
+	gnobots2.nightmare-super-safe.scores
+	gnobots2.nightmare.scores
+	gnobots2.robots2-safe.scores
+	gnobots2.robots2-super-safe.scores
+	gnobots2.robots2.scores
+	gnobots2.robots2_easy-safe.scores
+	gnobots2.robots2_easy-super-safe.scores
+	gnobots2.robots2_easy.scores
+	gnobots2.robots_with_safe_teleport-safe.scores
+	gnobots2.robots_with_safe_teleport-super-safe.scores
+	gnobots2.robots_with_safe_teleport.scores
+	gnomine.Custom.scores
+	gnomine.Large.scores
+	gnomine.Medium.scores
+	gnomine.Small.scores
+	gnotravex.2x2.scores
+	gnotravex.3x3.scores
+	gnotravex.4x4.scores
+	gnotravex.5x5.scores
+	gnotravex.6x6.scores
+	gnotski.1.scores
+	gnotski.10.scores
+	gnotski.11.scores
+	gnotski.12.scores
+	gnotski.13.scores
+	gnotski.14.scores
+	gnotski.15.scores
+	gnotski.16.scores
+	gnotski.17.scores
+	gnotski.18.scores
+	gnotski.19.scores
+	gnotski.2.scores
+	gnotski.20.scores
+	gnotski.21.scores
+	gnotski.22.scores
+	gnotski.23.scores
+	gnotski.24.scores
+	gnotski.25.scores
+	gnotski.26.scores
+	gnotski.27.scores
+	gnotski.28.scores
+	gnotski.29.scores
+	gnotski.3.scores
+	gnotski.30.scores
+	gnotski.31.scores
+	gnotski.32.scores
+	gnotski.33.scores
+	gnotski.34.scores
+	gnotski.35.scores
+	gnotski.36.scores
+	gnotski.37.scores
+	gnotski.4.scores
+	gnotski.5.scores
+	gnotski.6.scores
+	gnotski.7.scores
+	gnotski.8.scores
+	gnotski.9.scores
+	gtali.Colors.scores
+	gtali.Regular.scores
+	mahjongg.bridges.scores
+	mahjongg.cloud.scores
+	mahjongg.confounding.scores
+	mahjongg.difficult.scores
+	mahjongg.dragon.scores
+	mahjongg.easy.scores
+	mahjongg.pyramid.scores
+	mahjongg.tictactoe.scores
+	mahjongg.ziggurat.scores
+	swell-foop.Large.scores
+	swell-foop.Medium.scores
+	swell-foop.Small.scores
+	quadrapassel.scores)
+
+post_install() {
+  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 score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+pre_upgrade() {
+  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
+  return 0
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  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"
+  done
+}

Deleted: extra-i686/gnome-sudoku-fix.patch
===================================================================
--- extra-i686/gnome-sudoku-fix.patch	2012-04-23 09:06:42 UTC (rev 156818)
+++ extra-i686/gnome-sudoku-fix.patch	2012-04-23 09:06:44 UTC (rev 156819)
@@ -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