PR2127

3 files changed, 3 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d415baab988c..e4b73267bf52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,12 +15,10 @@ pkgbase = mingw-w64-mesa
 	options = !buildflags
 	source = https://mesa.freedesktop.org/archive/mesa-19.2.0.tar.xz
 	source = https://mesa.freedesktop.org/archive/mesa-19.2.0.tar.xz.sig
-	source = py3k.patch
 	validpgpkeys = 71C4B75620BC75708B4BDB254C95FAAB3EB073EC
 	validpgpkeys = A5CC9FEC93F2F837CB044912336909B6B25FADFA
 	sha256sums = b060caa2a00f856431160ff7377d0e8f58f2aa48c16ee5a9e265ebdccb10852a
 	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = mingw-w64-mesa
 
diff --git a/PKGBUILD b/PKGBUILD
index 46060bb9e1d7..a6731d12a0e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ depends=('mingw-w64-dlfcn' 'mingw-w64-llvm')
 options=('staticlibs' '!strip' '!buildflags')
 validpgpkeys=(71C4B75620BC75708B4BDB254C95FAAB3EB073EC  # Dylan Baker <dylan@pnwbakers.com>
               A5CC9FEC93F2F837CB044912336909B6B25FADFA) # Juan A. Suarez Romero <jasuarez@igalia.com>
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} py3k.patch)
-sha256sums=('b060caa2a00f856431160ff7377d0e8f58f2aa48c16ee5a9e265ebdccb10852a' SKIP SKIP)
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig})
+sha256sums=('b060caa2a00f856431160ff7377d0e8f58f2aa48c16ee5a9e265ebdccb10852a' SKIP)
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -19,7 +19,7 @@ prepare () {
   cd "${srcdir}"/mesa-${pkgver}
 
   # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2127
-  patch -p1 -i "${srcdir}"/py3k.patch
+  curl -L https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2127.patch | patch -p1
 
   # libLLVMSupport.a: undefined reference to `compressBound' (only with static llvm)
   sed -i "s|'LLVMSupport',|'LLVMSupport', 'z',|g" scons/llvm.py
diff --git a/py3k.patch b/py3k.patch
deleted file mode 100644
index c7ad30a18b43..000000000000
--- a/py3k.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/scons/crossmingw.py b/scons/crossmingw.py
-index 609cd00418e..b2efccea7e8 100644
---- a/scons/crossmingw.py
-+++ b/scons/crossmingw.py
-@@ -128,9 +128,9 @@ def generate(env):
-         if not path: 
-             path = []
-         if SCons.Util.is_String(path):
--            path = string.split(path, os.pathsep)
-+            path = str.split(path, os.pathsep)
- 
--        env['ENV']['PATH'] = string.join([dir] + path, os.pathsep)
-+        env['ENV']['PATH'] = str.join(os.pathsep, [dir] + path)
- 
-     # Most of mingw is the same as gcc and friends...
-     gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas']
-diff --git a/scons/custom.py b/scons/custom.py
-index 8028990ef61..d2576ae9ddb 100644
---- a/scons/custom.py
-+++ b/scons/custom.py
-@@ -262,8 +262,13 @@ def parse_source_list(env, filename, names=None):
-     sym_table = parser.parse(src.abspath)
- 
-     if names:
--        if isinstance(names, basestring):
--            names = [names]
-+        import sys
-+        if sys.version_info[0] >= 3:
-+            if isinstance(names, str):
-+                names = [names]
-+        else:
-+            if isinstance(names, basestring):
-+                names = [names]
- 
-         symbols = names
-     else:
-diff --git a/scons/gallium.py b/scons/gallium.py
-index 72d8604169e..9381f804a31 100755
---- a/scons/gallium.py
-+++ b/scons/gallium.py
-@@ -132,7 +132,7 @@ def check_cc(env, cc, expr, cpp_opt = '-E'):
-     sys.stdout.write('Checking for %s ... ' % cc)
- 
-     source = tempfile.NamedTemporaryFile(suffix='.c', delete=False)
--    source.write('#if !(%s)\n#error\n#endif\n' % expr)
-+    source.write(('#if !(%s)\n#error\n#endif\n' % expr).encode())
-     source.close()
- 
-     # sys.stderr.write('%r %s %s\n' % (env['CC'], cpp_opt, source.name));
-diff --git a/src/freedreno/vulkan/tu_extensions.py b/src/freedreno/vulkan/tu_extensions.py
-index 0a45b859e2b..dbb3a72d71e 100644
---- a/src/freedreno/vulkan/tu_extensions.py
-+++ b/src/freedreno/vulkan/tu_extensions.py
-@@ -79,7 +79,7 @@ EXTENSIONS = [
- 
- class VkVersion:
-     def __init__(self, string):
--        split = string.split('.')
-+        split = str.split('.')
-         self.major = int(split[0])
-         self.minor = int(split[1])
-         if len(split) > 2:
-diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py
-index dad49a1e564..60f97dd3e08 100644
---- a/src/intel/vulkan/anv_extensions.py
-+++ b/src/intel/vulkan/anv_extensions.py
-@@ -186,7 +186,7 @@ for i in range(len(EXTENSIONS) - 1):
- 
- class VkVersion:
-     def __init__(self, string):
--        split = string.split('.')
-+        split = str.split('.')
-         self.major = int(split[0])
-         self.minor = int(split[1])
-         if len(split) > 2: