firefox: WIP part 3

mingw-w64-firefox/0002-Allow-MSYS2-make.patch

@@ -11,3 +11,17 @@ diff -urN a/config/baseconfig.mk b/config/baseconfig.mk
  # 4.0- happens to be greater than 4.0, lower than the mozmake version,
  # and lower than 4.0.1 or 4.1, whatever next version of gnu make will
  # be released.
+--- firefox-39.0/config/baseconfig.mk.orig	2015-07-14 21:57:46.627572700 +0100
++++ firefox-39.0/config/baseconfig.mk	2015-07-14 22:02:47.929566800 +0100
+@@ -38,11 +38,6 @@
+ $(error Make version too old. Only versions strictly greater than 4.0 are supported.)
+ endif
+ 
+-ifdef INCLUDED_AUTOCONF_MK
+-ifeq (a,$(firstword a$(subst /, ,$(srcdir))))
+-$(error MSYS-style srcdir are not supported for Windows builds.)
+-endif
+-endif
+ endif # WINNT
+ 
+ include_deps = $(eval $(if $(2),,-)include $(1))

mingw-w64-firefox/0004-Allow-MSYS2-python.patch

@@ -141,3 +141,21 @@ diff -urN a/python/virtualenv/virtualenv.py b/python/virtualenv/virtualenv.py
              pythondll = os.path.join(os.path.dirname(sys.executable), py_executable_dll)
              pythondll_d = os.path.join(os.path.dirname(sys.executable), py_executable_dll_d)
              pythondll_d_dest = os.path.join(os.path.dirname(py_executable), py_executable_dll_d)
+diff -urN a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4
+--- a/build/autoconf/config.status.m4	2015-07-14 20:29:46.830015600 +0100
++++ b/build/autoconf/config.status.m4	2015-07-14 21:47:36.475764800 +0100
+@@ -81,12 +81,12 @@
+ 
+ dnl Replace AC_OUTPUT to create and call a python config.status
+ define([MOZ_CREATE_CONFIG_STATUS],
+-[dnl Top source directory in Windows format (as opposed to msys format).
++[dnl Top source directory in Python-appropriate format (Win, MSYS or Cygwin format).
+ WIN_TOP_SRC=
+ encoding=utf-8
+ case "$host_os" in
+ mingw*)
+-    WIN_TOP_SRC=`cd $srcdir; pwd -W`
++    WIN_TOP_SRC=`${PYTHON} -c "import os, sys; print(os.path.abspath(sys.argv[1])" $srcdir`
+     ;;
+ esac
+ AC_SUBST(WIN_TOP_SRC)

mingw-w64-firefox/0005-Allow-mingw-w64-python.patch

@@ -18,7 +18,7 @@ diff -urN a/python/virtualenv/virtualenv.py b/python/virtualenv/virtualenv.py
      def get_installed_pythons():
          return {}
  else:
-@@ -113,6 +114,14 @@
+@@ -113,6 +114,16 @@
                      're', 'sre', 'sre_parse', 'sre_constants', 'sre_compile',
                      'zlib']
  
@@ -28,7 +28,9 @@ diff -urN a/python/virtualenv/virtualenv.py b/python/virtualenv/virtualenv.py
 +                             'atexit', 'optparse', 'textwrap', 'string',
 +                             'contextlib', 'shutil', 'subprocess', 'threading',
 +                             'tarfile', 'struct', 'copy', 'zipfile', 'io',
-+                             'glob'])
++                             'glob', 'tempfile', 'StringIO', 'SocketServer',
++                             'socket', 'random', 'opcode', 'hashlib', 'gettext',
++                             'getpass'])
 +
  REQUIRED_FILES = ['lib-dynload', 'config']
  

mingw-w64-firefox/PKGBUILD

@@ -13,6 +13,9 @@ groups=("${MINGW_PACKAGE_PREFIX}")
 arch=('any')
 url='https://www.mozilla.org/firefox/'
 license=('MPL2')
+makedepends=('unzip'
+             'zip'
+             "${MINGW_PACKAGE_PREFIX}-yasm")
 source=("http://ftp.mozilla.org/pub/mozilla.org/${_realname}/releases/${pkgver}/source/${_realname}-${pkgver}.source.tar.bz2"
         "0001-Allow-MSYS2-shell.patch"
         "0002-Allow-MSYS2-make.patch"
@@ -27,11 +30,11 @@ source=("http://ftp.mozilla.org/pub/mozilla.org/${_realname}/releases/${pkgver}/
 noextract=("${_realname}-${pkgver}.source.tar.bz2")
 sha1sums=('32785daee7ddb9da8d7509ef095258fc58fe838e'
           '1c0810fbfd6f336eec81e236c89c6c9ca0e79290'
-          'c269337da604ab047de5dea088dbbe8f547dfbea'
+          'b59591f2ead727f6fcd3836305ece3ed6184544a'
           '2fd8904f036d2515e314b3d7510d8358add298d2'
-          'e3079d2151b89145134bd70d5b66bd772e5d56e6'
-          'ea32e4d47b46cb85173e686a4609e32e97f8d957'
-          '60d0ff16614804a1408feeed81b4a77a808d9a5a'
+          '12e2360c2d6abad989dbc996fa4940fd6a6e830e'
+          'bd2bb1270373703447db5f0f9bcd6a558621a0f7'
+          '60e51c33dd5eeaeaa1c38c7b575d183f27bb61a7'
           '36da1863d7f1f5ea7faa50f773a6dbdda405d7f5'
           '3861e9d68ee67aa2dc6a087158054c29466cd4da'
           '17c4f8628ea435c999be66ee4c2967fdaf3b2955'
@@ -76,8 +79,8 @@ build() {
   [ -d ${_builddir} ] && rm -rf "${_builddir}"
   mkdir ${_builddir}
   cp "${srcdir}"/mozconfig.${CARCH} ${_builddir}/.mozconfig
-#  export PYTHON=/usr/bin/python2.7.exe
-  export PYTHON=${MINGW_PREFIX}/bin/python2.7.exe
+  export PYTHON=/usr/bin/python2.7.exe
+#  export PYTHON=${MINGW_PREFIX}/bin/python2.7.exe
   export MOZCONFIG=${PWD}/${_builddir}/.mozconfig
   export MIDL=${MINGW_PREFIX}/bin/widl.exe
   export MOZ_TOOLS=${MINGW_PREFIX}

mingw-w64-firefox/debugging.patch

@@ -18,3 +18,15 @@ diff -urN a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbu
                  if not os.path.exists(mozpath.join(context.srcdir, src)):
                      raise SandboxValidationError('File listed in %s does not '
                          'exist: \'%s\'' % (symbol, src), context)
+diff -urN a/python/mozbuild/mozbuild/config_status.py b/python/mozbuild/mozbuild/config_status.py
+--- a/python/mozbuild/mozbuild/config_status.py	2015-06-30 23:58:07.000000000 +0100
++++ b/python/mozbuild/mozbuild/config_status.py	2015-07-14 20:21:48.954130100 +0100
+@@ -145,7 +145,7 @@
+     log_manager.add_terminal_logging(level=log_level)
+     log_manager.enable_unstructured()
+ 
+-    print('Reticulating splines...', file=sys.stderr)
++    print('Reticulating splines... sys.argv = %s' % sys.argv, file=sys.stderr)
+     summary = the_backend.consume(definitions)
+ 
+     for line in summary.summaries():