[tbb-commits] [tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie

17 Jan 2018

diff --git a/projects/argparse/build b/projects/argparse/build
index 29e4221..3d5b424 100644
--- a/projects/argparse/build
+++ b/projects/argparse/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
-  $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
+  $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   python2 setup.py build --build-lib build
   cp -a build/argparse.py $PTDIR/
diff --git a/projects/argparse/config b/projects/argparse/config
index c4d9dec..730a4f1 100644
--- a/projects/argparse/config
+++ b/projects/argparse/config
@@ -15,7 +15,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/binutils/build b/projects/binutils/build
index aa0d752..ee6db1a 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -25,6 +25,8 @@ cd [% project %]-[% c("version") %]
   patch -p1 < ../peXXigen.patch
   # Needed for the hardening...
   patch -p1 < ../enable-reloc-section-ld.patch
+  # fix "right-hand operand of comma expression has no effect" warning
+  patch -p1 < ../fix-warning-bfd.patch
 [% END -%]
 [% IF c('var/windows-x86_64') -%]
   patch -p1 < ../64bit-fixups.patch
diff --git a/projects/binutils/config b/projects/binutils/config
index 25417c0..5c35588 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -19,6 +19,8 @@ input_files:
   - project: container-image
   - filename: enable-reloc-section-ld.patch
     enable: '[% c("var/windows") %]'
+  - filename: fix-warning-bfd.patch
+    enable: '[% c("var/windows") %]'
   - filename: 64bit-fixups.patch
     enable: '[% c("var/windows-x86_64") %]'
   - filename: peXXigen.patch
diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch
new file mode 100644
index 0000000..fa04405
--- /dev/null
+++ b/projects/binutils/fix-warning-bfd.patch
@@ -0,0 +1,186 @@
+From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001
+From: Nick Clifton nickc@redhat.com
+Date: Wed, 29 Jan 2014 13:46:39 +0000
+Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to
+ replace the various bfd_xxx_set macros with static inline functions, so that
+ we can avoid compile time warnings about comma expressions with unused
+ values.
+
+	* bfd-in.h (bfd_set_section_vma): Delete.
+	(bfd_set_section_alignment): Delete.
+	(bfd_set_section_userdata): Delete.
+	(bfd_set_cacheable): Delete.
+	* bfd.c (bfd_set_cacheable): New static inline function.
+	* section.c (bfd_set_section_userdata): Likewise.
+	(bfd_set_section_vma): Likewise.
+	(bfd_set_section_alignment): Likewise.
+	* bfd-in2.h: Regenerate.
+---
+ bfd/bfd-in.h  |  5 -----
+ bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------
+ bfd/bfd.c     |  8 ++++++++
+ bfd/section.c | 26 ++++++++++++++++++++++++++
+ 5 files changed, 81 insertions(+), 11 deletions(-)
+
+diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
+index 3afd71b..c7c5a7d 100644
+--- a/bfd/bfd-in.h
++++ b/bfd/bfd-in.h
+@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr;
+ 
+ #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+ 
+-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+ /* Find the address one past the end of SEC.  */
+ #define bfd_get_section_limit(bfd, sec) \
+   (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
+ 
+ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+ 
+-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+-
+ extern bfd_boolean bfd_cache_close
+   (bfd *abfd);
+ /* NB: This declaration should match the autogenerated one in libbfd.h.  */
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 71996db..b5aeb40 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr;
+ 
+ #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
+ 
+-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
+ /* Find the address one past the end of SEC.  */
+ #define bfd_get_section_limit(bfd, sec) \
+   (((bfd)->direction != write_direction && (sec)->rawsize != 0	\
+@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *);
+ 
+ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+ 
+-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+-
+ extern bfd_boolean bfd_cache_close
+   (bfd *abfd);
+ /* NB: This declaration should match the autogenerated one in libbfd.h.  */
+@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target);
+ 
+ bfd *bfd_fdopenr (const char *filename, const char *target, int fd);
+ 
+-bfd *bfd_openstreamr (const char *, const char *, void *);
++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream);
+ 
+ bfd *bfd_openr_iovec (const char *filename, const char *target,
+     void *(*open_func) (struct bfd *nbfd,
+@@ -1596,6 +1591,32 @@ struct relax_table {
+   int size;
+ };
+ 
++/* Note: the following are provided as inline functions rather than macros
++   because not all callers use the return value.  A macro implementation
++   would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some
++   compilers will complain about comma expressions that have no effect.  */
++static inline bfd_boolean
++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val)
++{
++  ptr->userdata = val;
++  return TRUE;
++}
++
++static inline bfd_boolean
++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val)
++{
++  ptr->vma = ptr->lma = val;
++  ptr->user_set_vma = TRUE;
++  return TRUE;
++}
++
++static inline bfd_boolean
++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val)
++{
++  ptr->alignment_power = val;
++  return TRUE;
++}
++
+ /* These sections are global, and are managed by BFD.  The application
+    and target back end are not permitted to change the values in
+    these sections.  */
+@@ -6415,6 +6436,14 @@ struct bfd
+   unsigned int selective_search : 1;
+ };
+ 
++/* See note beside bfd_set_section_userdata.  */
++static inline bfd_boolean
++bfd_set_cacheable (bfd * abfd, bfd_boolean val)
++{
++  abfd->cacheable = val;
++  return TRUE;
++}
++
+ typedef enum bfd_error
+ {
+   bfd_error_no_error = 0,
+diff --git a/bfd/bfd.c b/bfd/bfd.c
+index 8d0580c..2d174f3 100644
+--- a/bfd/bfd.c
++++ b/bfd/bfd.c
+@@ -311,6 +311,14 @@ CODE_FRAGMENT
+ .  unsigned int selective_search : 1;
+ .};
+ .
++.{* See note beside bfd_set_section_userdata.  *}
++.static inline bfd_boolean
++.bfd_set_cacheable (bfd * abfd, bfd_boolean val)
++.{
++.  abfd->cacheable = val;
++.  return TRUE;
++.}
++.
+ */
+ 
+ #include "sysdep.h"
+diff --git a/bfd/section.c b/bfd/section.c
+index fb19d8c..a661228 100644
+--- a/bfd/section.c
++++ b/bfd/section.c
+@@ -542,6 +542,32 @@ CODE_FRAGMENT
+ .  int size;
+ .};
+ .
++.{* Note: the following are provided as inline functions rather than macros
++.   because not all callers use the return value.  A macro implementation
++.   would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some
++.   compilers will complain about comma expressions that have no effect.  *}
++.static inline bfd_boolean
++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val)
++.{
++.  ptr->userdata = val;
++.  return TRUE;
++.}
++.
++.static inline bfd_boolean
++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val)
++.{
++.  ptr->vma = ptr->lma = val;
++.  ptr->user_set_vma = TRUE;
++.  return TRUE;
++.}
++.
++.static inline bfd_boolean
++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val)
++.{
++.  ptr->alignment_power = val;
++.  return TRUE;
++.}
++.
+ .{* These sections are global, and are managed by BFD.  The application
+ .   and target back end are not permitted to change the values in
+ .   these sections.  *}
+-- 
+2.1.4
+
diff --git a/projects/fteproxy/build b/projects/fteproxy/build
index 0d9baf1..310c9a5 100644
--- a/projects/fteproxy/build
+++ b/projects/fteproxy/build
@@ -12,7 +12,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
   $PYTHON setup_tbb.py py2exe
   py2exe_zip_timestomp dist/fteproxy.zip
   cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
diff --git a/projects/fteproxy/config b/projects/fteproxy/config
index 6a13e0d..d58095e 100644
--- a/projects/fteproxy/config
+++ b/projects/fteproxy/config
@@ -18,7 +18,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/libfte/build b/projects/libfte/build
index 62c8fce..9493f30 100644
--- a/projects/libfte/build
+++ b/projects/libfte/build
@@ -16,12 +16,12 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %]
   pydir=$distdir/python
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
   export LD_PRELOAD=
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
   # FTE only needs libgmp-10.dll and no libgmpxx anymore.
   cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll .
   cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/
   WINDOWS_BUILD=1 CROSS_COMPILE=1 make
-  $PYTHON setup.py install --prefix=$(winepath -w "$pydir")
+  $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir")
   $PYTHON setup.py install
 [% ELSE -%]
   export PYTHON=python2
diff --git a/projects/libfte/config b/projects/libfte/config
index 4c34116..3b33cf6 100644
--- a/projects/libfte/config
+++ b/projects/libfte/config
@@ -17,8 +17,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
       arch_deps:
+        - wine
         - faketime
input_files:
diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build
index 9d64aa9..2c87e95 100644
--- a/projects/obfsproxy/build
+++ b/projects/obfsproxy/build
@@ -21,9 +21,9 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
   $PYTHON setup_py2exe.py py2exe
