aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2021-04-08 13:12:06 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-04-09 13:50:51 +0200
commit15e70cecbd4342c404d0ace852fc2cb6b2c98167 (patch)
tree97eca997905846958c4a9b50c2a14393b2cb9b58
parent3a5cca3aeaf9985104e2bd39a90b7d2bcbd75a02 (diff)
downloadaports-15e70cecbd4342c404d0ace852fc2cb6b2c98167.tar.gz
aports-15e70cecbd4342c404d0ace852fc2cb6b2c98167.tar.bz2
aports-15e70cecbd4342c404d0ace852fc2cb6b2c98167.tar.xz
community/gnome-taquin: rebuild w/ vala 0.52.1
While not strictly necessary, the new vala version introduces many fixes in the codegen and also fixes things like memory leaks
-rw-r--r--community/gnome-taquin/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch134
-rw-r--r--community/gnome-taquin/APKBUILD8
2 files changed, 139 insertions, 3 deletions
diff --git a/community/gnome-taquin/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch b/community/gnome-taquin/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch
new file mode 100644
index 0000000000..e14267675e
--- /dev/null
+++ b/community/gnome-taquin/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch
@@ -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
+
diff --git a/community/gnome-taquin/APKBUILD b/community/gnome-taquin/APKBUILD
index 84d282c8f3..2421f284df 100644
--- a/community/gnome-taquin/APKBUILD
+++ b/community/gnome-taquin/APKBUILD
@@ -2,14 +2,15 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gnome-taquin
pkgver=3.38.1
-pkgrel=0
+pkgrel=1
arch="all !s390x !mips !mips64" # Blocked by librsvg -> rust
url="https://wiki.gnome.org/Apps/Taquin"
pkgdesc="Move tiles so that they reach their places"
license="GPL-3.0-or-later AND CC-BY-SA-3.0"
makedepends="meson ninja itstool vala gtk+3.0-dev librsvg-dev gsound-dev"
checkdepends="appstream-glib desktop-file-utils"
-source="https://download.gnome.org/sources/gnome-taquin/${pkgver%.*}/gnome-taquin-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gnome-taquin/${pkgver%.*}/gnome-taquin-$pkgver.tar.xz
+ 99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"
subpackages="$pkgname-doc $pkgname-lang"
build() {
@@ -25,4 +26,5 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C output
}
-sha512sums="c92244049bb24ab1585375ca6337965891bcaf46e642e009e3f670a818554d842c1f55c78735229198dfd6d96e95ee56e106a7eb238052e1382118287d9e28d6 gnome-taquin-3.38.1.tar.xz"
+sha512sums="c92244049bb24ab1585375ca6337965891bcaf46e642e009e3f670a818554d842c1f55c78735229198dfd6d96e95ee56e106a7eb238052e1382118287d9e28d6 gnome-taquin-3.38.1.tar.xz
+11bd1424ad4f1102136c8a966befd66b0cb62d0b2f87e727c12910d0cc26ba391c049383e5b535fed27cdf09cafc89ce1a05b6f41e7f61d3969c3e2aaf17a3b2 99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"