* [gentoo-commits] repo/gentoo:master commit in: games-board/iagno/, games-board/iagno/files/
@ 2020-08-22 14:16 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2020-08-22 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 41d0a0bf1583efaebac5bdc200974189a9bda77e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 14:16:08 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 14:16:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d0a0bf
games-board/iagno: fix build with newer meson
Closes: https://bugs.gentoo.org/738576
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
games-board/iagno/files/3.36.4-vala-posix.patch | 28 +++++++++++++++++++++++++
games-board/iagno/iagno-3.36.4.ebuild | 4 ++++
2 files changed, 32 insertions(+)
diff --git a/games-board/iagno/files/3.36.4-vala-posix.patch b/games-board/iagno/files/3.36.4-vala-posix.patch
new file mode 100644
index 00000000000..b53d0dc75f6
--- /dev/null
+++ b/games-board/iagno/files/3.36.4-vala-posix.patch
@@ -0,0 +1,28 @@
+From 0100bab269f2102f24a6e41202b931da1b6e8dc5 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Mon, 3 Aug 2020 13:47:43 -0500
+Subject: [PATCH] Fix build of perfs-tests-generator.vala
+
+Not sure exactly what changed, but Rico says: "likely a dependency isn't
+pulling posix.vapi in anymore."
+---
+ src/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index f3d3a20..9925272 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -15,7 +15,8 @@ run_target('update-perfs-tests', command: executable ('iagno-perfs-tests-generat
+ '--enable-experimental-non-null'
+ ],
+ dependencies : [
+- gio_dependency
++ gio_dependency,
++ posix_dependency
+ ]
+ )
+ )
+--
+2.20.1
+
diff --git a/games-board/iagno/iagno-3.36.4.ebuild b/games-board/iagno/iagno-3.36.4.ebuild
index d082dd5d6ca..73465afff70 100644
--- a/games-board/iagno/iagno-3.36.4.ebuild
+++ b/games-board/iagno/iagno-3.36.4.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
gnome-base/librsvg:2[vala]
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-vala-posix.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/iagno/, games-board/iagno/files/
@ 2021-05-15 17:24 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-05-15 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 5d3c0353660f89114a0d8c49a728569cd953d85a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 17:24:06 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 15 17:24:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3c0353
games-board/iagno: Fix for vala 0.50.4 regression
* https://gitlab.gnome.org/GNOME/vala/issues/1121
Closes: https://github.com/gentoo/gentoo/pull/20823
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../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 +
3 files changed, 385 insertions(+)
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 00000000000..8ed465166d4
--- /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 <ricotz@ubuntu.com>
+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<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
+
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 00000000000..530c43ddb42
--- /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 <ricotz@ubuntu.com>
+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 c501ffdf59d..7eb33d6dd65 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-15 17:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-15 17:24 [gentoo-commits] repo/gentoo:master commit in: games-board/iagno/, games-board/iagno/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-08-22 14:16 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox