diff options
| author | Nikolay Korotkiy | 2019-10-07 22:11:46 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy | 2019-10-07 22:11:46 +0300 |
| commit | eb0aa9ef2849e0c73d1ded868b833811fc8a0b1a (patch) | |
| tree | a1051c2404eb5b1837856e950645451018cab291 | |
| parent | 77c16f420c42c9ad05accb8bc698b9f0ed88453b (diff) | |
| download | aur-giseditor.tar.gz | |
patch: expand tilde in path
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-Expand-tilde-in-path.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 37 insertions, 7 deletions
@@ -1,9 +1,9 @@ -# Generated by makepkg 5.1.2 -# Sun Feb 17 16:15:32 UTC 2019 +# Generated by makepkg 5.1.3 +# Mon Oct 7 19:07:15 UTC 2019 pkgbase = giseditor pkgdesc = A gis editor for .gpx .gdb and download maps source pkgver = 0.27 - pkgrel = 2 + pkgrel = 3 url = https://github.com/dayanuyim/GisEditor arch = any depends = gpsbabel @@ -25,7 +25,9 @@ pkgbase = giseditor provides = giseditor=0.27 conflicts = giseditor-git source = https://github.com/dayanuyim/GisEditor/archive/v0.27.tar.gz + source = 0001-Expand-tilde-in-path.patch sha256sums = c5ae9f85b6c668dbe2a493353cd274df5117a06adaa9fbd88eb3cfcaaeb41ad9 + sha256sums = 4387b1954dc7fa8a1a7b79731f62baaa8d65abfe046e2311100c92bc4d4fdff8 pkgname = giseditor diff --git a/0001-Expand-tilde-in-path.patch b/0001-Expand-tilde-in-path.patch new file mode 100644 index 000000000000..6effcfb278a1 --- /dev/null +++ b/0001-Expand-tilde-in-path.patch @@ -0,0 +1,24 @@ +From 29c50a0c211a62ada8070cb1d031d438b4a2e02e Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy <sikmir@gmail.com> +Date: Fri, 23 Nov 2018 22:39:29 +0300 +Subject: [PATCH 1/1] Expand tilde in path + +--- + src/conf.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/conf.py b/src/conf.py +index 63af205..24a649c 100755 +--- a/src/conf.py ++++ b/src/conf.py +@@ -104,6 +104,7 @@ def __defaultImgFont(): + + + def abspath(path, related_home): ++ path = os.path.expanduser(path) + return path if os.path.isabs(path) else os.path.join(related_home, path) + + +-- +2.23.0 + @@ -1,11 +1,10 @@ # Maintainer: Po-An,Yang(Antonio) <yanganto@gmail.com> # Co-Maintainer: Nikolay Korotkiy <sikmir@gmail.com> _orgname=dayanuyim - _pkgname=GisEditor pkgname=${_pkgname,,} pkgver=0.27 -pkgrel=2 +pkgrel=3 pkgdesc='A gis editor for .gpx .gdb and download maps source' arch=('any') url='https://github.com/dayanuyim/GisEditor' @@ -14,12 +13,17 @@ depends=('gpsbabel' 'python-pmw' 'python-pillow' 'python-numpy' 'python-cycler' optdepends=('ttf-arphic-ukai' ) provides=("${pkgname}=${pkgver}") conflicts=(${pkgname}-git) -source=("https://github.com/${_orgname}/${_pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('c5ae9f85b6c668dbe2a493353cd274df5117a06adaa9fbd88eb3cfcaaeb41ad9') +source=("https://github.com/${_orgname}/${_pkgname}/archive/v${pkgver}.tar.gz" + '0001-Expand-tilde-in-path.patch') +sha256sums=('c5ae9f85b6c668dbe2a493353cd274df5117a06adaa9fbd88eb3cfcaaeb41ad9' + '4387b1954dc7fa8a1a7b79731f62baaa8d65abfe046e2311100c92bc4d4fdff8') prepare() { cd ${_pkgname}-${pkgver} + # See https://github.com/dayanuyim/GisEditor/pull/16 + patch -p1 < ../0001-Expand-tilde-in-path.patch + cat << EOF > $pkgname #!/bin/sh python /opt/$pkgname/main.py |