Date: Sunday, November 10, 2019 @ 15:50:02 Author: dbermond Revision: 526470
archrelease: copy trunk to community-any Added: fs-uae-launcher/repos/community-any/010-fs-uae-launcher-fix-install-path.patch (from rev 526469, fs-uae-launcher/trunk/010-fs-uae-launcher-fix-install-path.patch) fs-uae-launcher/repos/community-any/020-fs-uae-launcher-remove-python2.patch (from rev 526469, fs-uae-launcher/trunk/020-fs-uae-launcher-remove-python2.patch) fs-uae-launcher/repos/community-any/PKGBUILD (from rev 526469, fs-uae-launcher/trunk/PKGBUILD) Deleted: fs-uae-launcher/repos/community-any/010-fs-uae-launcher-fix-install-path.patch fs-uae-launcher/repos/community-any/020-fs-uae-launcher-remove-python2.patch fs-uae-launcher/repos/community-any/PKGBUILD --------------------------------------------+ 010-fs-uae-launcher-fix-install-path.patch | 24 +++---- 020-fs-uae-launcher-remove-python2.patch | 90 +++++++++++++-------------- PKGBUILD | 74 ++++++++++------------ 3 files changed, 91 insertions(+), 97 deletions(-) Deleted: 010-fs-uae-launcher-fix-install-path.patch =================================================================== --- 010-fs-uae-launcher-fix-install-path.patch 2019-11-10 15:49:28 UTC (rev 526469) +++ 010-fs-uae-launcher-fix-install-path.patch 2019-11-10 15:50:02 UTC (rev 526470) @@ -1,12 +0,0 @@ -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 - - if os.environ.get("FSGS_PYTHONPATH", ""): - sys.path.insert(0, os.environ.get("FSGS_PYTHONPATH")) -+else: -+ sys.path.insert(0, "/usr/share/fs-uae-launcher") - - if os.getcwd().startswith("C:\\msys64\\home\\"): - os.environ["PATH"] = "C:\\msys64\\mingw64\\bin;" + os.environ["PATH"] Copied: fs-uae-launcher/repos/community-any/010-fs-uae-launcher-fix-install-path.patch (from rev 526469, fs-uae-launcher/trunk/010-fs-uae-launcher-fix-install-path.patch) =================================================================== --- 010-fs-uae-launcher-fix-install-path.patch (rev 0) +++ 010-fs-uae-launcher-fix-install-path.patch 2019-11-10 15:50:02 UTC (rev 526470) @@ -0,0 +1,12 @@ +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 + + if os.environ.get("FSGS_PYTHONPATH", ""): + sys.path.insert(0, os.environ.get("FSGS_PYTHONPATH")) ++else: ++ sys.path.insert(0, "/usr/share/fs-uae-launcher") + + if os.getcwd().startswith("C:\\msys64\\home\\"): + os.environ["PATH"] = "C:\\msys64\\mingw64\\bin;" + os.environ["PATH"] Deleted: 020-fs-uae-launcher-remove-python2.patch =================================================================== --- 020-fs-uae-launcher-remove-python2.patch 2019-11-10 15:49:28 UTC (rev 526469) +++ 020-fs-uae-launcher-remove-python2.patch 2019-11-10 15:50:02 UTC (rev 526470) @@ -1,45 +0,0 @@ -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 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python - - 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 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python - # 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 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python - # 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 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python - # 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 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2.7 -+#!/usr/bin/env python - # based heavily on "iops" by Benjamin Schweizer - # https://github.com/gopher/iops - Copied: fs-uae-launcher/repos/community-any/020-fs-uae-launcher-remove-python2.patch (from rev 526469, fs-uae-launcher/trunk/020-fs-uae-launcher-remove-python2.patch) =================================================================== --- 020-fs-uae-launcher-remove-python2.patch (rev 0) +++ 020-fs-uae-launcher-remove-python2.patch 2019-11-10 15:50:02 UTC (rev 526470) @@ -0,0 +1,45 @@ +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 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + + 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 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + # 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 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + # 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 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + # 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 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + # based heavily on "iops" by Benjamin Schweizer + # https://github.com/gopher/iops + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-10 15:49:28 UTC (rev 526469) +++ PKGBUILD 2019-11-10 15:50:02 UTC (rev 526470) @@ -1,40 +0,0 @@ -# Maintainer: Daniel Bermond <dberm...@archlinux.org> -# Contributor: Uffe Jakobsen <u...@uffe.org> -# Contributor: Guilherme Calé <g...@cabritacale.eu> - -pkgname=fs-uae-launcher -pkgver=3.0.0 -pkgrel=2 -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-setuptools' 'python-pyqt5' 'python-six' - '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" - '010-fs-uae-launcher-fix-install-path.patch' - '020-fs-uae-launcher-remove-python2.patch') -sha256sums=('ee7ea368f1c8a58755cdd79f091a84ffe4e4d5b50d5523ed892f9d07be41e905' - '15463d3d3ed5bdc4fb614cea91b93e7678eccce0696c66ac28c194dd7558e3fa' - 'dcb9be9e6881ec8102d230d54ac1dbd8fa3774d2282f5ea62ea67a3aea33045c') - -prepare() { - cd "${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/010-fs-uae-launcher-fix-install-path.patch" - patch -Np1 -i "${srcdir}/020-fs-uae-launcher-remove-python2.patch" -} - -build() { - cd "${pkgname}-${pkgver}" - - make all -} - -package() { - cd "${pkgname}-${pkgver}" - - make DESTDIR="$pkgdir" prefix='/usr' install -} Copied: fs-uae-launcher/repos/community-any/PKGBUILD (from rev 526469, fs-uae-launcher/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-10 15:50:02 UTC (rev 526470) @@ -0,0 +1,34 @@ +# Maintainer : Daniel Bermond <dberm...@archlinux.org> +# Contributor: Uffe Jakobsen <u...@uffe.org> +# Contributor: Guilherme Calé <g...@cabritacale.eu> + +pkgname=fs-uae-launcher +pkgver=3.0.2 +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-setuptools' 'python-pyqt5' 'python-six' + '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" + '010-fs-uae-launcher-fix-install-path.patch' + '020-fs-uae-launcher-remove-python2.patch') +sha256sums=('a5cc992d6ec89e9abc7fe7ee75042876ce507292be9ef0928d54ad6f9ba8608a' + '15463d3d3ed5bdc4fb614cea91b93e7678eccce0696c66ac28c194dd7558e3fa' + 'dcb9be9e6881ec8102d230d54ac1dbd8fa3774d2282f5ea62ea67a3aea33045c') + +prepare() { + patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-fs-uae-launcher-fix-install-path.patch" + patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/020-fs-uae-launcher-remove-python2.patch" +} + +build() { + make -C "${pkgname}-${pkgver}" all +} + +package() { + make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" prefix='/usr' install +}