Date: Thursday, November 19, 2020 @ 23:13:25 Author: ffy00 Revision: 757848
archrelease: copy trunk to community-staging-any Added: lutris/repos/community-staging-any/PKGBUILD (from rev 757847, lutris/trunk/PKGBUILD) lutris/repos/community-staging-any/sort_new_with_model_fix.patch (from rev 757847, lutris/trunk/sort_new_with_model_fix.patch) Deleted: lutris/repos/community-staging-any/PKGBUILD lutris/repos/community-staging-any/sort_new_with_model_fix.patch -------------------------------+ PKGBUILD | 84 ++++++++++++++++++++-------------------- sort_new_with_model_fix.patch | 52 ++++++++++++------------ 2 files changed, 68 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-19 23:13:21 UTC (rev 757847) +++ PKGBUILD 2020-11-19 23:13:25 UTC (rev 757848) @@ -1,42 +0,0 @@ -# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> -# Contributor: Frederik “Freso” S. Olesen <freso...@gmail.com> -# Contributor: Maxime Gauduin <aluc...@archlinux.org> - -pkgname=lutris -pkgver=0.5.7.1 -pkgrel=2 -pkgdesc='Open Gaming Platform' -arch=('any') -url='https://lutris.net' -license=('GPL3') -depends=('python-gobject' 'python-yaml' 'python-evdev' 'gtk3' 'glib2' 'psmisc' 'cabextract' 'unzip' 'p7zip' 'curl' 'xorg-xrandr' - 'python-pillow' 'python-requests' 'gnome-desktop' 'webkit2gtk' 'mesa-demos' 'python-dbus' 'python-distro') -makedepends=('python-setuptools') -checkdepends=('xorg-server-xvfb' 'python-nose-cover3' 'wine' 'xterm') -optdepends=('wine: Windows support' - 'vulkan-icd-loader: Vulkan support' - 'lib32-vulkan-icd-loader: Vulkan support' - 'vkd3d: Vulkan 3D support' - 'lib32-vkd3d: Vulkan 3D support' - 'gvfs: GVFS backend') -makedepends=('python-setuptools') -source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/v$pkgver.tar.gz") -sha512sums=('44ceeb22b3529eb423201d002e5816f9226135a2c457a9517c4855d7d0462dd512d37c6cc0ed507151fb834f179a1536b9ef08fa8645dfc2a89a314e57eeade6') - -build() { - cd $pkgname-$pkgver - - python setup.py build -} - -check() { - cd $pkgname-$pkgver - - 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 - - python setup.py install --root="$pkgdir" --optimize=1 --skip-build -} Copied: lutris/repos/community-staging-any/PKGBUILD (from rev 757847, lutris/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-19 23:13:25 UTC (rev 757848) @@ -0,0 +1,42 @@ +# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> +# Contributor: Frederik “Freso” S. Olesen <freso...@gmail.com> +# Contributor: Maxime Gauduin <aluc...@archlinux.org> + +pkgname=lutris +pkgver=0.5.8 +pkgrel=2 +pkgdesc='Open Gaming Platform' +arch=('any') +url='https://lutris.net' +license=('GPL3') +depends=('python-gobject' 'python-yaml' 'python-evdev' 'gtk3' 'glib2' 'psmisc' 'cabextract' 'unzip' 'p7zip' 'curl' 'xorg-xrandr' + 'python-pillow' 'python-requests' 'gnome-desktop' 'webkit2gtk' 'mesa-demos' 'python-dbus' 'python-distro') +makedepends=('python-setuptools') +checkdepends=('xorg-server-xvfb' 'python-nose-cover3' 'wine' 'xterm') +optdepends=('wine: Windows support' + 'vulkan-icd-loader: Vulkan support' + 'lib32-vulkan-icd-loader: Vulkan support' + 'vkd3d: Vulkan 3D support' + 'lib32-vkd3d: Vulkan 3D support' + 'gvfs: GVFS backend') +makedepends=('python-setuptools') +source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/$pkgver.tar.gz") +sha512sums=('dceb7708c98feb713d2e57cbf05cd37300cb32948d54275c3df4dbfc3260261b1baae0a13f6acf0bf3bd314b1ea437cd810a055d9ba6a767d27124cac65221e9') + +build() { + cd $pkgname-$pkgver + + python setup.py build +} + +check() { + cd $pkgname-$pkgver + + 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 + + python setup.py install --root="$pkgdir" --optimize=1 --skip-build +} Deleted: sort_new_with_model_fix.patch =================================================================== --- sort_new_with_model_fix.patch 2020-11-19 23:13:21 UTC (rev 757847) +++ sort_new_with_model_fix.patch 2020-11-19 23:13:25 UTC (rev 757848) @@ -1,26 +0,0 @@ -From 12a458db3c590c3f1972594e091a24cb4d65b610 Mon Sep 17 00:00:00 2001 -From: Mathieu Comandon <stryc...@gmail.com> -Date: Wed, 1 Jan 2020 12:47:55 -0800 -Subject: [PATCH] Support both sort_new_with_model and new_with_model - ---- - lutris/gui/views/store.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py -index 9e843e9e4..8fe5decf5 100644 ---- a/lutris/gui/views/store.py -+++ b/lutris/gui/views/store.py -@@ -140,7 +140,11 @@ def __init__( - self.prevent_sort_update = False # prevent recursion with signals - self.modelfilter = self.store.filter_new() - self.modelfilter.set_visible_func(self.filter_view) -- self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter) -+ try: -+ self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter) -+ except AttributeError: -+ # Apparently some API breaking changes on GTK minor versions. -+ self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter) - self.modelsort.connect("sort-column-changed", self.on_sort_column_changed) - self.modelsort.set_sort_func(sort_col, sort_func, sort_col) - self.sort_view(sort_key, sort_ascending) Copied: lutris/repos/community-staging-any/sort_new_with_model_fix.patch (from rev 757847, lutris/trunk/sort_new_with_model_fix.patch) =================================================================== --- sort_new_with_model_fix.patch (rev 0) +++ sort_new_with_model_fix.patch 2020-11-19 23:13:25 UTC (rev 757848) @@ -0,0 +1,26 @@ +From 12a458db3c590c3f1972594e091a24cb4d65b610 Mon Sep 17 00:00:00 2001 +From: Mathieu Comandon <stryc...@gmail.com> +Date: Wed, 1 Jan 2020 12:47:55 -0800 +Subject: [PATCH] Support both sort_new_with_model and new_with_model + +--- + lutris/gui/views/store.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py +index 9e843e9e4..8fe5decf5 100644 +--- a/lutris/gui/views/store.py ++++ b/lutris/gui/views/store.py +@@ -140,7 +140,11 @@ def __init__( + self.prevent_sort_update = False # prevent recursion with signals + self.modelfilter = self.store.filter_new() + self.modelfilter.set_visible_func(self.filter_view) +- self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter) ++ try: ++ self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter) ++ except AttributeError: ++ # Apparently some API breaking changes on GTK minor versions. ++ self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter) + self.modelsort.connect("sort-column-changed", self.on_sort_column_changed) + self.modelsort.set_sort_func(sort_col, sort_func, sort_col) + self.sort_view(sort_key, sort_ascending)