summaryrefslogtreecommitdiffstats
path: root/source/d/gyp/gyp-fix-cmake.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-05-30 21:31:07 +0000
committer Eric Hameleers <alien@slackware.com>2020-05-31 08:59:52 +0200
commit4490f144069d8cb4c754c5b87efc58c0e06a10ec (patch)
tree48f52539d1c0bfbc62a57b9c9b2a9c24e948591f /source/d/gyp/gyp-fix-cmake.patch
parentf21d902e060d553644989b720ecbdd1b6210f212 (diff)
downloadcurrent-bcdba515db8800f5511a2a0897387102cda3f040.tar.gz
current-bcdba515db8800f5511a2a0897387102cda3f040.tar.xz
Sat May 30 21:31:07 UTC 202020200530213107
ap/mpg123-1.26.1-x86_64-1.txz: Upgraded. d/gyp-20200512_caa60026-x86_64-1.txz: Added. l/Mako-1.1.3-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_15-x86_64-1.txz: Upgraded. l/librsvg-2.48.5-x86_64-1.txz: Upgraded. l/mozilla-nss-3.53-x86_64-1.txz: Upgraded. l/vte-0.60.3-x86_64-1.txz: Upgraded. n/libgpg-error-1.38-x86_64-1.txz: Upgraded. n/libqmi-1.24.14-x86_64-1.txz: Upgraded. extra/pure-alsa-system/mpg123-1.26.1-x86_64-1_alsa.txz: Upgraded.
Diffstat (limited to 'source/d/gyp/gyp-fix-cmake.patch')
-rw-r--r--source/d/gyp/gyp-fix-cmake.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/source/d/gyp/gyp-fix-cmake.patch b/source/d/gyp/gyp-fix-cmake.patch
new file mode 100644
index 000000000..31bd7ac8c
--- /dev/null
+++ b/source/d/gyp/gyp-fix-cmake.patch
@@ -0,0 +1,33 @@
+--- a/pylib/gyp/generator/cmake.py
++++ b/pylib/gyp/generator/cmake.py
+@@ -40,9 +40,9 @@
+
+ try:
+ # maketrans moved to str in python3.
++ _maketrans = str.maketrans
++except NameError:
+ _maketrans = string.maketrans
+-except NameError:
+- _maketrans = str.maketrans
+
+ generator_default_variables = {
+ 'EXECUTABLE_PREFIX': '',
+@@ -281,7 +281,7 @@
+ dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir)
+
+ if int(action.get('process_outputs_as_sources', False)):
+- extra_sources.extend(zip(cmake_outputs, outputs))
++ extra_sources.extend(list(zip(cmake_outputs, outputs)))
+
+ # add_custom_command
+ output.write('add_custom_command(OUTPUT ')
+@@ -987,7 +987,7 @@
+
+ # XCode settings
+ xcode_settings = config.get('xcode_settings', {})
+- for xcode_setting, xcode_value in xcode_settings.viewitems():
++ for xcode_setting, xcode_value in xcode_settings.items():
+ SetTargetProperty(output, cmake_target_name,
+ "XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value,
+ '' if isinstance(xcode_value, str) else ' ')
+