From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- games-board/iagno/Manifest | 4 +- .../iagno-3.38.1-vala-0.50.4-GtkChild-1.patch | 134 +++++++++++ .../iagno-3.38.1-vala-0.50.4-GtkChild-2.patch | 245 +++++++++++++++++++++ games-board/iagno/iagno-3.38.1.ebuild | 6 + 4 files changed, 388 insertions(+), 1 deletion(-) create mode 100644 games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-1.patch create mode 100644 games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-2.patch (limited to 'games-board/iagno') diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest index 8cc07eb552cf..68285557a257 100644 --- a/games-board/iagno/Manifest +++ b/games-board/iagno/Manifest @@ -1,6 +1,8 @@ AUX 3.36.4-vala-posix.patch 820 BLAKE2B 0b2290caa44c7522a5eec6d901afbb2a7eb13788c6a098152bf0ba8c3396b995161646ace14c4683326fe3664442b2b8ffaa026f9a6e7f65bebbe23e96d76a65 SHA512 558a9d3fbc4f42590d93391abd13e27510c7edc56876c4c2e2667a1d61c3edc4f85b876a80a62bfedab1a4ba21bd3a794568635597cf72d78895660c2c8ad863 +AUX iagno-3.38.1-vala-0.50.4-GtkChild-1.patch 6122 BLAKE2B 93c711a7af7dc9674664e251039d40e01fe04edd0049caffbd490fe40b1e3f208d7301565a41dc622451926ff2660e53e5a96786d29415ecbb9ee8b21321b8c3 SHA512 ae036654a9bf4d6e721267c465841fb338fe3d8295bc747d3cc312dd1d9beeac32be399bcca7cec4b7a7eb6148aab95072376e8481dc6aad7eab15f7999c1231 +AUX iagno-3.38.1-vala-0.50.4-GtkChild-2.patch 10217 BLAKE2B 9aa1015ece6358eefbd3fbb5ec9871f7b4fd6071d9776fe41f799b8badaf07d5d264a6f0579b9001c12c7a237bd8b0687dbfa8d914c006271115f1738ceb082f SHA512 291ec2e9aa951bb0080c53434be284070be90d56626c896d357421ddeca70c26b03f61485ba432192e26885239e8602af0e71d19ae752419e7048a242bf239e5 DIST iagno-3.36.4.tar.xz 799480 BLAKE2B 430aa403c974728b929a7715e783dd594f00300dd9b0bf8b6f84da7265e31536a5cae17db94bcbdbebe3ef2690cb05bf18292af158016ec18bb695e58ca20f3d SHA512 43775149f76904a19316e5eac990d8dae0a730c3f6798ad88648892d4795b6892a86fb93b78a72fd30853ad36cc5e4b241e1cbd4067c78d6648f1630543f87be DIST iagno-3.38.1.tar.xz 766188 BLAKE2B 1265a9b3480bdf2ed949af9fd1e8eb0a8aa996a267d9e0e7c4300232ed857a5ef37fca9942b5bb50606e1fa9bc7058660d11296443d5a90213f76d2fbeb83cd1 SHA512 d36e445c01487a79df6fb6b1b77991118a978716688cf166d593656e1f8dbc3f872d0e739145b9ea9629563457d441918d7f46241d29edae8bdf74f54174d4f1 EBUILD iagno-3.36.4.ebuild 1039 BLAKE2B 2cecb81940b6de0d8dff3300c0d81e957e18fa15363ec1aae0b066895c4bed53336cb8066744faed6472372c2a8d2f43e2bada79fd025270b239bdc810665e23 SHA512 987661e4f35a959bc782083789f101af640739db32f7362578d02e9dab81d1d89f7eff9fc69da8c18f0efc5a906a59831e29629608c61a924331659ad50c73ce -EBUILD iagno-3.38.1.ebuild 982 BLAKE2B cc92ca0facd1137354e0361c60f378723222defe4159a376353a688f1897ad9739e784533013c8dc554755c316c5460cf54d81dba1e8355511aaaa47ceb25e65 SHA512 4f3717d98db50c7614acab7901046944b4ed7eb5b9c68f5014c8c83aeac0c2cfa9b978062fbc58ffeab20ce0b816f4360ed18e9393be0ea5448dde749b885237 +EBUILD iagno-3.38.1.ebuild 1166 BLAKE2B 8e42db6e2f104a8229e275c2e55dfb070fb6c8a15ed400fb8878d2a603e2ca182cf5a6671b331b948365087ec91056e3cb43340b76f9906a7e6a69621e99e824 SHA512 fe5764424b6faa1d3ed20d0fa5d781bf2d192fa75a90ad177ce5699ad6fd48bde6ea066b9f7428d30a89c070e661a9ee5225f21f8077edca20efd3e4e5e94c57 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-1.patch b/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-1.patch new file mode 100644 index 000000000000..8ed465166d43 --- /dev/null +++ b/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-1.patch @@ -0,0 +1,134 @@ +From 508c0f94e5f182e50ff61be6e04f72574dee97cb Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 16 Jan 2021 13:50:27 +0100 +Subject: [PATCH] Don't alter or try to write [GtkChild] fields + +See https://gitlab.gnome.org/GNOME/vala/issues/1121 +--- + src/overlayed-list.vala | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala +index ef5db6f..209b044 100644 +--- a/src/overlayed-list.vala ++++ b/src/overlayed-list.vala +@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + internal void set_window_size (AdaptativeWidget.WindowSize new_size) + { + if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size)) +- set_horizontal (ref main_context, ref edit_mode_box); ++ set_horizontal (ref main_context, edit_mode_box); + else +- set_vertical (ref main_context, ref edit_mode_box); ++ set_vertical (ref main_context, edit_mode_box); + } +- private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box) ++ private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box) + { + main_context.remove_class ("vertical"); + edit_mode_box.halign = Align.END; +@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + edit_mode_box.width_request = 160; + main_context.add_class ("horizontal"); + } +- private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box) ++ private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box) + { + main_context.remove_class ("horizontal"); + edit_mode_box.halign = Align.CENTER; +@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool next_match () + { +- return _next_match (ref main_list_box); ++ return _next_match (main_list_box); + } +- private static inline bool _next_match (ref ListBox main_list_box) ++ private static inline bool _next_match (ListBox main_list_box) + { + ListBoxRow? row = main_list_box.get_selected_row (); // TODO multiple rows and focus-only lists + if (row == null) +@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + if (row == null) + { +- _scroll_bottom (ref main_list_box); ++ _scroll_bottom (main_list_box); + return false; + } + main_list_box.select_row ((!) row); +@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool previous_match () + { +- return _previous_match (ref main_list_box); ++ return _previous_match (main_list_box); + } +- private static inline bool _previous_match (ref ListBox main_list_box) ++ private static inline bool _previous_match (ListBox main_list_box) + { + uint n_items = main_list_box.get_children ().length (); // FIXME OverlayedList.n_items is unreliable + if (n_items == 0) +@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected int [] get_selected_rows_indices () + { +- return _get_selected_rows_indices (ref main_list_box); ++ return _get_selected_rows_indices (main_list_box); + } +- private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box) ++ private static inline int [] _get_selected_rows_indices (ListBox main_list_box) + { + int [] indices = new int [0]; + main_list_box.selected_foreach ((_list_box, selected_row) => { +@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected void scroll_top () + { +- _scroll_top (ref main_list_box); ++ _scroll_top (main_list_box); + } +- private static inline void _scroll_top (ref ListBox main_list_box) ++ private static inline void _scroll_top (ListBox main_list_box) + { + Adjustment adjustment = main_list_box.get_adjustment (); + adjustment.set_value (adjustment.get_lower ()); +@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + protected void scroll_bottom () + { +- _scroll_bottom (ref main_list_box); ++ _scroll_bottom (main_list_box); + } +- private static inline void _scroll_bottom (ref ListBox main_list_box) ++ private static inline void _scroll_bottom (ListBox main_list_box) + { + Adjustment adjustment = main_list_box.get_adjustment (); + adjustment.set_value (adjustment.get_upper ()); +@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal bool handle_copy_text (out string copy_text) + { +- return _handle_copy_text (out copy_text, ref main_list_box); ++ return _handle_copy_text (out copy_text, main_list_box); + } +- private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box) ++ private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box) + { + List selected_rows = main_list_box.get_selected_rows (); + OverlayedListRow row; +@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + + internal SelectionState get_selection_state () + { +- return _get_selection_state (ref main_list_box, ref main_list_store); ++ return _get_selection_state (main_list_box, ref main_list_store); + } +- private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store) ++ private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store) + { + List selected_rows = main_list_box.get_selected_rows (); + uint n_selected_rows = selected_rows.length (); +-- +GitLab + diff --git a/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-2.patch b/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-2.patch new file mode 100644 index 000000000000..530c43ddb429 --- /dev/null +++ b/games-board/iagno/files/iagno-3.38.1-vala-0.50.4-GtkChild-2.patch @@ -0,0 +1,245 @@ +From e8a0aeec350ea80349582142c0e8e3cd3f1bce38 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Wed, 17 Mar 2021 11:48:39 +0100 +Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type + must be unowned + +--- + src/base-headerbar.vala | 14 +++++++------- + src/base-view.vala | 4 ++-- + src/base-window.vala | 6 +++--- + src/game-actionbar.vala | 6 +++--- + src/game-headerbar.vala | 4 ++-- + src/history-button.vala | 4 ++-- + src/new-game-screen.vala | 18 +++++++++--------- + src/notifications-revealer.vala | 2 +- + src/overlayed-list.vala | 10 +++++----- + src/registry-placeholder.vala | 4 ++-- + 10 files changed, 36 insertions(+), 36 deletions(-) + +diff --git a/src/base-headerbar.vala b/src/base-headerbar.vala +index 075a3ef..256d761 100644 +--- a/src/base-headerbar.vala ++++ b/src/base-headerbar.vala +@@ -20,7 +20,7 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/base-headerbar.ui")] + private class BaseHeaderBar : NightTimeAwareHeaderBar, AdaptativeWidget + { +- [GtkChild] protected Box center_box; ++ [GtkChild] protected unowned Box center_box; + + construct + { +@@ -190,13 +190,13 @@ private class BaseHeaderBar : NightTimeAwareHeaderBar, AdaptativeWidget + * * default widgets + \*/ + +- [GtkChild] private Button go_back_button; +- [GtkChild] private Separator ltr_left_separator; +- [GtkChild] private Label title_label; +- [GtkChild] private MenuButton info_button; +- [GtkChild] private Separator ltr_right_separator; ++ [GtkChild] private unowned Button go_back_button; ++ [GtkChild] private unowned Separator ltr_left_separator; ++ [GtkChild] private unowned Label title_label; ++ [GtkChild] private unowned MenuButton info_button; ++ [GtkChild] private unowned Separator ltr_right_separator; + +- [GtkChild] protected Stack quit_button_stack; ++ [GtkChild] protected unowned Stack quit_button_stack; + + protected void set_default_widgets_states (string? title_label_text_or_null, + bool show_go_back_button, +diff --git a/src/base-view.vala b/src/base-view.vala +index af884df..0889eae 100644 +--- a/src/base-view.vala ++++ b/src/base-view.vala +@@ -20,7 +20,7 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/base-view.ui")] + private class BaseView : Stack, AdaptativeWidget + { +- [GtkChild] protected Grid main_grid; ++ [GtkChild] protected unowned Grid main_grid; + + internal virtual bool handle_copy_text (out string copy_text) + { +@@ -109,7 +109,7 @@ private class BaseView : Stack, AdaptativeWidget + * * notifications + \*/ + +- [GtkChild] private Overlay notifications_overlay; ++ [GtkChild] private unowned Overlay notifications_overlay; + + private bool notifications_revealer_created = false; + private NotificationsRevealer notifications_revealer; +diff --git a/src/base-window.vala b/src/base-window.vala +index ed8e891..eccaba8 100644 +--- a/src/base-window.vala ++++ b/src/base-window.vala +@@ -74,9 +74,9 @@ private class BaseWindow : AdaptativeWindow, AdaptativeWidget + * * main layout + \*/ + +- [GtkChild] private Grid main_grid; +- [GtkChild] private Button unfullscreen_button; +- [GtkChild] private Overlay main_overlay; ++ [GtkChild] private unowned Grid main_grid; ++ [GtkChild] private unowned Button unfullscreen_button; ++ [GtkChild] private unowned Overlay main_overlay; + + protected void add_to_main_overlay (Widget widget) + { +diff --git a/src/game-actionbar.vala b/src/game-actionbar.vala +index e59bfdc..d1e9278 100644 +--- a/src/game-actionbar.vala ++++ b/src/game-actionbar.vala +@@ -28,8 +28,8 @@ private class GameActionBar : Revealer, AdaptativeWidget + [CCode (notify = false)] public string window_name { private get; protected construct set; default = "" ; } + [CCode (notify = false)] public Widget? game_widget { private get; protected construct ; default = null ; } + +- [GtkChild] private ActionBar action_bar; +- [GtkChild] private Label game_label; ++ [GtkChild] private unowned ActionBar action_bar; ++ [GtkChild] private unowned Label game_label; + + construct + { +@@ -93,7 +93,7 @@ private class GameActionBar : Revealer, AdaptativeWidget + [GtkTemplate (ui = "/org/gnome/Reversi/ui/game-actionbar-placeholder.ui")] + private class GameActionBarPlaceHolder : Revealer, AdaptativeWidget + { +- [GtkChild] private Widget placeholder_child; ++ [GtkChild] private unowned Widget placeholder_child; + private GameActionBar actionbar; + + internal GameActionBarPlaceHolder (GameActionBar _actionbar) +diff --git a/src/game-headerbar.vala b/src/game-headerbar.vala +index 8238b3d..8267d3d 100644 +--- a/src/game-headerbar.vala ++++ b/src/game-headerbar.vala +@@ -23,8 +23,8 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/game-headerbar.ui")] + private class GameHeaderBar : BaseHeaderBar, AdaptativeWidget + { +- [GtkChild] private Button new_game_button; +- [GtkChild] private Button back_button; ++ [GtkChild] private unowned Button new_game_button; ++ [GtkChild] private unowned Button back_button; + + [CCode (notify = false)] public bool window_has_name { private get; protected construct set; default = false; } + [CCode (notify = false)] public string window_name { private get; protected construct set; default = ""; } +diff --git a/src/history-button.vala b/src/history-button.vala +index 4cd3673..05a7b49 100644 +--- a/src/history-button.vala ++++ b/src/history-button.vala +@@ -25,8 +25,8 @@ private class HistoryButton : MenuButton, AdaptativeWidget + { + [CCode (notify = false)] public ThemeManager theme_manager { private get; protected construct; } + +- [GtkChild] private Stack stack; +- [GtkChild] private DrawingArea drawing; ++ [GtkChild] private unowned Stack stack; ++ [GtkChild] private unowned DrawingArea drawing; + + internal HistoryButton (GLib.Menu menu, ThemeManager theme_manager) + { +diff --git a/src/new-game-screen.vala b/src/new-game-screen.vala +index 4cb7d31..8401c39 100644 +--- a/src/new-game-screen.vala ++++ b/src/new-game-screen.vala +@@ -23,11 +23,11 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/new-game-screen.ui")] + private class NewGameScreen : Box, AdaptativeWidget + { +- [GtkChild] private ModelButton modelbutton_one; +- [GtkChild] private ModelButton modelbutton_two; ++ [GtkChild] private unowned ModelButton modelbutton_one; ++ [GtkChild] private unowned ModelButton modelbutton_two; + +- [GtkChild] private Gtk.MenuButton menubutton_one; +- [GtkChild] private Gtk.MenuButton menubutton_two; ++ [GtkChild] private unowned Gtk.MenuButton menubutton_one; ++ [GtkChild] private unowned Gtk.MenuButton menubutton_two; + + construct + { +@@ -106,12 +106,12 @@ private class NewGameScreen : Box, AdaptativeWidget + map.connect (() => games_box.show ()); + } + +- [GtkChild] private Box games_box; +- [GtkChild] private Box options_box; ++ [GtkChild] private unowned Box games_box; ++ [GtkChild] private unowned Box options_box; + +- [GtkChild] private Label games_label; +- [GtkChild] private Label options_label; +- [GtkChild] private Separator options_separator; ++ [GtkChild] private unowned Label games_label; ++ [GtkChild] private unowned Label options_label; ++ [GtkChild] private unowned Separator options_separator; + + private bool phone_size = false; + private bool extra_thin = false; +diff --git a/src/notifications-revealer.vala b/src/notifications-revealer.vala +index 85e96e9..8668ef2 100644 +--- a/src/notifications-revealer.vala ++++ b/src/notifications-revealer.vala +@@ -20,7 +20,7 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/notifications-revealer.ui")] + private class NotificationsRevealer : Revealer, AdaptativeWidget + { +- [GtkChild] private Label notification_label; ++ [GtkChild] private unowned Label notification_label; + + construct + { +diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala +index 209b044..4ff47f1 100644 +--- a/src/overlayed-list.vala ++++ b/src/overlayed-list.vala +@@ -20,12 +20,12 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/overlayed-list.ui")] + private abstract class OverlayedList : Overlay, AdaptativeWidget + { +- [GtkChild] protected ListBox main_list_box; ++ [GtkChild] protected unowned ListBox main_list_box; + private StyleContext main_list_box_context; + protected GLib.ListStore main_list_store = new GLib.ListStore (typeof (Widget)); + +- [GtkChild] private ScrolledWindow scrolled; +- [GtkChild] private Box edit_mode_box; ++ [GtkChild] private unowned ScrolledWindow scrolled; ++ [GtkChild] private unowned Box edit_mode_box; + + /*\ + * * differed construct +@@ -45,8 +45,8 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget + } + + +- [GtkChild] private ModelButton enter_edit_mode_button; +- [GtkChild] private ModelButton leave_edit_mode_button; ++ [GtkChild] private unowned ModelButton enter_edit_mode_button; ++ [GtkChild] private unowned ModelButton leave_edit_mode_button; + [CCode (notify = false)] public string edit_mode_action_prefix + { + construct +diff --git a/src/registry-placeholder.vala b/src/registry-placeholder.vala +index fdd8283..dc7bbaa 100644 +--- a/src/registry-placeholder.vala ++++ b/src/registry-placeholder.vala +@@ -20,8 +20,8 @@ using Gtk; + [GtkTemplate (ui = "/org/gnome/Reversi/ui/registry-placeholder.ui")] + private class RegistryPlaceholder : Grid + { +- [GtkChild] private Label placeholder_label; +- [GtkChild] private Image placeholder_image; ++ [GtkChild] private unowned Label placeholder_label; ++ [GtkChild] private unowned Image placeholder_image; + + [CCode (notify = false)] public string label { internal construct set { placeholder_label.label = value; }} + [CCode (notify = false)] public string icon_name { private get; internal construct; } +-- +GitLab + diff --git a/games-board/iagno/iagno-3.38.1.ebuild b/games-board/iagno/iagno-3.38.1.ebuild index c501ffdf59d8..7eb33d6dd650 100644 --- a/games-board/iagno/iagno-3.38.1.ebuild +++ b/games-board/iagno/iagno-3.38.1.ebuild @@ -33,6 +33,12 @@ BDEPEND=" gnome-base/librsvg:2[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() { xdg_src_prepare vala_src_prepare -- cgit v1.2.3