summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001_revert_pillow_7.0_requirement.patch33
-rw-r--r--PKGBUILD13
2 files changed, 38 insertions, 8 deletions
diff --git a/0001_revert_pillow_7.0_requirement.patch b/0001_revert_pillow_7.0_requirement.patch
new file mode 100644
index 000000000000..5893fad6f5bb
--- /dev/null
+++ b/0001_revert_pillow_7.0_requirement.patch
@@ -0,0 +1,33 @@
+diff -Naur ./superpaper-2.0.2.orig/setup.py ./superpaper-2.0.2/setup.py
+--- ./superpaper-2.0.2.orig/setup.py 2020-05-09 20:16:03.999703051 -0400
++++ ./superpaper-2.0.2/setup.py 2020-05-09 20:18:31.242189059 -0400
+@@ -58,7 +58,7 @@
+
+ # python_requires="~=3.5",
+ install_requires=[
+- "Pillow>=7.0.0",
++ "Pillow>=6.0.0",
+ "screeninfo>=0.6.1",
+ "numpy>=1.18.0",
+ "system_hotkey>=1.0.3",
+diff -Naur ./superpaper-2.0.2.orig/superpaper/wallpaper_processing.py ./superpaper-2.0.2/superpaper/wallpaper_processing.py
+--- ./superpaper-2.0.2.orig/superpaper/wallpaper_processing.py 2020-05-09 20:16:03.996369661 -0400
++++ ./superpaper-2.0.2/superpaper/wallpaper_processing.py 2020-05-09 20:16:46.463443631 -0400
+@@ -927,7 +927,7 @@
+ new_size = (
+ round(resize_multiplier * image_size[0]),
+ round(resize_multiplier * image_size[1]))
+- img = img.resize(new_size, resample=quality, reducing_gap=reducing_gap)
++ img = img.resize(new_size, resample=quality) #, reducing_gap=reducing_gap)
+ # crop vertically to target height
+ extra_height = new_size[1] - res[1]
+ if extra_height < 0:
+@@ -958,7 +958,7 @@
+ new_size = (
+ round(resize_multiplier * image_size[0]),
+ round(resize_multiplier * image_size[1]))
+- img = img.resize(new_size, resample=quality, reducing_gap=reducing_gap)
++ img = img.resize(new_size, resample=quality) #, reducing_gap=reducing_gap)
+ # crop horizontally to target width
+ extra_width = new_size[0] - res[0]
+ if extra_width < 0:
diff --git a/PKGBUILD b/PKGBUILD
index 751e3d2d75ab..8035ec97776c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: twa022 <twa022 at gmail dot com>
pkgname=superpaper
-pkgver=2.0.1
+pkgver=2.0.2
pkgrel=1
pkgdesc="Cross-platform multi monitor wallpaper manager"
arch=('any')
@@ -11,18 +11,15 @@ 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')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hhannine/${pkgname^}/archive/v${pkgver}.tar.gz"
- '0001_revert_e7c59c9d5d1ff0d40554909b906cbdbd6642e01d.patch::https://github.com/hhannine/superpaper/commit/e7c59c9d5d1ff0d40554909b906cbdbd6642e01d.patch'
- '0002_revert_pillow_7.0_requirement.patch::https://github.com/hhannine/superpaper/commit/6eecf85a628cc898b943959920e7fb479b985044.patch')
-sha256sums=('8cc6e271b754398e6368f773019df74366f09712742fb24109817506cfbd7fef'
- '748a38ad800dd63e107bd4cd54fd25e276d7d13a410eddbfb8e0e78ab6c12ee6'
- '8a76617f08175ec0c98b40228de920e1a1252727d229c5e32f7787ffe336a994')
+ '0001_revert_pillow_7.0_requirement.patch')
+sha256sums=('58b5c7f79d772142c819b00f4925193bc135fa29312d933b3a7cd8adcad9f56c'
+ '0e00a061c96564310c42f8a18b8a2f67ac44a31544f1f48d496445f78b6f3530')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Revert image optimizations which bumped the Pillow dep to 7.0+
# until Arch updates the python-pillow package.
- patch -Rp1 -i ../0001_revert_e7c59c9d5d1ff0d40554909b906cbdbd6642e01d.patch
- patch -Rp1 -i ../0002_revert_pillow_7.0_requirement.patch
+ patch -Np2 -r- -i ../0001_revert_pillow_7.0_requirement.patch
}
package() {