-  $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+  $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
   py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip
   cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/
   # http://bugs.winehq.org/show_bug.cgi?id=3591
diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config
index 9134de1..9286c61 100644
--- a/projects/obfsproxy/config
+++ b/projects/obfsproxy/config
@@ -20,7 +20,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/parsley/build b/projects/parsley/build
index 1d52f9a..7b6e632 100644
--- a/projects/parsley/build
+++ b/projects/parsley/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/Parsley-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
-  $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
+  $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   PYTHON=python2
   $PYTHON setup.py build --build-lib build
diff --git a/projects/parsley/config b/projects/parsley/config
index b788899..f305822 100644
--- a/projects/parsley/config
+++ b/projects/parsley/config
@@ -15,7 +15,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/pycrypto/build b/projects/pycrypto/build
index 51ec5ce..084939f 100644
--- a/projects/pycrypto/build
+++ b/projects/pycrypto/build
@@ -27,7 +27,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
   ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32
   export LD_PRELOAD=
   $PYTHON setup.py build_ext -c mingw32
-  $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+  $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   export PYTHON=python2
   ./configure --build=i686-linux-gnu [% c("var/configure_opt") %]
diff --git a/projects/pycrypto/config b/projects/pycrypto/config
index ca314c8..c55844b 100644
--- a/projects/pycrypto/config
+++ b/projects/pycrypto/config
@@ -15,9 +15,9 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
       arch_deps:
         - faketime
+        - wine
input_files:
   - project: container-image
diff --git a/projects/pyptlib/build b/projects/pyptlib/build
index de70c5b..fa6d78d 100644
--- a/projects/pyptlib/build
+++ b/projects/pyptlib/build
@@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
   mkdir -p "$pydir"
-  $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+  $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   export PYTHON=python2
   $PYTHON setup.py build --build-lib build
diff --git a/projects/pyptlib/config b/projects/pyptlib/config
index 7ae1d68..36a6037 100644
--- a/projects/pyptlib/config
+++ b/projects/pyptlib/config
@@ -19,7 +19,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/pyyaml/build b/projects/pyyaml/build
index d3d60d7..72dc553 100644
--- a/projects/pyyaml/build
+++ b/projects/pyyaml/build
@@ -13,8 +13,8 @@ cd /var/tmp/build/PyYAML-[% c('version') %]
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
-  $PYTHON setup.py install --prefix=$(winepath -w $pydir)
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
+  $PYTHON setup.py install --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   export PYTHON=python2
   $PYTHON setup.py build --build-lib build
diff --git a/projects/pyyaml/config b/projects/pyyaml/config
index 8d43bf6..f2b928e 100644
--- a/projects/pyyaml/config
+++ b/projects/pyyaml/config
@@ -15,7 +15,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/twisted/build b/projects/twisted/build
index 0d9154f..077143c 100644
--- a/projects/twisted/build
+++ b/projects/twisted/build
@@ -24,8 +24,8 @@ cd /var/tmp/build/Twisted-[% c('version') %]
   # the -c option, so we set the compiler in a configuration file.
   echo $'[build_ext]\ncompiler=mingw32' > setup.cfg
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
-  LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
+  LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
 [% ELSE -%]
   export PYTHON=python2
   $PYTHON setup.py build --build-lib build
diff --git a/projects/twisted/config b/projects/twisted/config
index 2f35166..4dbbb26 100644
--- a/projects/twisted/config
+++ b/projects/twisted/config
@@ -15,10 +15,10 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
       arch_deps:
         - p7zip-full
         - faketime
+        - wine
input_files:
   - project: container-image
diff --git a/projects/txsocksx/build b/projects/txsocksx/build
index 31d7b18..3491d11 100644
--- a/projects/txsocksx/build
+++ b/projects/txsocksx/build
@@ -18,8 +18,8 @@ mkdir vcversioner-1.14.1.1-py2.7.egg
 [% IF c("var/windows") -%]
   pydir="$distdir/python"
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
-  $PYTHON setup.py install_lib --install-dir=$(winepath -w "$pydir/Lib/site-packages")
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
+  $PYTHON setup.py install_lib --install-dir=$(wine winepath -w "$pydir/Lib/site-packages")
 [% ELSE -%]
   export PYTHON=python2
   $PYTHON setup.py build --build-lib build
diff --git a/projects/txsocksx/config b/projects/txsocksx/config
index 18fc4a8..061af53 100644
--- a/projects/txsocksx/config
+++ b/projects/txsocksx/config
@@ -17,7 +17,8 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
+      arch_deps:
+        - wine
input_files:
   - project: container-image
