diff -u gnome-mastermind-0.3/debian/changelog gnome-mastermind-0.3/debian/changelog --- gnome-mastermind-0.3/debian/changelog +++ gnome-mastermind-0.3/debian/changelog @@ -1,3 +1,11 @@ +gnome-mastermind (0.3-1ubuntu0.1) hardy-proposed; urgency=low + + * SRU fix for LP: #222580 - "GNOME Mastermind grid is shifted to the right + with new cairo releases". + * debian/patches/02_grid.diff: game grid didn't show good with cairo > 1.5.8. + + -- Filippo Argiolas Mon, 28 Apr 2008 08:10:52 +0200 + gnome-mastermind (0.3-1) unstable; urgency=low * New upstream release. diff -u gnome-mastermind-0.3/debian/control gnome-mastermind-0.3/debian/control --- gnome-mastermind-0.3/debian/control +++ gnome-mastermind-0.3/debian/control @@ -1,7 +1,8 @@ Source: gnome-mastermind Section: games Priority: optional -Maintainer: Bart Martens +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bart Martens Build-Depends: cdbs, debhelper (>= 5), autotools-dev, imagemagick, pkg-config (>= 0.9.0), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.0), libgconf2-dev (>= 2.0.0), libxml-parser-perl, gnome-doc-utils (>= 0.3.2) Standards-Version: 3.7.2 only in patch2: unchanged: --- gnome-mastermind-0.3.orig/debian/patches/02_grid.diff +++ gnome-mastermind-0.3/debian/patches/02_grid.diff @@ -0,0 +1,133 @@ +diff -ruN gnome-mastermind-0.3.orig/src/gnome-mastermind.c gnome-mastermind-0.3/src/gnome-mastermind.c +--- gnome-mastermind-0.3.orig/src/gnome-mastermind.c 2007-05-30 19:47:42.000000000 +0200 ++++ gnome-mastermind-0.3/src/gnome-mastermind.c 2008-11-17 09:54:24.080357443 +0100 +@@ -497,23 +497,22 @@ + + gdk_cairo_set_source_color (cr, &fgcolor); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); +- cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); +- cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER); ++// cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); + cairo_set_line_width (cr, 1); + for (i = 0; i <= GRID_COLS; i++) { + cairo_move_to (cr, +- grid_xpad+grid_sz*i+1, ++ grid_xpad+grid_sz*i, + grid_ypad); + cairo_line_to (cr, +- grid_xpad+grid_sz*i+1, ++ grid_xpad+grid_sz*i, + grid_ypad+grid_sz*grid_rows); + } + for (i = 0; i <= 2; i++) { + cairo_move_to (cr, +- grid_xpad+grid_sz*(GRID_COLS+1)+grid_sz*i/2+1, ++ grid_xpad+grid_sz*(GRID_COLS+1)+grid_sz*i/2, + grid_ypad); + cairo_line_to (cr, +- grid_xpad+grid_sz* (GRID_COLS+1)+grid_sz*i/2+1, ++ grid_xpad+grid_sz* (GRID_COLS+1)+grid_sz*i/2, + grid_ypad+grid_sz*grid_rows); + + } +@@ -522,10 +521,10 @@ + cairo_set_line_width (cr, 2); + for (j = 0; j <= grid_rows; j++) { + cairo_move_to (cr, +- grid_xpad+1, ++ grid_xpad-0.5, + grid_ypad+grid_sz*j); + cairo_line_to (cr, +- grid_xpad+grid_sz*GRID_COLS, ++ grid_xpad+grid_sz*GRID_COLS+0.5, + grid_ypad+grid_sz*j); + + } +@@ -537,10 +536,10 @@ + else + cairo_set_line_width (cr, 2); + cairo_move_to (cr, +- grid_xpad+grid_sz* (GRID_COLS+1)+1, ++ grid_xpad+grid_sz* (GRID_COLS+1)-0.5, + grid_ypad+grid_sz*j/2); + cairo_line_to (cr, +- grid_xpad+grid_sz* (GRID_COLS+2), ++ grid_xpad+grid_sz* (GRID_COLS+2)+0.5, + grid_ypad+grid_sz*j/2); + cairo_stroke (cr); + } +@@ -548,8 +547,8 @@ + + cairo_set_operator (cr, CAIRO_OPERATOR_XOR); + cairo_set_line_width (cr, 0); +- cairo_rectangle (cr, grid_xpad+1, grid_ypad+1, grid_sz*GRID_COLS-1, grid_sz* (grid_rows)-2); +- cairo_rectangle (cr, grid_xpad+grid_sz* (GRID_COLS+1)+1, grid_ypad+1, grid_sz-1, grid_sz* (grid_rows)-2); ++ cairo_rectangle (cr, grid_xpad+0.5, grid_ypad+1, grid_sz*GRID_COLS-1, grid_sz* (grid_rows)-2); ++ cairo_rectangle (cr, grid_xpad+grid_sz* (GRID_COLS+1)+0.5, grid_ypad+1, grid_sz-1, grid_sz* (grid_rows)-2); + cairo_set_source_rgba (cr, 1, 1, 1, 0.3); + cairo_fill (cr); + cairo_stroke (cr); +@@ -558,8 +557,8 @@ + + cairo_set_operator (cr, CAIRO_OPERATOR_ADD); + cairo_set_line_width (cr, 0); +- cairo_rectangle (cr, grid_xpad+1, grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos)))+1, grid_sz*GRID_COLS-1, grid_sz-2); +- cairo_rectangle (cr, grid_xpad+grid_sz* (GRID_COLS+1)+1, grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos)))+1, grid_sz-1, grid_sz-2); ++ cairo_rectangle (cr, grid_xpad+0.5, grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos)))+1, grid_sz*GRID_COLS-1, grid_sz-2); ++ cairo_rectangle (cr, grid_xpad+grid_sz* (GRID_COLS+1)+0.5, grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos)))+1, grid_sz-1, grid_sz-2); + cairo_set_source_rgba (cr, 1, 1, 1, 0.35); + cairo_fill (cr); + cairo_stroke (cr); +@@ -705,6 +704,7 @@ + -1); + + cr = gdk_cairo_create (pixmap); ++ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + + gdk_cairo_set_source_color (cr, &bgcolor); + cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height); +@@ -978,34 +978,36 @@ + static gboolean clean_next_row (void) { + cairo_t *cr; + cr = gdk_cairo_create (pixmap); ++ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + cairo_set_operator (cr, CAIRO_OPERATOR_ADD); + cairo_set_line_width (cr, 0); + cairo_save (cr); + cairo_rectangle (cr, +- grid_xpad+1, ++ grid_xpad+0.5, + grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos+1)))+1, + grid_sz*GRID_COLS-1, + grid_sz-2); + +- rect.x = grid_xpad+1; ++ rect.x = grid_xpad; + rect.y = grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos+1)))+1; +- rect.width = grid_sz*GRID_COLS-1; ++ rect.width = grid_sz*GRID_COLS; + rect.height = grid_sz-2; + +- gdk_window_invalidate_rect (drawing_area->window, &rect, FALSE); ++ gdk_window_invalidate_rect (drawing_area->window, FALSE, FALSE); + + cairo_rectangle (cr, +- grid_xpad+grid_sz* (GRID_COLS+1)+1, ++ grid_xpad+grid_sz* (GRID_COLS+1)+0.5, + grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos+1)))+1, +- grid_sz-1, grid_sz-2); ++ grid_sz-1, ++ grid_sz-2); + cairo_set_source_rgba (cr, 1, 1, 1, 0.35); + cairo_fill_preserve (cr); + cairo_stroke (cr); + cairo_destroy (cr); + +- rect.x = grid_xpad+grid_sz* (GRID_COLS+1)+1; ++ rect.x = grid_xpad+grid_sz* (GRID_COLS+1); + rect.y = grid_ypad+ (grid_sz* (grid_rows- (grid_rows-ypos+1)))+1; +- rect.width = grid_sz - 1; ++ rect.width = grid_sz; + rect.height = grid_sz - 2; + + gdk_window_invalidate_rect (drawing_area->window, &rect, FALSE);