Date: Monday, March 30, 2020 @ 02:03:35 Author: ffy00 Revision: 606701
archrelease: copy trunk to community-any Added: lutris/repos/community-any/PKGBUILD (from rev 606700, lutris/trunk/PKGBUILD) lutris/repos/community-any/sort_new_with_model_fix.patch (from rev 606700, lutris/trunk/sort_new_with_model_fix.patch) Deleted: lutris/repos/community-any/PKGBUILD lutris/repos/community-any/sort_new_with_model_fix.patch -------------------------------+ PKGBUILD | 88 ++++++++++++++++++---------------------- sort_new_with_model_fix.patch | 52 +++++++++++------------ 2 files changed, 66 insertions(+), 74 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-30 02:03:15 UTC (rev 606700) +++ PKGBUILD 2020-03-30 02:03:35 UTC (rev 606701) @@ -1,48 +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.4 -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' 'gvfs' 'mesa-demos') -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') -makedepends=('python-setuptools') -source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/v$pkgver.tar.gz" - 'sort_new_with_model_fix.patch') -sha512sums=('758c2a854912e29ac579c2030ec118e406db97aa0ecb9be394b2910e48e19c87a774972299b0c83e73fb57e8db3c98a2c52d1545e8071e378d3aff263d325cc4' - '4c80024c47ae7165a57d94b4421bf8d61b926b5957b231570b0b2b3489d88ac08b1b16ba337ce9bc50174aa057987764363a42465af643286e5dd9cdce16e5d9') - -prepare() { - cd $pkgname-$pkgver - - patch -p1 -i ../sort_new_with_model_fix.patch -} - -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-any/PKGBUILD (from rev 606700, lutris/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-30 02:03:35 UTC (rev 606701) @@ -0,0 +1,40 @@ +# 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.5 +pkgrel=1 +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' 'gvfs' 'mesa-demos' 'python-dbus') +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') +makedepends=('python-setuptools') +source=("$pkgname-$pkgver.tar.gz::https://github.com/lutris/lutris/archive/v$pkgver.tar.gz") +sha512sums=('d63b9c79f55238d01b6a8c8fe62a0c70d7334c023a51e92d1c99a91cfc9336d3d071d13394c49d0a26bc04549ab7b7122aa8f133da00ed5aa8ae3a7bcc63848f') + +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-03-30 02:03:15 UTC (rev 606700) +++ sort_new_with_model_fix.patch 2020-03-30 02:03:35 UTC (rev 606701) @@ -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-any/sort_new_with_model_fix.patch (from rev 606700, lutris/trunk/sort_new_with_model_fix.patch) =================================================================== --- sort_new_with_model_fix.patch (rev 0) +++ sort_new_with_model_fix.patch 2020-03-30 02:03:35 UTC (rev 606701) @@ -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)