diff --git a/projects/winpython/build b/projects/winpython/build
index 5f53b9c..db78a0f 100644
--- a/projects/winpython/build
+++ b/projects/winpython/build
@@ -5,8 +5,8 @@ set -e
 distdir="/var/tmp/dist/[% project %]"
 mkdir -p $distdir
 WINEROOT=$HOME/.wine/drive_c
-wineboot -i
-msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir
+wine wineboot -i
+wine msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir
 sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py
 tar xf setuptools-*.tar.gz
 rm setuptools-*.tar.gz
diff --git a/projects/winpython/config b/projects/winpython/config
index dcd21f6..9f884c0 100644
--- a/projects/winpython/config
+++ b/projects/winpython/config
@@ -4,10 +4,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var:
   compiler: mingw-w64
-  post_pkginst: '[% c("var/install_wine_ppa") %]'
   arch_deps:
     - p7zip-full
     - faketime
+    - wine
   container:
     use_container: 1
   setup: |
@@ -17,7 +17,7 @@ var:
     export HOME=/var/tmp/home
     mkdir -p $HOME
     WINEROOT=$HOME/.wine/drive_c
-    wineboot -i
+    wine wineboot -i
     cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/
     export PYTHON="wine /var/tmp/dist/winpython/python.exe"
diff --git a/projects/zope.interface/build b/projects/zope.interface/build
index 29406fb..b126989 100644
--- a/projects/zope.interface/build
+++ b/projects/zope.interface/build
@@ -15,10 +15,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
   find -type f -print0 | xargs -0 [% c("var/touch") %]
   pydir="$distdir/python"
   mkdir -p $pydir/Lib/site-packages
-  export PYTHONPATH="$(winepath -w $pydir)\Lib\site-packages"
+  export PYTHONPATH="$(wine winepath -w $pydir)\Lib\site-packages"
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"
   LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32
-  $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir)
+  $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir)
   # Must create this file in order for py2exe to find the package.
   touch $pydir/Lib/site-packages/zope/__init__.py
 [% ELSE -%]
diff --git a/projects/zope.interface/config b/projects/zope.interface/config
index 4ae3cff..ffba3df 100644
--- a/projects/zope.interface/config
+++ b/projects/zope.interface/config
@@ -15,9 +15,9 @@ targets:
   windows-i686:
     var:
       compiler: winpython
-      post_pkginst: '[% c("var/install_wine_ppa") %]'
       arch_deps:
         - faketime
+        - wine
input_files:
   - project: container-image
diff --git a/rbm.conf b/rbm.conf
index 95b7447..4b4162c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -194,6 +194,7 @@ targets:
       osname: windows-x86_64
       container:
         arch: amd64
+      faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
   windows-i686:
     arch: i686
     var:
@@ -201,6 +202,7 @@ targets:
       osname: windows-i686
       container:
         arch: i386
+      faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1
       setarch: |
         if test -z "$RBM_SETARCH"
         then
@@ -212,7 +214,7 @@ targets:
     var:
       windows: 1
       container:
-        suite: precise
+        suite: jessie
       configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
       CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security'
       LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
@@ -226,34 +228,6 @@ targets:
         - libtool
         - zip
         - unzip
-      faketime_path: /usr/lib/faketime/libfaketime.so.1
-      install_wine_ppa: |
-        # Install a Wine new enough to have a fix for
-        # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under
-        # Wine constantly crashes in _PyVerify_fd, which is called by such common
-        # operations as io.open and os.fstat (anything involving a file descriptor
-        # number). Ubuntu's main repository only has wine1.4, and the issue was fixed
-        # in 1.5.29.
-        echo 'deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main' >> /etc/apt/sources.list
-        # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and
-        # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9C....
-        apt-key add - << EOF
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1
-        
-        mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAo
-        WdS7H+7Y4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxsci
-        rnag8ShrNM9PtG/vAQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0
-        IkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVz
-        lQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFqaBq75y42wflcD/jLMihWM
-        zRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0np+iOB6+PDRbyJ8GVgIjpaIbt
-        l4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCuebWU4bV1w+YBvHFF
-        qTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+
-        =Z9DY
-        -----END PGP PUBLIC KEY BLOCK-----
-        EOF
-        apt-get update
-        apt-get --no-install-recommends -y install wine
torbrowser-osx-x86_64:
     - osx-x86_64

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

[tbb-commits] [tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie