[mingw-wine-gecko] Update to 2.34

mooninite mooninite at fedoraproject.org
Wed Dec 10 04:18:01 UTC 2014


commit 840363630c22231c9fa70b1b305fdf0174561c82
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Tue Dec 9 22:18:00 2014 -0600

    Update to 2.34

 .gitignore                       |    2 +-
 mingw-wine-gecko-mozconfig.patch |   13 +++++++------
 mingw-wine-gecko.spec            |   15 +++++++--------
 sources                          |    2 +-
 wine-gecko-bug893444-v2.patch    |   27 ---------------------------
 5 files changed, 16 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1656fb6..a61c04e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wine-mozilla-2.24-src.tar.bz2
+/wine-mozilla-2.34-src.tar.bz2
diff --git a/mingw-wine-gecko-mozconfig.patch b/mingw-wine-gecko-mozconfig.patch
index 4e94a8c..89b0fd9 100644
--- a/mingw-wine-gecko-mozconfig.patch
+++ b/mingw-wine-gecko-mozconfig.patch
@@ -1,10 +1,11 @@
-diff -up wine-mozilla-2.21/wine/mozconfig-common.orig wine-mozilla-2.21/wine/mozconfig-common
---- wine-mozilla-2.21/wine/mozconfig-common.orig	2013-05-30 08:18:57.043549666 +0200
-+++ wine-mozilla-2.21/wine/mozconfig-common	2013-05-30 08:19:40.752128636 +0200
-@@ -10,9 +10,8 @@ ac_add_options --disable-necko-wifi
- ac_add_options --disable-crashreporter
- ac_add_options --disable-webgl
+diff -u wine-mozilla-2.34/wine/mozconfig-common.mozconfig wine-mozilla-2.34/wine/mozconfig-common
+--- wine-mozilla-2.34/wine/mozconfig-common.mozconfig	2014-11-30 23:45:56.459418802 -0600
++++ wine-mozilla-2.34/wine/mozconfig-common	2014-11-30 23:50:02.787462918 -0600
+@@ -12,9 +12,9 @@ ac_add_options --disable-webgl
  ac_add_options --disable-webrtc
+ ac_add_options --without-intl-api
+ ac_add_options --disable-sandbox
++ac_add_options --disable-gamepad
 +ac_add_options --enable-win32-target=WINNT
  
 -export CFLAGS="$CFLAGS -DWINE_GECKO_SRC"
diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec
index d3d7b4f..6e8bbb4 100644
--- a/mingw-wine-gecko.spec
+++ b/mingw-wine-gecko.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-wine-gecko
-Version:        2.24
-Release:        2%{?dist}
+Version:        2.34
+Release:        1%{?dist}
 Summary:        Gecko library required for Wine
 
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -10,9 +10,6 @@ Group:          Development/Libraries
 URL:            http://wiki.winehq.org/Gecko
 Source0:        http://downloads.sourceforge.net/wine/wine-mozilla-%{version}-src.tar.bz2
 Patch0:         %{name}-mozconfig.patch
-# Fix FTBFS which occurs when winpthreads is available
-# https://bugzilla.mozilla.org/show_bug.cgi?id=893444
-Patch1:         wine-gecko-bug893444-v2.patch
 BuildArch:      noarch
 
 # 64
@@ -62,13 +59,12 @@ Windows Gecko library required for Wine.
 
 cd wine-mozilla-%{version}
 %patch0 -p1 -b.mozconfig
-%patch1 -p1 -b.winpthreads
 
 # fix nsprpub cross compile detection
 sed -i 's,cross_compiling=.*$,cross_compiling=yes,' nsprpub/configure
 
-# include missing propvarutil.h from wine
-ln -s %{_includedir}/wine/windows/propvarutil.h widget/windows
+# remove blank includes
+rm -f media/libstagefright/ports/win32/include/pthread.h
 
 %build
 cd wine-mozilla-%{version}
@@ -106,6 +102,9 @@ install -p -m 0644 wine_gecko-%{version}-x86_64/dist/wine_gecko-%{version}-x86_6
 %{_datadir}/wine/gecko/wine_gecko-%{version}-x86_64.msi
 
 %changelog
+* Tue Dec 09 2014 Michael Cronenworth <mike at cchtml.com> - 2.34-1
+- version upgrade
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b60db9a..cc9ac35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6da468ee801a881f6e20c28d4de57672  wine-mozilla-2.24-src.tar.bz2
+2a48b7abae0684e7280883c25a298ebd  wine-mozilla-2.34-src.tar.bz2


More information about the scm-commits mailing list