From 806688f2b4dc7b86006a6856c160b08aaa34cc9d2fd613837c389bcc7ac2d721 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Mar 2021 16:41:38 +0000 Subject: [PATCH] Accepting request 881018 from GNOME:Next GNOME 40 - here we come OBS-URL: https://build.opensuse.org/request/show/881018 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-nibbles?expand=0&rev=83 --- ...446068608aff9b5edf1fdbd4b8c0d9f0be94.patch | 66 +++++++++++++++++++ gnome-nibbles.changes | 6 ++ gnome-nibbles.spec | 7 +- 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch diff --git a/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch b/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch new file mode 100644 index 0000000..2b92343 --- /dev/null +++ b/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch @@ -0,0 +1,66 @@ +From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 16 Jan 2021 13:56:10 +0100 +Subject: [PATCH] Don't alter or try to write [GtkChild] fields + +See https://gitlab.gnome.org/GNOME/vala/issues/1121 +--- + src/controls.vala | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/controls.vala b/src/controls.vala +index 4f07358..584c9ff 100644 +--- a/src/controls.vala ++++ b/src/controls.vala +@@ -140,25 +140,25 @@ private class ControlsGrid : Button + arrow_left.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE)); + arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE)); + +- up_handler = worm_props.notify ["up"].connect (() => configure_label (worm_props.up, ref move_up_label)); +- down_handler = worm_props.notify ["down"].connect (() => configure_label (worm_props.down, ref move_down_label)); +- left_handler = worm_props.notify ["left"].connect (() => configure_label (worm_props.left, ref move_left_label)); +- right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label)); +- +- configure_label (worm_props.up, ref move_up_label); +- configure_label (worm_props.down, ref move_down_label); +- configure_label (worm_props.left, ref move_left_label); +- configure_label (worm_props.right, ref move_right_label); ++ up_handler = worm_props.notify ["up"].connect (() => configure_label (worm_props.up, move_up_label)); ++ down_handler = worm_props.notify ["down"].connect (() => configure_label (worm_props.down, move_down_label)); ++ left_handler = worm_props.notify ["left"].connect (() => configure_label (worm_props.left, move_left_label)); ++ right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label)); ++ ++ configure_label (worm_props.up, move_up_label); ++ configure_label (worm_props.down, move_down_label); ++ configure_label (worm_props.left, move_left_label); ++ configure_label (worm_props.right, move_right_label); + } + + internal void mark_duplicated_keys (GenericSet duplicate_keys) + { +- set_duplicate_class (worm_props.up in duplicate_keys, ref move_up_label); +- set_duplicate_class (worm_props.down in duplicate_keys, ref move_down_label); +- set_duplicate_class (worm_props.left in duplicate_keys, ref move_left_label); +- set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label); ++ set_duplicate_class (worm_props.up in duplicate_keys, move_up_label); ++ set_duplicate_class (worm_props.down in duplicate_keys, move_down_label); ++ set_duplicate_class (worm_props.left in duplicate_keys, move_left_label); ++ set_duplicate_class (worm_props.right in duplicate_keys, move_right_label); + } +- private static void set_duplicate_class (bool new_value, ref Label label) ++ private static void set_duplicate_class (bool new_value, Label label) + { + if (new_value) + label.get_style_context ().add_class ("duplicate"); +@@ -175,7 +175,7 @@ private class ControlsGrid : Button + worm_props.disconnect (color_handler); + } + +- private static void configure_label (uint key_value, ref Label label) ++ private static void configure_label (uint key_value, Label label) + { + string? key_name = Gdk.keyval_name (key_value); + if (key_name == "Up") +-- +GitLab + diff --git a/gnome-nibbles.changes b/gnome-nibbles.changes index 9c98223..b047262 100644 --- a/gnome-nibbles.changes +++ b/gnome-nibbles.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 18 16:32:16 UTC 2021 - Dominique Leuenberger + +- Add 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch: Fix build + with vala 0.51.x. + ------------------------------------------------------------------- Mon Nov 2 11:46:32 UTC 2020 - Bjørn Lie diff --git a/gnome-nibbles.spec b/gnome-nibbles.spec index e273848..6e58c6f 100644 --- a/gnome-nibbles.spec +++ b/gnome-nibbles.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-nibbles # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,8 @@ License: GPL-3.0-or-later Group: Amusements/Games/Action/Arcade URL: https://live.gnome.org/Lightsoff Source0: https://download.gnome.org/sources/gnome-nibbles/3.38/%{name}-%{version}.tar.xz - +# PATCH-FIX-UPSTREAM 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch dimstar@opensuse.org -- Fix build with vala 0.51.x. +Patch0: https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch BuildRequires: fdupes BuildRequires: gettext BuildRequires: meson >= 0.50.1 @@ -47,7 +48,7 @@ causes a loss of points. When all points are lost, the player loses. %lang_package %prep -%autosetup +%autosetup -p1 %build %meson