[arch-commits] Commit in gnome-2048/repos (10 files)
Jan Steffens
heftig at archlinux.org
Mon Oct 12 17:48:50 UTC 2015
Date: Monday, October 12, 2015 @ 19:48:49
Author: heftig
Revision: 248954
archrelease: copy trunk to extra-x86_64, extra-i686
Added:
gnome-2048/repos/extra-i686/PKGBUILD
(from rev 248953, gnome-2048/trunk/PKGBUILD)
gnome-2048/repos/extra-i686/gnome-2048.install
(from rev 248953, gnome-2048/trunk/gnome-2048.install)
gnome-2048/repos/extra-x86_64/PKGBUILD
(from rev 248953, gnome-2048/trunk/PKGBUILD)
gnome-2048/repos/extra-x86_64/gnome-2048.install
(from rev 248953, gnome-2048/trunk/gnome-2048.install)
Deleted:
gnome-2048/repos/extra-i686/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch
gnome-2048/repos/extra-i686/PKGBUILD
gnome-2048/repos/extra-i686/gnome-2048.install
gnome-2048/repos/extra-x86_64/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch
gnome-2048/repos/extra-x86_64/PKGBUILD
gnome-2048/repos/extra-x86_64/gnome-2048.install
------------------------------------------------------------------------------+
/PKGBUILD | 64 ++++++++++
/gnome-2048.install | 24 +++
extra-i686/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch | 55 --------
extra-i686/PKGBUILD | 35 -----
extra-i686/gnome-2048.install | 12 -
extra-x86_64/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch | 55 --------
extra-x86_64/PKGBUILD | 35 -----
extra-x86_64/gnome-2048.install | 12 -
8 files changed, 88 insertions(+), 204 deletions(-)
Deleted: extra-i686/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch
===================================================================
--- extra-i686/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-i686/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,55 +0,0 @@
-From 8a18366cb3c054f01ceef43b403cf0838937bb70 Mon Sep 17 00:00:00 2001
-From: Yanko Kaneti <yaneti at declera.com>
-Date: Sat, 26 Sep 2015 13:18:31 +0300
-Subject: [PATCH] game: Make new_game() work in the case of game not already
- existing
-
-https://bugzilla.gnome.org/show_bug.cgi?id=755658
----
- src/game.vala | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/src/game.vala b/src/game.vala
-index 4142223..d8673c6 100644
---- a/src/game.vala
-+++ b/src/game.vala
-@@ -107,7 +107,11 @@ public class Game : GLib.Object
- {
- _grid.clear ();
- _undo_stack.clear ();
-- _clear_foreground ();
-+ // new_game could be called without an existing game
-+ if (_background == null) {
-+ _init_background ();
-+ } else
-+ _clear_foreground ();
- score = 0;
- _state = GameState.SHOWING_FIRST_TILE;
- _create_random_tile ();
-@@ -148,19 +152,13 @@ public class Game : GLib.Object
- try {
- FileUtils.get_contents (_saved_path, out contents);
- } catch (FileError e) {
-- // FIXME: Returning false guarantees a crash, because _clear_foreground
-- // will be called before _init_background(). Also, warning here makes no
-- // sense, since restoring is expected to fail if no previously-saved game
-- // exists. Someone needs to take a closer look at this to see what should
-- // happen if this function needs to return false, or if it needs a return
-- // value at all.
--
-- // warning ("Failed to restore game: %s", e.message);
-- // return false;
-+ return false;
- }
-
-- if (!_grid.load (contents))
-+ if (!_grid.load (contents)) {
-+ warning ("Failed to restore game from saved file");
- return false;
-+ }
-
- lines = contents.split ("\n");
- score = (uint)int.parse (lines[lines.length-2]);
---
-2.5.3
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-i686/PKGBUILD 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-2048
-pkgver=3.18.0
-pkgrel=2
-pkgdesc="Obtain the 2048 tile"
-url="https://wiki.gnome.org/Apps/2048"
-arch=(x86_64 i686)
-license=(GPL3)
-depends=(clutter-gtk libgee libgames-support)
-makedepends=(intltool vala itstool)
-groups=(gnome-extra)
-install=gnome-2048.install
-options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- '0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch')
-sha256sums=('87cf703f5dad02bb22ba464faa5fdf8a0784e64652de23b7f1c8685fc3d69938'
- 'bb9eb8e5a977828aeadb974324742c0a5b16abf2a42533db95b1a372c85b16de')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i "../0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch"
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-2048/repos/extra-i686/PKGBUILD (from rev 248953, gnome-2048/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-10-12 17:48:49 UTC (rev 248954)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-2048
+pkgver=3.18.1
+pkgrel=1
+pkgdesc="Obtain the 2048 tile"
+url="https://wiki.gnome.org/Apps/2048"
+arch=(x86_64 i686)
+license=(GPL3)
+depends=(clutter-gtk libgee libgames-support)
+makedepends=(intltool vala itstool)
+groups=(gnome-extra)
+install=gnome-2048.install
+options=(!emptydirs)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c9927405753d56786948b017c7b45a40b7438d614ea6e087aead8b08f6ede369')
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/gnome-2048.install
===================================================================
--- extra-i686/gnome-2048.install 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-i686/gnome-2048.install 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -f -q usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-2048/repos/extra-i686/gnome-2048.install (from rev 248953, gnome-2048/trunk/gnome-2048.install)
===================================================================
--- extra-i686/gnome-2048.install (rev 0)
+++ extra-i686/gnome-2048.install 2015-10-12 17:48:49 UTC (rev 248954)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch
===================================================================
--- extra-x86_64/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-x86_64/0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,55 +0,0 @@
-From 8a18366cb3c054f01ceef43b403cf0838937bb70 Mon Sep 17 00:00:00 2001
-From: Yanko Kaneti <yaneti at declera.com>
-Date: Sat, 26 Sep 2015 13:18:31 +0300
-Subject: [PATCH] game: Make new_game() work in the case of game not already
- existing
-
-https://bugzilla.gnome.org/show_bug.cgi?id=755658
----
- src/game.vala | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/src/game.vala b/src/game.vala
-index 4142223..d8673c6 100644
---- a/src/game.vala
-+++ b/src/game.vala
-@@ -107,7 +107,11 @@ public class Game : GLib.Object
- {
- _grid.clear ();
- _undo_stack.clear ();
-- _clear_foreground ();
-+ // new_game could be called without an existing game
-+ if (_background == null) {
-+ _init_background ();
-+ } else
-+ _clear_foreground ();
- score = 0;
- _state = GameState.SHOWING_FIRST_TILE;
- _create_random_tile ();
-@@ -148,19 +152,13 @@ public class Game : GLib.Object
- try {
- FileUtils.get_contents (_saved_path, out contents);
- } catch (FileError e) {
-- // FIXME: Returning false guarantees a crash, because _clear_foreground
-- // will be called before _init_background(). Also, warning here makes no
-- // sense, since restoring is expected to fail if no previously-saved game
-- // exists. Someone needs to take a closer look at this to see what should
-- // happen if this function needs to return false, or if it needs a return
-- // value at all.
--
-- // warning ("Failed to restore game: %s", e.message);
-- // return false;
-+ return false;
- }
-
-- if (!_grid.load (contents))
-+ if (!_grid.load (contents)) {
-+ warning ("Failed to restore game from saved file");
- return false;
-+ }
-
- lines = contents.split ("\n");
- score = (uint)int.parse (lines[lines.length-2]);
---
-2.5.3
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-x86_64/PKGBUILD 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=gnome-2048
-pkgver=3.18.0
-pkgrel=2
-pkgdesc="Obtain the 2048 tile"
-url="https://wiki.gnome.org/Apps/2048"
-arch=(x86_64 i686)
-license=(GPL3)
-depends=(clutter-gtk libgee libgames-support)
-makedepends=(intltool vala itstool)
-groups=(gnome-extra)
-install=gnome-2048.install
-options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- '0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch')
-sha256sums=('87cf703f5dad02bb22ba464faa5fdf8a0784e64652de23b7f1c8685fc3d69938'
- 'bb9eb8e5a977828aeadb974324742c0a5b16abf2a42533db95b1a372c85b16de')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i "../0001-game-Make-new_game-work-in-the-case-of-game-not-alre.patch"
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-2048/repos/extra-x86_64/PKGBUILD (from rev 248953, gnome-2048/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-10-12 17:48:49 UTC (rev 248954)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=gnome-2048
+pkgver=3.18.1
+pkgrel=1
+pkgdesc="Obtain the 2048 tile"
+url="https://wiki.gnome.org/Apps/2048"
+arch=(x86_64 i686)
+license=(GPL3)
+depends=(clutter-gtk libgee libgames-support)
+makedepends=(intltool vala itstool)
+groups=(gnome-extra)
+install=gnome-2048.install
+options=(!emptydirs)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c9927405753d56786948b017c7b45a40b7438d614ea6e087aead8b08f6ede369')
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/gnome-2048.install
===================================================================
--- extra-x86_64/gnome-2048.install 2015-10-12 17:47:04 UTC (rev 248953)
+++ extra-x86_64/gnome-2048.install 2015-10-12 17:48:49 UTC (rev 248954)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -f -q usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-2048/repos/extra-x86_64/gnome-2048.install (from rev 248953, gnome-2048/trunk/gnome-2048.install)
===================================================================
--- extra-x86_64/gnome-2048.install (rev 0)
+++ extra-x86_64/gnome-2048.install 2015-10-12 17:48:49 UTC (rev 248954)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list