diff options
author | Rasmus Thomsen <oss@cogitri.dev> | 2020-09-12 18:43:42 +0200 |
---|---|---|
committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-09-14 09:38:20 +0000 |
commit | 4b8bb2d804492f1cb3c111a3f1f717fe8e26447b (patch) | |
tree | c0448765f05aa7fec1e45089721c878e42c94b9c | |
parent | 5c507135a946af03d955029e87f23f839d6fd8e6 (diff) | |
download | aports-4b8bb2d804492f1cb3c111a3f1f717fe8e26447b.tar.gz aports-4b8bb2d804492f1cb3c111a3f1f717fe8e26447b.tar.bz2 aports-4b8bb2d804492f1cb3c111a3f1f717fe8e26447b.tar.xz |
community/gnome-games: upgrade to 3.38.0
-rw-r--r-- | community/gnome-games/4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch | 146 | ||||
-rw-r--r-- | community/gnome-games/APKBUILD | 10 |
2 files changed, 4 insertions, 152 deletions
diff --git a/community/gnome-games/4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch b/community/gnome-games/4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch deleted file mode 100644 index 9a77e52444..0000000000 --- a/community/gnome-games/4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 4c6f7a97d6f0ef63885e9c90f348a48a4be838be Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Sat, 29 Aug 2020 22:32:30 +0200 -Subject: [PATCH] Don't declare CollectionType as nested type to allow build - with older valac - ---- - src/collection/collection.vala | 14 +++++++------- - src/ui/collection-action-window.vala | 6 +++--- - src/ui/collection-thumbnail.vala | 2 +- - src/ui/collections-main-page.vala | 12 ++++++------ - src/ui/collections-page.vala | 4 ++-- - 5 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/src/collection/collection.vala b/src/collection/collection.vala -index ba9ffa64..661da503 100644 ---- a/src/collection/collection.vala -+++ b/src/collection/collection.vala -@@ -1,13 +1,13 @@ - // This file is part of GNOME Games. License: GPL-3.0+. - --private interface Games.Collection : Object { -- // Collection types are in decreasing order of precedence while comparing between them. -- public enum CollectionType { -- AUTO, -- USER, -- PLACEHOLDER -- } -+// Collection types are in decreasing order of precedence while comparing between them. -+private enum Games.CollectionType { -+ AUTO, -+ USER, -+ PLACEHOLDER -+} - -+private interface Games.Collection : Object { - public signal void games_changed (); - - public abstract bool is_empty { get; } -diff --git a/src/ui/collection-action-window.vala b/src/ui/collection-action-window.vala -index 75d37112..00b31b28 100644 ---- a/src/ui/collection-action-window.vala -+++ b/src/ui/collection-action-window.vala -@@ -106,7 +106,7 @@ private class Games.CollectionActionWindow : Hdy.Window { - - private Gtk.Widget add_collection_row (Object object) { - var collection = object as Collection; -- if (collection.get_collection_type () == Collection.CollectionType.PLACEHOLDER) -+ if (collection.get_collection_type () == CollectionType.PLACEHOLDER) - return add_row; - - var row = new CollectionListItem (collection); -@@ -124,7 +124,7 @@ private class Games.CollectionActionWindow : Hdy.Window { - var collection = list_item.collection; - var type = collection.get_collection_type (); - -- show_row = (type == Collection.CollectionType.USER) && -+ show_row = (type == CollectionType.USER) && - ((is_search_mode && collection.matches_search_terms (filtering_terms)) || - (!is_search_mode)); - } -@@ -140,7 +140,7 @@ private class Games.CollectionActionWindow : Hdy.Window { - - foreach (var child in list_box.get_children ()) { - var row = child as CollectionListItem; -- if (row == null || row.collection.get_collection_type () != Collection.CollectionType.USER) -+ if (row == null || row.collection.get_collection_type () != CollectionType.USER) - continue; - - var check_button = row.activatable_widget as Gtk.CheckButton; -diff --git a/src/ui/collection-thumbnail.vala b/src/ui/collection-thumbnail.vala -index 887e4f56..41ca8149 100644 ---- a/src/ui/collection-thumbnail.vala -+++ b/src/ui/collection-thumbnail.vala -@@ -24,7 +24,7 @@ private class Games.CollectionThumbnail : Gtk.Bin { - - _collection = value; - -- if (collection.get_collection_type () == Collection.CollectionType.PLACEHOLDER) { -+ if (collection.get_collection_type () == CollectionType.PLACEHOLDER) { - thumbnail_stack.visible_child = new_collection_image; - return; - } -diff --git a/src/ui/collections-main-page.vala b/src/ui/collections-main-page.vala -index 0bffe68d..2b36f433 100644 ---- a/src/ui/collections-main-page.vala -+++ b/src/ui/collections-main-page.vala -@@ -178,8 +178,8 @@ private class Games.CollectionsMainPage : Gtk.Bin { - var collection = collection_model.get_item (i) as Collection; - var type = collection.get_collection_type (); - -- if (type == Collection.CollectionType.PLACEHOLDER || -- (type == Collection.CollectionType.AUTO && collection.is_empty)) -+ if (type == CollectionType.PLACEHOLDER || -+ (type == CollectionType.AUTO && collection.is_empty)) - continue; - - if (collection.matches_search_terms (filtering_terms)) { -@@ -205,18 +205,18 @@ private class Games.CollectionsMainPage : Gtk.Bin { - - if (is_search_mode && filtering_terms.length != 0) { - switch (type) { -- case Collection.CollectionType.AUTO: -+ case CollectionType.AUTO: - return !collection.is_empty && filter_collection (collection); - -- case Collection.CollectionType.USER: -+ case CollectionType.USER: - return filter_collection (collection); - -- case Collection.CollectionType.PLACEHOLDER: -+ case CollectionType.PLACEHOLDER: - return false; - } - } - -- return !collection_icon_view.collection.is_empty || type != Collection.CollectionType.AUTO; -+ return !collection_icon_view.collection.is_empty || type != CollectionType.AUTO; - } - - [GtkCallback] -diff --git a/src/ui/collections-page.vala b/src/ui/collections-page.vala -index 7b3f86fe..b11a1b5c 100644 ---- a/src/ui/collections-page.vala -+++ b/src/ui/collections-page.vala -@@ -47,7 +47,7 @@ private class Games.CollectionsPage : Gtk.Bin { - - is_showing_user_collection = current_collection != null && - current_collection.get_collection_type () == -- Collection.CollectionType.USER; -+ CollectionType.USER; - } - } - -@@ -212,7 +212,7 @@ private class Games.CollectionsPage : Gtk.Bin { - [GtkCallback] - private void on_collection_activated (Collection collection) { - if (collection.get_collection_type () == -- Collection.CollectionType.PLACEHOLDER) { -+ CollectionType.PLACEHOLDER) { - // Finalize any pending removal of collection and dismiss undo notification if shown. - finalize_collection_removal (); - --- -GitLab - diff --git a/community/gnome-games/APKBUILD b/community/gnome-games/APKBUILD index fe18883ae9..2395545ab7 100644 --- a/community/gnome-games/APKBUILD +++ b/community/gnome-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gnome-games -pkgver=3.37.90 +pkgver=3.38.0 pkgrel=0 pkgdesc="Browse and play your games" url="https://wiki.gnome.org/Apps/Games" @@ -12,8 +12,7 @@ makedepends="meson gtk+3.0-dev vala grilo-dev libhandy1-dev librsvg-dev libmanet checkdepends="desktop-file-utils appstream-glib" subpackages="$pkgname-lang" source="https://download.gnome.org/sources/gnome-games/${pkgver%.*}/gnome-games-$pkgver.tar.xz - tracker3.patch - 4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch" + tracker3.patch" build() { abuild-meson . output @@ -28,6 +27,5 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } -sha512sums="acb87ee6e2eea56fb7bee8714a6a6e88ea58c1e1966db3a2d0882a6a00c0f37312ccdc8ef13bfe2a09cead3f0bcb44bad08d34c1cfdb38c8940003ba2bf7629d gnome-games-3.37.90.tar.xz -34c2de9d2c7e49a5e6430e86f6d11eb5c3e701e784f096fa970d32ea941d33c272fd1f1d71ae5d2a914e0278848e9dae7d07c2ab72ca60aa7b3a16716ee876d6 tracker3.patch -538ff21aac6a15b6d3924dce8d5bb021ef0f1caa37a1eb98eec8639a4da31df86da7771898eeb0b8bbf455696bf2cd6f950279754104f2e3c8cf08b20e0238f0 4c6f7a97d6f0ef63885e9c90f348a48a4be838be.patch" +sha512sums="30f556f06e22e5ce94be632972cd0268a89c87026c1f2e66937ce397d65c9a1444abf1443f24340888df50fbe86750572417a48a006d509347a6550a5d17f1a4 gnome-games-3.38.0.tar.xz +34c2de9d2c7e49a5e6430e86f6d11eb5c3e701e784f096fa970d32ea941d33c272fd1f1d71ae5d2a914e0278848e9dae7d07c2ab72ca60aa7b3a16716ee876d6 tracker3.patch" |