diff options
Diffstat (limited to 'www/firefox/files')
| -rw-r--r-- | www/firefox/files/patch-bug1288587 | 22 | ||||
| -rw-r--r-- | www/firefox/files/patch-cubeb-sndio | 15 |
2 files changed, 11 insertions, 26 deletions
diff --git a/www/firefox/files/patch-bug1288587 b/www/firefox/files/patch-bug1288587 index 9125476c8400..57aa3ace1650 100644 --- a/www/firefox/files/patch-bug1288587 +++ b/www/firefox/files/patch-bug1288587 @@ -2,15 +2,15 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi index 855214a..1e91d51 100644 --- build/moz.configure/init.configure +++ build/moz.configure/init.configure -@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr - @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') - @imports(_from='mozbuild.virtualenv', _import='verify_python_version') - @imports(_from='mozbuild.virtualenv', _import='PY2') +@@ -252,6 +252,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr + @imports(_from='mozbuild.pythonutil', _import='find_python2_executable') + @imports(_from='mozbuild.pythonutil', _import='python_executable_version') + @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') - def virtualenv_python2(env_python, build_env, mozconfig, help): + def virtualenv_python2(env_python, build_env, mozillabuild, mozconfig, help): if help: return -@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi +@@ -283,6 +284,12 @@ def virtualenv_python2(env_python, build_env, mozillab python = mozconfig['vars']['added']['PYTHON'] elif 'PYTHON' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON'][1] @@ -23,7 +23,7 @@ index 855214a..1e91d51 100644 log.debug("python2: executable from configuration: %r" % python) -@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi +@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Reexecuting in the virtualenv') if env_python: @@ -35,15 +35,15 @@ index 855214a..1e91d51 100644 # One would prefer to use os.execl, but that's completely borked on # Windows. sys.exit(subprocess.call([python] + sys.argv)) -@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre - @imports(_from='mozbuild.virtualenv', _import='PY3') +@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') + @imports(_from='six', _import='ensure_text') +@imports(_from='__builtin__', _import='KeyError') def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): if help: return -@@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] @@ -56,7 +56,7 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: diff --git a/www/firefox/files/patch-cubeb-sndio b/www/firefox/files/patch-cubeb-sndio deleted file mode 100644 index 4637d825c08d..000000000000 --- a/www/firefox/files/patch-cubeb-sndio +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/kinetiknz/cubeb/commit/3ab507569153 - -diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c -index 4a05bd84..34b3513d 100644 ---- media/libcubeb/src/cubeb_sndio.c -+++ media/libcubeb/src/cubeb_sndio.c -@@ -128,7 +128,7 @@ s16_to_float(void *ptr, long nsamp) - static const char * - sndio_get_device() - { --#ifndef __OpenBSD__ -+#ifdef __linux__ - /* - * On other platforms default to sndio devices, - * so cubebs other backends can be used instead. |