diff options
| author | ryoon <ryoon> | 2017-04-27 01:55:57 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2017-04-27 01:55:57 +0000 |
| commit | 4f468686d03a503403fca0cf856bba43d5172843 (patch) | |
| tree | d6f9c74e3f15c5bd95d4093365f031125f0e0ff2 /www/firefox52/patches/patch-build_moz.configure_init.configure | |
| parent | 8fd3079c81cef1954603d4117c2abd377820c7ee (diff) | |
| download | pkgsrc-4f468686d03a503403fca0cf856bba43d5172843.tar.gz | |
Import firefox52-52.1.0 as www/firefox52.
Mozilla Firefox is a free, open-source and cross-platform web browser
for Windows, Linux, MacOS X and many other operating systems.
It is fast and easy to use, and offers many advantages over other web
browsers, such as tabbed browsing and the ability to block pop-up
windows.
Firefox also offers excellent bookmark and history management, and it
can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available.
Diffstat (limited to 'www/firefox52/patches/patch-build_moz.configure_init.configure')
| -rw-r--r-- | www/firefox52/patches/patch-build_moz.configure_init.configure | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/www/firefox52/patches/patch-build_moz.configure_init.configure b/www/firefox52/patches/patch-build_moz.configure_init.configure new file mode 100644 index 00000000000..cd6d92bfa38 --- /dev/null +++ b/www/firefox52/patches/patch-build_moz.configure_init.configure @@ -0,0 +1,37 @@ +$NetBSD: patch-build_moz.configure_init.configure,v 1.1 2017/04/27 01:55:57 ryoon Exp $ + +--- build/moz.configure/init.configure.orig 2016-10-31 20:15:27.000000000 +0000 ++++ build/moz.configure/init.configure +@@ -170,6 +170,7 @@ option(env='PYTHON', nargs=1, help='Pyth + @imports(_from='mozbuild.configure.util', _import='LineIO') + @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') + @imports(_from='mozbuild.virtualenv', _import='verify_python_version') ++@imports(_from='__builtin__', _import='KeyError') + @imports('distutils.sysconfig') + def virtualenv_python(env_python, build_env, mozconfig, help): + if help: +@@ -189,6 +190,12 @@ def virtualenv_python(env_python, build_ + python = mozconfig['vars']['added']['PYTHON'] + elif 'PYTHON' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON'][1] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON'] ++ except KeyError: ++ pass + + with LineIO(lambda l: log.error(l)) as out: + verify_python_version(out) +@@ -224,7 +231,10 @@ def virtualenv_python(env_python, build_ + if python != normsep(sys.executable): + log.info('Reexecuting in the virtualenv') + if env_python: +- del os.environ['PYTHON'] ++ try: ++ del os.environ['PYTHON'] ++ except KeyError: ++ pass + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) |