summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackson McClintock2019-06-22 15:15:25 -0400
committerJackson McClintock2019-06-22 15:15:25 -0400
commit476994f379bf202bd5b69b25af193b11ae413caa (patch)
tree5ef1febea6384662dec9c4044f51f279a2bc0152
parent563b2c1001d424db14d3a156ac8b018c28082b71 (diff)
downloadaur-476994f379bf202bd5b69b25af193b11ae413caa.tar.gz
Add flup patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
-rw-r--r--flup_python3.patch20
3 files changed, 26 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5d4176f6fc5..851d6a709ba6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,12 +35,14 @@ pkgbase = mediagoblin-git
source = paste_local.ini
source = mediagoblin_local.ini
source = mediagoblin-tmpfiles.conf
+ source = flup_python3.patch
sha256sums = SKIP
sha256sums = 2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409
sha256sums = f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a
sha256sums = ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884
sha256sums = 9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1
sha256sums = abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47
+ sha256sums = 361507f41b732beeb124805096b8c5d34ac220cee763ca0863b265524a7f84f6
pkgname = mediagoblin-git
diff --git a/PKGBUILD b/PKGBUILD
index 9204346eba69..78f5d6d48e7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,13 +30,15 @@ source=(
'paste_local.ini'
'mediagoblin_local.ini'
'mediagoblin-tmpfiles.conf'
+ 'flup_python3.patch'
)
sha256sums=('SKIP'
'2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409'
'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a'
'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884'
'9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1'
- 'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47')
+ 'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47'
+ '361507f41b732beeb124805096b8c5d34ac220cee763ca0863b265524a7f84f6')
pkgver() {
cd "$srcdir/mediagoblin"
@@ -56,6 +58,7 @@ build() {
./configure --with-python3
make || make
./bin/easy_install flup
+ patch -p 1 -i "$srcdir/flup_python3.patch"
}
package() {
diff --git a/flup_python3.patch b/flup_python3.patch
new file mode 100644
index 000000000000..9c8c5ea5bdd6
--- /dev/null
+++ b/flup_python3.patch
@@ -0,0 +1,20 @@
+--- a/lib/python3.7/site-packages/flup-1.0.3-py3.7.egg/flup/server/paste_factory.py 2019-06-22 14:36:32.738706639 -0400
++++ b/lib/python3.7/site-packages/flup-1.0.3-py3.7.egg/flup/server/paste_factory.py 2019-06-22 14:51:07.064597983 -0400
+@@ -4,7 +4,7 @@
+ from flup.server import NoDefault
+
+ def asbool(obj):
+- if isinstance(obj, (str, unicode)):
++ if isinstance(obj, (bytes, str)):
+ obj = obj.strip().lower()
+ if obj in ['true', 'yes', 'on', 'y', 't', '1']:
+ return True
+@@ -16,7 +16,7 @@
+ return bool(obj)
+
+ def aslist(obj, sep=None, strip=True):
+- if isinstance(obj, (str, unicode)):
++ if isinstance(obj, (bytes, str)):
+ lst = obj.split(sep)
+ if strip:
+ lst = [v.strip() for v in lst]