[arch-commits] Commit in lutris/trunk (2 files)

[Filipe Laíns]

    Date: Tuesday, November 19, 2019 @ 10:01:11
  Author: ffy00
Revision: 530413

upgpkg: lutris 0.5.3.r5660.a31a0a4-1

The lutris upstream asked to update to update to a31a0a4116d883c3d68fd355f281214de79a9afa
and revert 47ecc419498abf127ee657fbc83bc313c883cb44 in order to fix python 3.8 compatibility.
They will give support to people using this version of the package.

Added:
  lutris/trunk/revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch
Modified:
  lutris/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   23 ++++----
 revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch |   42 ++++++++++++++++
 2 files changed, 54 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-19 08:31:05 UTC (rev 530412)
+++ PKGBUILD	2019-11-19 10:01:11 UTC (rev 530413)
@@ -3,8 +3,9 @@
 # Contributor: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=lutris
-pkgver=0.5.3
-pkgrel=3
+_commit=a31a0a4116d883c3d68fd355f281214de79a9afa
+pkgver=0.5.3.r5660.a31a0a4
+pkgrel=1
 pkgdesc='Open Gaming Platform'
 arch=('any')
 url='https://lutris.net'
@@ -17,31 +18,31 @@
             'vulkan-icd-loader: Vulkan support'
             'lib32-vulkan-icd-loader: Vulkan support')
 makedepends=('python-setuptools')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/v$pkgver.tar.gz"
-        'fix-python3.8.patch::https://github.com/lutris/lutris/commit/2f7c3b1aefc96608d814e2ad37b6c49c687fae1b.patch')
-sha512sums=('c48be1cf1efada290847d86876dae40346142b041119e6c6733e41e27c0277771647992e5475bfa3a71b639a0d9ff2e2ca3527612cc1a723aa0bac46960606c9'
-            '279fa1d9868642f5a3679db3ad0252b197a7907fae61d68bd7ce2bf42636f11e0ba0bfa1f94df068efd7b45571c2a38751b66c7cb28acdff9e162a33f3337978')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/$_commit.tar.gz"
+        'revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch')
+sha512sums=('d989b8f3e1631c6b82908b50f1083f5a6597893dee4a25b1509c6ba923fd4b589d74113972bdcba7bc2340cad596812401d1fe04d7999b458a5e5cb3b83ffcae'
+            'fb7210948a6409babe38572e3d82a6afcf7b424ecf8c404c922ff3ef3d2a458d4be730e9ee2779005f3b93fa298654749840e808087cf0524c29217985fafc58')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$_commit
 
-  patch -p1 < ../fix-python3.8.patch
+  patch -p1 < ../revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$_commit
 
   python setup.py build
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$_commit
 
   xvfb-run nosetests --cover-erase --with-xunit --xunit-file=nosetests.xml --with-coverage --cover-package=lutris --cover-xml-file=coverage.xml
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$_commit
 
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }

Added: revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch
===================================================================
--- revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch	                        (rev 0)
+++ revert-47ecc419498abf127ee657fbc83bc313c883cb44.patch	2019-11-19 10:01:11 UTC (rev 530413)
@@ -0,0 +1,42 @@
+commit ae320ae1b6735e475ea49ce08dadaf332fedcfb6
+Author: Filipe Laíns <lains at archlinux.org>
+Date:   Tue Nov 19 09:45:23 2019 +0000
+
+    Revert "Do not change selection when a game is updated (Closes #2144)"
+    
+    This reverts commit 47ecc419498abf127ee657fbc83bc313c883cb44.
+    
+    Signed-off-by: Filipe Laíns <lains at archlinux.org>
+
+diff --git a/lutris/gui/lutriswindow.py b/lutris/gui/lutriswindow.py
+index 9dfe092b..fbb3865d 100644
+--- a/lutris/gui/lutriswindow.py
++++ b/lutris/gui/lutriswindow.py
+@@ -727,6 +727,10 @@ class LutrisWindow(Gtk.ApplicationWindow):
+             self.game_store.update_game_by_id(game.id)
+         except ValueError:
+             self.game_store.add_game_by_id(game.id)
++
++        self.view.set_selected_game(game.id)
++        if game.is_installed:
++            self.game_selection_changed(None, game)
+         return True
+ 
+     def on_search_games_fire(self, value):
+diff --git a/lutris/gui/views/grid.py b/lutris/gui/views/grid.py
+index 7ea802cb..3cec9c19 100644
+--- a/lutris/gui/views/grid.py
++++ b/lutris/gui/views/grid.py
+@@ -1,4 +1,3 @@
+-"""Grid view for the main window"""
+ # pylint: disable=no-member
+ from gi.repository import Gtk
+ from lutris.gui.views.base import GameView
+@@ -45,7 +44,6 @@ class GameGridView(Gtk.IconView, GameView):
+         return self.get_model().get_iter(self.current_path)
+ 
+     def set_selected_game(self, game_id):
+-        """Select a game referenced by its ID in the view"""
+         row = self.game_store.get_row_by_id(game_id, filtered=True)
+         if row:
+             self.select_path(row.path)