summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2020-04-24 20:40:18 -0400
committerTed Alff2020-04-24 20:40:18 -0400
commit1df820c9a3f7ad2ad90dbb5c2daa14af140aba42 (patch)
treee02b50417630a2a178fe94f0984d726febb9ccf8
parent25d1cf4aabc9f971f01c8f4826b5b2d13a3cdab0 (diff)
downloadaur-1df820c9a3f7ad2ad90dbb5c2daa14af140aba42.tar.gz
Don't use git revert, fetch the commit as patch as patch -R instead.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD18
2 files changed, 14 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 75ca312b5ed..89798f85eb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
pkgbase = superpaper
pkgdesc = Cross-platform multi monitor wallpaper manager
pkgver = 2.0.0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/hhannine/Superpaper
arch = any
license = MIT
makedepends = python-distutils-extra
- makedepends = git
depends = python-pillow
depends = python-screeninfo>=0.6.1
depends = python-wxpython
depends = python-system_hotkey>=1.0.2+10+9541587
depends = python-xpybutil
depends = python-numpy
- source = superpaper::git+https://github.com/hhannine/superpaper.git#tag=v2.0.0
- sha256sums = SKIP
+ source = superpaper-2.0.0.tar.gz::https://github.com/hhannine/Superpaper/archive/v2.0.0.tar.gz
+ source = 0001_revert_pillow_7.0_requirement.patch::https://github.com/hhannine/superpaper/commit/6eecf85a628cc898b943959920e7fb479b985044.patch
+ sha256sums = f1ffbc7cdeb77474c4dfaa6ec7db66d797aa750af164f9e343860ea9ea0dbbe5
+ sha256sums = 8a76617f08175ec0c98b40228de920e1a1252727d229c5e32f7787ffe336a994
pkgname = superpaper
diff --git a/PKGBUILD b/PKGBUILD
index b829b767184..ae17dabdaa7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,27 @@
pkgname=superpaper
pkgver=2.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="Cross-platform multi monitor wallpaper manager"
arch=('any')
url="https://github.com/hhannine/Superpaper"
license=('MIT')
depends=('python-pillow' 'python-screeninfo>=0.6.1' 'python-wxpython'
'python-system_hotkey>=1.0.2+10+9541587' 'python-xpybutil' 'python-numpy')
-makedepends=('python-distutils-extra' 'git')
-#source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hhannine/${pkgname^}/archive/v${pkgver}.tar.gz")
-#sha256sums=('f1ffbc7cdeb77474c4dfaa6ec7db66d797aa750af164f9e343860ea9ea0dbbe5')
-source=("${pkgname}::git+https://github.com/hhannine/superpaper.git#tag=v${pkgver}")
-sha256sums=('SKIP')
+makedepends=('python-distutils-extra')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hhannine/${pkgname^}/archive/v${pkgver}.tar.gz"
+ '0001_revert_pillow_7.0_requirement.patch::https://github.com/hhannine/superpaper/commit/6eecf85a628cc898b943959920e7fb479b985044.patch')
+sha256sums=('f1ffbc7cdeb77474c4dfaa6ec7db66d797aa750af164f9e343860ea9ea0dbbe5'
+ '8a76617f08175ec0c98b40228de920e1a1252727d229c5e32f7787ffe336a994')
prepare() {
- cd "${srcdir}/${pkgname}" #-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
# Revert image optimizations which bumped the Pillow dep to 7.0+
# until Arch updates the python-pillow package.
- git revert --no-edit '6eecf85a628cc898b943959920e7fb479b985044'
+ patch -Rp1 -i ../0001_revert_pillow_7.0_requirement.patch
}
package() {
- cd "${srcdir}/${pkgname}" #-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
python setup.py install --root "${pkgdir}" --optimize=1
}