From e630b76fac5be7963909c636233feaf627747fca Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 4 Sep 2018 09:46:09 +0530 Subject: [PATCH] Don't patch glfw when importing since the patch has moved upstream --- glfw/glfw.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/glfw/glfw.py b/glfw/glfw.py index ead53817a..bed27d2d1 100755 --- a/glfw/glfw.py +++ b/glfw/glfw.py @@ -128,16 +128,6 @@ def collect_source_information(): return ans -def patch_in_file(path, pfunc): - with open(path, 'r+') as f: - raw = f.read() - nraw = pfunc(raw) - if raw == nraw: - raise SystemExit('Patching of {} failed'.format(path)) - f.seek(0), f.truncate() - f.write(nraw) - - class Arg: def __init__(self, decl): @@ -283,8 +273,6 @@ def from_glfw(glfw_dir): for src in files_to_copy: shutil.copy2(src, '.') shutil.copy2(glfw_header, '.') - patch_in_file('cocoa_window.m', lambda x: re.sub( - r'[(]void[)]loadMainMenu.+?}', '(void)loadMainMenu\n{ // removed by Kovid as it generated compiler warnings \n}\n', x, flags=re.DOTALL)) json.dump( sinfo, open('source-info.json', 'w'),