From bc4457d8e0e53a2e43c4254d08053ba9708663e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Jun 2023 01:14:49 +0100 Subject: gentoo auto-resync : 20:06:2023 - 01:14:49 --- games-arcade/Manifest.gz | Bin 20892 -> 20889 bytes games-arcade/gnome-nibbles/Manifest | 4 - ...ome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch | 66 -------- ...ome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch | 178 --------------------- .../gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild | 53 ------ 5 files changed, 301 deletions(-) delete mode 100644 games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch delete mode 100644 games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch delete mode 100644 games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild (limited to 'games-arcade') diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz index d13fbb88a503..4b40944e6676 100644 Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest index fad58302ac6e..365e5e92d198 100644 --- a/games-arcade/gnome-nibbles/Manifest +++ b/games-arcade/gnome-nibbles/Manifest @@ -1,7 +1,3 @@ -AUX gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch 3661 BLAKE2B c62908420b4b674a763dc2554c4ed73319bb7e58e4d4f50d1ac0e87c2fda0219415a8335c1f0c1b39c8b61de461168303f34e7ab1eb6c58f44c279411675e301 SHA512 366cfb89ce6923573c66d67cbedfae11f400790a366314a77f1197734ab2ee0760418b9e3d3eb4f7a6105bb63a918f3894b452f4aae68a0a87e03704de410aa7 -AUX gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch 7404 BLAKE2B b2bca8d4d93776a84b3853973cb88a1a9ab58d4ab3d78e5c0556b2557abeaeb5cc43643e25666484b9a66aa46d091abc45be18cfa5f4e2574251ae2b60451a39 SHA512 ebbae48d19a6cb7ac782db0cb57e29cde233c4f24d5d94c05203347065e0c22c6dcebb0f0202d2bc71ca0081675565f18b145dc58ebd630a30b85c4d9de4de98 -DIST gnome-nibbles-3.38.2.tar.xz 337680 BLAKE2B 96ca3794d72f600608b049aafe83808e917ec8e8462b19d31af36f2570e6c3fc8b3c9e85cbaa4ec9f041ecb934aa99701d13fcf232c447f5a4f51e6a98a66173 SHA512 e0146e33efa20ca48131be76a7f1738f8e3e2503a152c879e1d0d6accb091f9c4cb36c6d3009ca824bf6c4ac0ff5249b17e6423919c615992f0c4bef6dfcd601 DIST gnome-nibbles-3.38.3.tar.xz 388996 BLAKE2B cb8482568e5a9e87d2ff974ab9c1a7a33d353554a3bf56774dd451da06cfe97267ae82c90d8331563886c1051e0d59693785773b31247c450c795c05e748854c SHA512 08102ab6a48cc121b2ea4d0edc32e3ee7b0eb56441d061367ca7c058cf94046fe185767999b262c9aaeac70e2086333f024b70ba85810e4275a9cbdede5dacee -EBUILD gnome-nibbles-3.38.2-r1.ebuild 1094 BLAKE2B cd04fb45a67ff9c2525ba3e0ce629d042eada2c9ada53187f8f7ca8f20b3bd3bcdf4e9c2686fb1dfcdd8d6c15c7b3346b0c6cd65c2103cd79c2ad60b80c060db SHA512 ed5e58bc00dfaced57e2d01031b0483ebab6862c59b68638af58ff1e6d772cc4f3e0e63fecf88bf5c6e59ffe5f6e561fa8e0711073e6263a1c47afe7bd1c95dd EBUILD gnome-nibbles-3.38.3.ebuild 910 BLAKE2B 091dac685c1cf6e223499bfbc8862d05432cba5bd2c6b00733833059accf3f1a4b50d5b9ee9c2657a606dce70e763f09e77dfd76c47d1a2ce8fa03131e6f9fc4 SHA512 82754be1be169f74cfdb3073122b1209c42e4f26295c90a7dfc37bb989679b8b896c9134bc83aedc707fcdc653abe5e1e73c8f374131ce77e45dfdb95984ad0c MISC metadata.xml 354 BLAKE2B 79c6d515c771b6d7a122c0d854666fe932877d8094b071962bf771be6935dcbc33cf8bde382266777cae9183c418f1c0b170e44257bc7410c49dcc5d1c5371be SHA512 9309fef64781dd8d1fcf7be7ac6d461de1e7443e81eef9f8d252914a4119de02b3089056d31def628b0644ea8bbcb2591a8bce549c32481cc820276e8ac4871f diff --git a/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch b/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch deleted file mode 100644 index c7a86316925e..000000000000 --- a/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-1.patch +++ /dev/null @@ -1,66 +0,0 @@ -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/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch b/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch deleted file mode 100644 index 48c565303196..000000000000 --- a/games-arcade/gnome-nibbles/files/gnome-nibbles-3.38.2-vala-0.50.4-GtkChild-2.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -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 grids = new Gee.LinkedList (); - - 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 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 list_stores; - private Gee.ArrayList 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 life_images = new Gee.LinkedList (); - --- -GitLab - diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild deleted file mode 100644 index afbe437b2d54..000000000000 --- a/games-arcade/gnome-nibbles/gnome-nibbles-3.38.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Nibbles clone for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles https://gitlab.gnome.org/GNOME/gnome-nibbles" - -LICENSE="GPL-3+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv x86" - -RDEPEND=" - >=dev-libs/glib-2.42.0:2 - >=media-libs/clutter-1.22.0:1.0 - >=media-libs/clutter-gtk-1.4.0:1.0 - dev-libs/libgee:0.8= - >=media-libs/gsound-1.0.2 - >=x11-libs/gtk+-3.24.0:3 - >=dev-libs/libgnome-games-support-1.7.1:1= -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - $(vala_depend) - media-libs/gsound[vala] -" - -PATCHES=( - # backport for https://gitlab.gnome.org/GNOME/gnome-nibbles/-/issues/52 - "${FILESDIR}"/${P}-vala-0.50.4-GtkChild-1.patch - "${FILESDIR}"/${P}-vala-0.50.4-GtkChild-2.patch -) - -src_prepare() { - default - vala_setup - xdg_environment_reset -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3