onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

games-puzzle/gnome-taquin: Fix for vala 0.50.4 regression 

* https://gitlab.gnome.org/GNOME/vala/issues/1121

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert 2021-05-15 19:24:03 +02:00
parent acbfede4da
commit 17107db088
No known key found for this signature in database
GPG Key ID: CE36E117202E3842
3 changed files with 369 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
games-puzzle/gnome-taquin/files/gnome-taquin-3.38.1-vala-0.50.4-GtkChild-1.patch Normal file
View File

@ -0,0 +1,134 @@
From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 16 Jan 2021 14:00:15 +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 3fbb1c3..eb2404a 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<weak ListBoxRow> 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<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
uint n_selected_rows = selected_rows.length ();
--
GitLab

229
games-puzzle/gnome-taquin/files/gnome-taquin-3.38.1-vala-0.50.4-GtkChild-2.patch Normal file
View File

@ -0,0 +1,229 @@
From 66be44dc20d114e449fc33156e3939fd05dfbb16 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 17 Mar 2021 11:32:49 +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/new-game-screen.vala | 18 +++++++++---------
src/notifications-revealer.vala | 2 +-
src/overlayed-list.vala | 10 +++++-----
src/registry-placeholder.vala | 4 ++--
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/base-headerbar.vala b/src/base-headerbar.vala
index 8cb5774..315746f 100644
--- a/src/base-headerbar.vala
+++ b/src/base-headerbar.vala
@@ -20,7 +20,7 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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 cc54855..2c74499 100644
--- a/src/base-view.vala
+++ b/src/base-view.vala
@@ -20,7 +20,7 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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 2c652ab..02e0de6 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 e75907e..5ff275f 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/Taquin/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 94fb7de..324b7bd 100644
--- a/src/game-headerbar.vala
+++ b/src/game-headerbar.vala
@@ -23,8 +23,8 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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/new-game-screen.vala b/src/new-game-screen.vala
index 3e56b2f..e6919e5 100644
--- a/src/new-game-screen.vala
+++ b/src/new-game-screen.vala
@@ -23,11 +23,11 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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 8831e3e..92813d5 100644
--- a/src/notifications-revealer.vala
+++ b/src/notifications-revealer.vala
@@ -20,7 +20,7 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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 eb2404a..f7ed170 100644
--- a/src/overlayed-list.vala
+++ b/src/overlayed-list.vala
@@ -20,12 +20,12 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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 b92c464..c662aff 100644
--- a/src/registry-placeholder.vala
+++ b/src/registry-placeholder.vala
@@ -20,8 +20,8 @@ using Gtk;
[GtkTemplate (ui = "/org/gnome/Taquin/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

6
games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
View File

@ -34,6 +34,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