[mingw-wine-gecko] - initial import (review bug rhbz#577951)

Andreas Bierfert awjb at fedoraproject.org
Wed Mar 21 15:20:18 UTC 2012


commit 995ec0e673f6a6f7784d83f2597feb2cca1d14f4
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Mar 21 16:17:17 2012 +0100

    - initial import (review bug rhbz#577951)

 .gitignore                       |    1 +
 mingw-wine-gecko-mozconfig.patch |   22 ++++++
 mingw-wine-gecko.spec            |  137 ++++++++++++++++++++++++++++++++++++++
 sources                          |    1 +
 4 files changed, 161 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..87a49d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wine-mozilla-1.5-src.tar.bz2
diff --git a/mingw-wine-gecko-mozconfig.patch b/mingw-wine-gecko-mozconfig.patch
new file mode 100644
index 0000000..5045edf
--- /dev/null
+++ b/mingw-wine-gecko-mozconfig.patch
@@ -0,0 +1,22 @@
+--- wine-mozilla-1.5/wine/mozconfig-common.orig	2012-03-19 20:01:33.259651526 +0100
++++ wine-mozilla-1.5/wine/mozconfig-common	2012-03-19 20:03:08.103659235 +0100
+@@ -7,7 +7,7 @@
+ if test -z "$WINE_GECKO_OBJDIR"
+ then
+     echo "WARNING: WINE_GECKO_OBJDIR not set"
+-    WINE_GECKO_OBJDIR=@TOPSRCDIR@/../wine_gecko
++    WINE_GECKO_OBJDIR=@TOPSRCDIR@/wine_gecko
+ fi
+ mk_add_options MOZ_OBJDIR=$WINE_GECKO_OBJDIR
+ 
+@@ -20,9 +20,8 @@
+ ac_add_options --disable-necko-wifi
+ ac_add_options --disable-crashreporter
+ ac_add_options --disable-angle
++ac_add_options --enable-win32-target=WINNT
+ 
+ mk_add_options MOZ_MAKE_FLAGS="$MAKEOPTS"
+ 
+ export LDFLAGS="-static-libgcc -static-libstdc++"
+-export CFLAGS="-DWINE_GECKO_SRC"
+-export CXXFLAGS="$CFLAGS"
diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec
new file mode 100644
index 0000000..25561f7
--- /dev/null
+++ b/mingw-wine-gecko.spec
@@ -0,0 +1,137 @@
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
+
+Name:           mingw-wine-gecko
+Version:        1.5
+Release:        1%{?dist}
+Summary:        Gecko library required for Wine
+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
+Group:          Development/Libraries
+URL:            http://wiki.winehq.org/Gecko
+Source0:        http://downloads.sourceforge.net/wine/wine-mozilla-%{version}-src.tar.bz2
+Patch0:         mingw-wine-gecko-mozconfig.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+
+# 64
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-headers
+BuildRequires:  mingw64-cpp
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-crt
+# 32
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-headers
+BuildRequires:  mingw32-cpp
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw32-crt
+
+BuildRequires:  autoconf213
+BuildRequires:  pkgconfig
+BuildRequires:  yasm
+BuildRequires:  zip
+BuildRequires:  wine-core(x86-32) wine-wow(x86-32)
+BuildRequires:  wine-devel
+
+%description
+Windows Gecko library required for Wine.
+
+%package -n mingw32-wine-gecko
+Summary:       Gecko library for 32bit wine
+Requires:      wine-common
+
+%description -n mingw32-wine-gecko
+Windows Gecko library required for Wine.
+
+%package -n mingw64-wine-gecko
+Summary:       Gecko library for 64bit wine
+Requires:      wine-common
+
+%description -n mingw64-wine-gecko
+Windows Gecko library required for Wine.
+
+
+%prep
+%setup -q -c
+
+cd wine-mozilla-%{version}
+%patch0 -p1 -b.mozconfig
+
+# 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/src/windows
+
+%build
+cd wine-mozilla-%{version}
+
+# setup build options...
+echo "mk_add_options MOZ_MAKE_FLAGS=%{_smp_mflags}" >> wine/mozconfig-common
+
+cp wine/mozconfig-common wine/mozconfig-common.build
+
+echo "export CFLAGS=\"-DWINE_GECKO_SRC\"" >> wine/mozconfig-common
+echo "export CXXFLAGS=\"\$CFLAGS -fpermissive\"" >> wine/mozconfig-common
+
+# ... and build
+./wine/make_package --msi-package -win32
+
+./wine/make_package --msi-package -win64
+
+%install
+mkdir -p %{buildroot}%{_datadir}/wine/gecko
+install -p -m 0644 wine_gecko-%{version}-x86/dist/wine_gecko-%{version}-x86.msi \
+   %{buildroot}%{_datadir}/wine/gecko/wine_gecko-%{version}-x86.msi
+install -p -m 0644 wine_gecko-%{version}-x86_64/dist/wine_gecko-%{version}-x86_64.msi \
+   %{buildroot}%{_datadir}/wine/gecko/wine_gecko-%{version}-x86_64.msi
+
+%files -n mingw32-wine-gecko
+%doc wine-mozilla-%{version}/LEGAL
+%doc wine-mozilla-%{version}/LICENSE
+%doc wine-mozilla-%{version}/README.txt
+%{_datadir}/wine/gecko/wine_gecko-%{version}-x86.msi
+
+%files -n mingw64-wine-gecko
+%doc wine-mozilla-%{version}/LEGAL
+%doc wine-mozilla-%{version}/LICENSE
+%doc wine-mozilla-%{version}/README.txt
+%{_datadir}/wine/gecko/wine_gecko-%{version}-x86_64.msi
+
+%changelog
+* Mon Mar 19 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.0-1
+- version upgrade
+- spec cleanup
+
+* Tue Jun 21 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2.0-3
+- add suggestions from #577951c21
+
+* Mon Jun 20 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2.0-2
+- rework to mingw framework
+
+* Fri Mar 25 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.2.0-1
+- version upgrade
+- switch to cross framework
+
+* Mon Mar 29 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0.0-3
+- adjust path for latest wine
+- requires wine-common for /usr/share/wine
+
+* Tue Nov 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0.0-2
+- include version in install dir
+
+* Tue Nov 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org>
+- 1.0.0-1
+- Initial release
diff --git a/sources b/sources
index e69de29..d3f870c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e1d9ba8914582d382b808332e4db0a54  wine-mozilla-1.5-src.tar.bz2


More information about the scm-commits mailing list