* [PR PATCH] gnome-nibbles: update to 3.38.3
@ 2023-06-28 20:38 chrysos349
2023-06-29 6:55 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: chrysos349 @ 2023-06-28 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages gnome-nibbles
https://github.com/void-linux/void-packages/pull/44698
gnome-nibbles: update to 3.38.3
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/44698.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-nibbles-44698.patch --]
[-- Type: text/x-diff, Size: 13395 bytes --]
From bb2bcab5f48a1617f444e3425a4a8a23331f40df Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Jun 2023 23:37:19 +0300
Subject: [PATCH] gnome-nibbles: update to 3.38.3
---
srcpkgs/gnome-nibbles/patches/vala.patch | 178 ----------------------
srcpkgs/gnome-nibbles/patches/vala2.patch | 66 --------
srcpkgs/gnome-nibbles/template | 7 +-
3 files changed, 4 insertions(+), 247 deletions(-)
delete mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch
delete mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch
diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
deleted file mode 100644
index 48c565303196..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 17 Mar 2021 11:25:05 +0100
-Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
- must be unowned
-
----
- src/controls.vala | 20 ++++++++++----------
- src/nibbles-window.vala | 26 +++++++++++++-------------
- src/players.vala | 6 +++---
- src/preferences-dialog.vala | 30 +++++++++++++++---------------
- src/scoreboard.vala | 6 +++---
- 5 files changed, 44 insertions(+), 44 deletions(-)
-
-diff --git a/src/controls.vala b/src/controls.vala
-index 584c9ff..f95d210 100644
---- a/src/controls.vala
-+++ b/src/controls.vala
-@@ -22,7 +22,7 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
- private class Controls : Box
- {
-- [GtkChild] private Box grids_box;
-+ [GtkChild] private unowned Box grids_box;
- private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
-
- private Gdk.Pixbuf arrow_pixbuf;
-@@ -100,15 +100,15 @@ private class Controls : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
- private class ControlsGrid : Button
- {
-- [GtkChild] private Label name_label;
-- [GtkChild] private Image arrow_up;
-- [GtkChild] private Image arrow_down;
-- [GtkChild] private Image arrow_left;
-- [GtkChild] private Image arrow_right;
-- [GtkChild] private Label move_up_label;
-- [GtkChild] private Label move_down_label;
-- [GtkChild] private Label move_left_label;
-- [GtkChild] private Label move_right_label;
-+ [GtkChild] private unowned Label name_label;
-+ [GtkChild] private unowned Image arrow_up;
-+ [GtkChild] private unowned Image arrow_down;
-+ [GtkChild] private unowned Image arrow_left;
-+ [GtkChild] private unowned Image arrow_right;
-+ [GtkChild] private unowned Label move_up_label;
-+ [GtkChild] private unowned Label move_down_label;
-+ [GtkChild] private unowned Label move_left_label;
-+ [GtkChild] private unowned Label move_right_label;
-
- internal WormProperties worm_props;
- internal ulong external_handler;
-diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
-index 6961326..6bfb74a 100644
---- a/src/nibbles-window.vala
-+++ b/src/nibbles-window.vala
-@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
- private int window_height;
-
- /* Main widgets */
-- [GtkChild] private Stack main_stack;
-- [GtkChild] private Overlay overlay;
-+ [GtkChild] private unowned Stack main_stack;
-+ [GtkChild] private unowned Overlay overlay;
-
- /* HeaderBar */
-- [GtkChild] private HeaderBar headerbar;
-- [GtkChild] private MenuButton hamburger_menu;
-- [GtkChild] private Button new_game_button;
-- [GtkChild] private Button pause_button;
-+ [GtkChild] private unowned HeaderBar headerbar;
-+ [GtkChild] private unowned MenuButton hamburger_menu;
-+ [GtkChild] private unowned Button new_game_button;
-+ [GtkChild] private unowned Button pause_button;
-
- /* Pre-game screen widgets */
-- [GtkChild] private Players players;
-- [GtkChild] private Speed speed;
-- [GtkChild] private Controls controls;
-+ [GtkChild] private unowned Players players;
-+ [GtkChild] private unowned Speed speed;
-+ [GtkChild] private unowned Controls controls;
-
- /* Statusbar widgets */
-- [GtkChild] private Stack statusbar_stack;
-- [GtkChild] private Label countdown;
-- [GtkChild] private Scoreboard scoreboard;
-+ [GtkChild] private unowned Stack statusbar_stack;
-+ [GtkChild] private unowned Label countdown;
-+ [GtkChild] private unowned Scoreboard scoreboard;
- private Gdk.Pixbuf scoreboard_life;
-
- /* Rendering of the game */
- private NibblesView? view;
-
-- [GtkChild] private Box game_box;
-+ [GtkChild] private unowned Box game_box;
- private Games.GridFrame frame;
-
- /* Game being played */
-diff --git a/src/players.vala b/src/players.vala
-index 9198412..4bde18e 100644
---- a/src/players.vala
-+++ b/src/players.vala
-@@ -21,9 +21,9 @@ using Gtk;
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
- private class Players : Box
- {
-- [GtkChild] private ToggleButton worms4;
-- [GtkChild] private ToggleButton worms5;
-- [GtkChild] private ToggleButton worms6;
-+ [GtkChild] private unowned ToggleButton worms4;
-+ [GtkChild] private unowned ToggleButton worms5;
-+ [GtkChild] private unowned ToggleButton worms6;
-
- private SimpleAction nibbles_number_action;
- private SimpleAction players_number_action;
-diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
-index 216a1e2..2d3a7bf 100644
---- a/src/preferences-dialog.vala
-+++ b/src/preferences-dialog.vala
-@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
- private GLib.Settings settings;
- private Gee.ArrayList<GLib.Settings> worm_settings;
-
-- [GtkChild] private Stack stack;
-- [GtkChild] private Stack headerbar_stack;
-- [GtkChild] private ComboBoxText worm_combobox;
-- [GtkChild] private Gtk.ListStore list_store_1;
-- [GtkChild] private Gtk.ListStore list_store_2;
-- [GtkChild] private Gtk.ListStore list_store_3;
-- [GtkChild] private Gtk.ListStore list_store_4;
-- [GtkChild] private TreeView tree_view_1;
-- [GtkChild] private TreeView tree_view_2;
-- [GtkChild] private TreeView tree_view_3;
-- [GtkChild] private TreeView tree_view_4;
-- [GtkChild] private ComboBoxText combo_box_1;
-- [GtkChild] private ComboBoxText combo_box_2;
-- [GtkChild] private ComboBoxText combo_box_3;
-- [GtkChild] private ComboBoxText combo_box_4;
-+ [GtkChild] private unowned Stack stack;
-+ [GtkChild] private unowned Stack headerbar_stack;
-+ [GtkChild] private unowned ComboBoxText worm_combobox;
-+ [GtkChild] private unowned Gtk.ListStore list_store_1;
-+ [GtkChild] private unowned Gtk.ListStore list_store_2;
-+ [GtkChild] private unowned Gtk.ListStore list_store_3;
-+ [GtkChild] private unowned Gtk.ListStore list_store_4;
-+ [GtkChild] private unowned TreeView tree_view_1;
-+ [GtkChild] private unowned TreeView tree_view_2;
-+ [GtkChild] private unowned TreeView tree_view_3;
-+ [GtkChild] private unowned TreeView tree_view_4;
-+ [GtkChild] private unowned ComboBoxText combo_box_1;
-+ [GtkChild] private unowned ComboBoxText combo_box_2;
-+ [GtkChild] private unowned ComboBoxText combo_box_3;
-+ [GtkChild] private unowned ComboBoxText combo_box_4;
-
- private Gee.ArrayList<Gtk.ListStore> list_stores;
- private Gee.ArrayList<TreeView> tree_views;
-diff --git a/src/scoreboard.vala b/src/scoreboard.vala
-index a41aee1..aebc1cc 100644
---- a/src/scoreboard.vala
-+++ b/src/scoreboard.vala
-@@ -59,9 +59,9 @@ private class Scoreboard : Box
- [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
- private class PlayerScoreBox : Box
- {
-- [GtkChild] private Label name_label;
-- [GtkChild] private Label score_label;
-- [GtkChild] private Grid lives_grid;
-+ [GtkChild] private unowned Label name_label;
-+ [GtkChild] private unowned Label score_label;
-+ [GtkChild] private unowned Grid lives_grid;
-
- private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
-
---
-GitLab
-
diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
deleted file mode 100644
index c7a86316925e..000000000000
--- a/srcpkgs/gnome-nibbles/patches/vala2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-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<uint> 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/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 32aa8aea4202..41210fcb7626 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-nibbles'
pkgname=gnome-nibbles
-version=3.38.2
+version=3.38.3
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config vala"
+hostmakedepends="gettext glib-devel itstool pkg-config vala desktop-file-utils
+ gtk-update-icon-cache"
makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
libgnome-games-support-devel librsvg-devel"
short_desc="GNOME snake eats diamonds game"
@@ -12,4 +13,4 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Nibbles"
changelog="https://gitlab.gnome.org/GNOME/gnome-nibbles/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=457a64b1c88e2d8d0143c452ffd01f0300d7d3005802954ef5abf9c896b353d9
+checksum=975fde1d83c7b15b392eac7a359161290fc8aeb7605c11e71cee0c3c326b5e61
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-nibbles: update to 3.38.3
2023-06-28 20:38 [PR PATCH] gnome-nibbles: update to 3.38.3 chrysos349
@ 2023-06-29 6:55 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-06-29 6:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
There's a merged pull request on the void-packages repository
gnome-nibbles: update to 3.38.3
https://github.com/void-linux/void-packages/pull/44698
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-29 6:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-28 20:38 [PR PATCH] gnome-nibbles: update to 3.38.3 chrysos349
2023-06-29 6:55 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).