[gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-games/files: gnome-games-3.2.1-sudoku-borders.patch gnome-games-3.2.1-pygobject-3.0.3.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    12/01/04 23:30:10

  Added:                gnome-games-3.2.1-sudoku-borders.patch
                        gnome-games-3.2.1-pygobject-3.0.3.patch
  Log:
  Fix py-compile idiom for automake-1.11.2 compatibility (bugs #396585, #397335). Move gnome2_src_prepare after eautoreconf. Revbump to fix sudoku set_bg_color traceback and pygobject-3.0.3 crashes (bug #397501), and to not install libgames-support-gi.a.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/gnome-games/files/gnome-games-3.2.1-sudoku-borders.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-3.2.1-sudoku-borders.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-3.2.1-sudoku-borders.patch?rev=1.1&content-type=text/plain

Index: gnome-games-3.2.1-sudoku-borders.patch
===================================================================
From a91b3962d121f4042e7029e30a5c1423dfb0c130 Mon Sep 17 00:00:00 2001
From: Edward Sheldrake <ejsheldrake@×××××.com>
Date: Sat, 8 Oct 2011 14:42:32 +0100
Subject: [PATCH] sudoku: fix borders

Fixes python traceback printed to terminal that ends with:
TypeError: 'Color' object does not support indexing

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=658519
---
 gnome-sudoku/src/lib/gsudoku.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnome-sudoku/src/lib/gsudoku.py b/gnome-sudoku/src/lib/gsudoku.py
index 79a0e21..b222f95 100644
--- a/gnome-sudoku/src/lib/gsudoku.py
+++ b/gnome-sudoku/src/lib/gsudoku.py
@@ -56,7 +56,7 @@ class SudokuNumberGrid (Gtk.AspectFrame):
     def set_bg_color (self, color):
         try:
             if type(color) == str:
-                color = Gdk.color_parse(color)[1]
+                color = Gdk.color_parse(color)
                 color = Gdk.RGBA(color.red/65535.0, color.green/65535.0, color.blue/65535.0)
             else:
                 color = Gdk.RGBA(*color)
-- 
1.7.8.1




1.1                  gnome-extra/gnome-games/files/gnome-games-3.2.1-pygobject-3.0.3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-3.2.1-pygobject-3.0.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-games/files/gnome-games-3.2.1-pygobject-3.0.3.patch?rev=1.1&content-type=text/plain

Index: gnome-games-3.2.1-pygobject-3.0.3.patch
===================================================================
From 8ab5a3a28281e6b1b649d9ef93628b3433ddd887 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@××××××.com>
Date: Mon, 2 Jan 2012 13:39:05 -0500
Subject: [PATCH] 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
---
 gnome-sudoku/src/lib/sudoku.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 = []
-- 
1.7.8.2