[arch-commits] Commit in fs-uae-launcher/trunk (3 files)

[Daniel Bermond]

    Date: Saturday, November 20, 2021 @ 12:55:25
  Author: dbermond
Revision: 1052866

upgpkg: fs-uae-launcher 3.1.46-1

Modified:
  fs-uae-launcher/trunk/010-fs-uae-launcher-fix-install-path.patch
  fs-uae-launcher/trunk/020-fs-uae-launcher-remove-python2.patch
  fs-uae-launcher/trunk/PKGBUILD

--------------------------------------------+
 010-fs-uae-launcher-fix-install-path.patch |    7 +++----
 020-fs-uae-launcher-remove-python2.patch   |   25 ++++++++++---------------
 PKGBUILD                                   |   18 ++++++++++--------
 3 files changed, 23 insertions(+), 27 deletions(-)

Modified: 010-fs-uae-launcher-fix-install-path.patch
===================================================================
--- 010-fs-uae-launcher-fix-install-path.patch	2021-11-20 12:55:08 UTC (rev 1052865)
+++ 010-fs-uae-launcher-fix-install-path.patch	2021-11-20 12:55:25 UTC (rev 1052866)
@@ -1,7 +1,6 @@
-diff -Nawurp a/fs-uae-launcher b/fs-uae-launcher
---- a/fs-uae-launcher	2019-06-21 16:49:42.000000000 +0000
-+++ b/fs-uae-launcher	2019-06-29 13:38:13.351496262 +0000
-@@ -8,6 +8,8 @@ if sys.version_info[0] < 3 or sys.versio
+--- a/fs-uae-launcher
++++ b/fs-uae-launcher
+@@ -13,6 +13,8 @@ if sys.version_info[0] < 3 or sys.versio
  
  if os.environ.get("FSGS_PYTHONPATH", ""):
      sys.path.insert(0, os.environ.get("FSGS_PYTHONPATH"))

Modified: 020-fs-uae-launcher-remove-python2.patch
===================================================================
--- 020-fs-uae-launcher-remove-python2.patch	2021-11-20 12:55:08 UTC (rev 1052865)
+++ 020-fs-uae-launcher-remove-python2.patch	2021-11-20 12:55:25 UTC (rev 1052866)
@@ -1,6 +1,5 @@
-diff -Nawurp a/amitools/tools/geotool.py b/amitools/tools/geotool.py
---- a/amitools/tools/geotool.py	2019-06-21 16:49:43.000000000 +0000
-+++ b/amitools/tools/geotool.py	2019-06-29 14:09:16.111152186 +0000
+--- a/amitools/tools/geotool.py
++++ b/amitools/tools/geotool.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.7
 +#!/usr/bin/env python
@@ -7,9 +6,8 @@
  
  from __future__ import absolute_import
  from __future__ import print_function
-diff -Nawurp a/amitools/tools/rdbtool.py b/amitools/tools/rdbtool.py
---- a/amitools/tools/rdbtool.py	2019-06-21 16:49:43.000000000 +0000
-+++ b/amitools/tools/rdbtool.py	2019-06-29 14:09:24.111043044 +0000
+--- a/amitools/tools/rdbtool.py
++++ b/amitools/tools/rdbtool.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.7
 +#!/usr/bin/env python
@@ -16,9 +14,8 @@
  # rdbtool
  # swiss army knife for rdb disk images or devices
  
-diff -Nawurp a/amitools/tools/xdfscan.py b/amitools/tools/xdfscan.py
---- a/amitools/tools/xdfscan.py	2019-06-21 16:49:43.000000000 +0000
-+++ b/amitools/tools/xdfscan.py	2019-06-29 14:09:28.464317106 +0000
+--- a/amitools/tools/xdfscan.py
++++ b/amitools/tools/xdfscan.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.7
 +#!/usr/bin/env python
@@ -25,9 +22,8 @@
  # xdfscan
  # quickly scan large sets of Amiga disk image files
  
-diff -Nawurp a/amitools/tools/xdftool.py b/amitools/tools/xdftool.py
---- a/amitools/tools/xdftool.py	2019-06-21 16:49:43.000000000 +0000
-+++ b/amitools/tools/xdftool.py	2019-06-29 14:09:32.760925361 +0000
+--- a/amitools/tools/xdftool.py
++++ b/amitools/tools/xdftool.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.7
 +#!/usr/bin/env python
@@ -34,9 +30,8 @@
  # xdftool
  # swiss army knife for adf and hdf amiga disk images
  
-diff -Nawurp a/amitools/util/BlkDevTools.py b/amitools/util/BlkDevTools.py
---- a/amitools/util/BlkDevTools.py	2019-06-21 16:49:43.000000000 +0000
-+++ b/amitools/util/BlkDevTools.py	2019-06-29 14:09:39.364169091 +0000
+--- a/amitools/util/BlkDevTools.py
++++ b/amitools/util/BlkDevTools.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.7
 +#!/usr/bin/env python

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-20 12:55:08 UTC (rev 1052865)
+++ PKGBUILD	2021-11-20 12:55:25 UTC (rev 1052866)
@@ -3,22 +3,23 @@
 # Contributor: Guilherme Calé <gui at cabritacale.eu>
 
 pkgname=fs-uae-launcher
-pkgver=3.0.5
-pkgrel=2
+pkgver=3.1.46
+pkgrel=1
 pkgdesc='Graphical user interface for the fs-uae Amiga emulator'
 arch=('any')
 url='https://fs-uae.net/launcher/'
 license=('GPL2')
-depends=("fs-uae>=${pkgver%.*}" 'python' 'python-opengl' 'python-pyqt5' 'python-requests'
-         'python-setuptools' 'python-six' 'hicolor-icon-theme')
+depends=("fs-uae>=${pkgver%.*}" 'python' 'python-opengl' 'python-pillow'
+         'python-pyqt5' 'python-requests' 'python-rx' 'python-setuptools'
+         'python-typing_extensions' 'hicolor-icon-theme')
 optdepends=('p7zip: for .7z file support'
             'python-lhafile: for .lha file support')
-source=("https://fs-uae.net/stable/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+source=("https://fs-uae.net/files/FS-UAE-Launcher/Stable/${pkgver}/${pkgname}-${pkgver}.tar.xz"
         '010-fs-uae-launcher-fix-install-path.patch'
         '020-fs-uae-launcher-remove-python2.patch')
-sha256sums=('27797a04b9fc0be2805ae992c2950ff6228383fa153eccefbdebfc6789ca76b6'
-            '15463d3d3ed5bdc4fb614cea91b93e7678eccce0696c66ac28c194dd7558e3fa'
-            'dcb9be9e6881ec8102d230d54ac1dbd8fa3774d2282f5ea62ea67a3aea33045c')
+sha256sums=('9e0f922f8ae1fbd4220e78c24cabd98b6ee5fbd5f91cf74acd652acc3b45715e'
+            '4ec36185146f46286a6168162837605e1e2cbb6f4e405996d7f6373bf29fac6f'
+            'f0616c0d181733120c68fea2f158eb27e90c3f07c23cd93b042a5ae240cfdd5e')
 
 prepare() {
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-fs-uae-launcher-fix-install-path.patch"
@@ -31,4 +32,5 @@
 
 package() {
     make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" prefix='/usr' install
+    rm "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
 }