From be43027c268c458dd53ad6c211b67cf99e6e85a4 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Fri, 30 Jul 2010 10:33:57 +0200 Subject: [PATCH 1/3] * Wed Jul 28 2010 Andreas Bierfert - 1.2.0-2 - fix segfault (#617968) - enable openal-soft on el6 --- wine-preloader-segfault.patch | 11 +++++++++++ wine.spec | 30 ++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 wine-preloader-segfault.patch diff --git a/wine-preloader-segfault.patch b/wine-preloader-segfault.patch new file mode 100644 index 0000000..8988d24 --- /dev/null +++ b/wine-preloader-segfault.patch @@ -0,0 +1,11 @@ +--- wine-1.2/loader/preloader.c.atrandom 2010-07-16 17:05:45.000000000 +0200 ++++ wine-1.2/loader/preloader.c 2010-07-28 18:12:27.000000000 +0200 +@@ -519,7 +520,7 @@ static void set_auxiliary_values( ElfW(a + } + else if (new_count < delete_count) /* get rid of unused values */ + { +- int len = (char *)(av + av_count + 1) - dst; ++ int len = (char *)(av + av_count + 1) - src; + for (i = len - 1; i >= 0; i--) dst[i] = src[i]; + } + *stack = dst; diff --git a/wine.spec b/wine.spec index 848417b..5f8f818 100644 --- a/wine.spec +++ b/wine.spec @@ -1,7 +1,7 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -37,7 +37,8 @@ Patch1: wine-rpath.patch # bugfixes # fix for #593140 Patch100: wine-fonts.patch - +# fix for #617968 +Patch101: wine-preloader-segfault.patch # Patch200: wine-imagemagick-6.5.patch @@ -112,11 +113,14 @@ BuildRequires: libv4l-devel BuildRequires: fontpackages-devel BuildRequires: ImageMagick-devel -%if 0%{?fedora} > 9 -BuildRequires: icoutils +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildRequires: openal-soft-devel %endif +%if 0%{?fedora} >= 10 +BuildRequires: icoutils +%endif + Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -228,7 +232,7 @@ Requires: wine-marlett-fonts = %{version}-%{release} Requires: wine-symbol-fonts = %{version}-%{release} # intermediate fix for #593140 Requires: liberation-sans-fonts liberation-serif-fonts liberation-mono-fonts -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +%if 0%{?fedora} > 12 Requires: liberation-narrow-fonts %endif @@ -407,7 +411,7 @@ Requires: wine-core = %{version}-%{release} %description oss This package adds an oss driver for wine. -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %package openal Summary: Openal support for wine Group: System Environment/Libraries @@ -422,6 +426,7 @@ This package adds an openal driver for wine. %patch1 %patch100 +%patch101 -p1 %patch200 %patch400 -p1 %patch401 -p1 @@ -471,7 +476,7 @@ install -p -m 644 %{SOURCE201} \ # extract and install icons -%if 0%{?fedora} > 9 +%if 0%{?fedora} > 10 mkdir -p %{buildroot}%{_datadir}/pixmaps icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \ dlls/user32/resources/oic_winlogo.ico @@ -678,7 +683,7 @@ update-desktop-database &>/dev/null || : %post oss -p /sbin/ldconfig %postun oss -p /sbin/ldconfig -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %post openal -p /sbin/ldconfig %postun openal -p /sbin/ldconfig %endif @@ -1197,7 +1202,7 @@ update-desktop-database &>/dev/null || : %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 %{_datadir}/pixmaps/*png %endif @@ -1280,13 +1285,18 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/wineoss.drv.so -%if 0%{?fedora} > 9 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 %files openal %defattr(-,root,root,-) %{_libdir}/wine/openal32.dll.so %endif %changelog +* Wed Jul 28 2010 Andreas Bierfert +- 1.2.0-2 +- fix segfault (#617968) +- enable openal-soft on el6 + * Fri Jul 16 2010 Andreas Bierfert - 1.2-1 - final release From 31d92e23e83c62433c538647e301710b101cabfc Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 17 Aug 2010 13:57:57 +0200 Subject: [PATCH 2/3] - 1.3.0-1 - version upgrade --- .gitignore | 1 + sources | 2 +- wine-gecko.patch | 6 +++--- wine-preloader-segfault.patch | 11 ----------- wine.spec | 19 +++++++++++-------- 5 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 wine-preloader-segfault.patch diff --git a/.gitignore b/.gitignore index 7ffd599..e24d48c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wine-1.2.tar.bz2 +wine-1.3.0.tar.bz2 diff --git a/sources b/sources index acdae65..70e2e97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb4e5423b277fc1e77807b04f366f7b7 wine-1.2.tar.bz2 +f266536a8096f6b705f2f802549dc0e5 wine-1.3.0.tar.bz2 diff --git a/wine-gecko.patch b/wine-gecko.patch index 93ea904..03d574d 100644 --- a/wine-gecko.patch +++ b/wine-gecko.patch @@ -114,13 +114,13 @@ && !install_from_default_dir() && !silent && (url = get_url())) DialogBoxW(hInst, MAKEINTRESOURCEW(ID_DWL_DIALOG), 0, installer_proc); ---- dlls/mshtml/Makefile.in.orig 2010-03-29 15:13:47.000000000 +0200 -+++ dlls/mshtml/Makefile.in 2010-03-29 15:49:55.000000000 +0200 +--- dlls/mshtml/Makefile.in.orig 2010-08-04 22:56:36.000000000 +0200 ++++ dlls/mshtml/Makefile.in 2010-08-04 22:56:52.000000000 +0200 @@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = mshtml --IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 +-IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 shell32 EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet diff --git a/wine-preloader-segfault.patch b/wine-preloader-segfault.patch deleted file mode 100644 index 8988d24..0000000 --- a/wine-preloader-segfault.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wine-1.2/loader/preloader.c.atrandom 2010-07-16 17:05:45.000000000 +0200 -+++ wine-1.2/loader/preloader.c 2010-07-28 18:12:27.000000000 +0200 -@@ -519,7 +520,7 @@ static void set_auxiliary_values( ElfW(a - } - else if (new_count < delete_count) /* get rid of unused values */ - { -- int len = (char *)(av + av_count + 1) - dst; -+ int len = (char *)(av + av_count + 1) - src; - for (i = len - 1; i >= 0; i--) dst[i] = src[i]; - } - *stack = dst; diff --git a/wine.spec b/wine.spec index 5f8f818..e885790 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPLv2+ URL: http://www.winehq.org/ -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.3.0.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -37,8 +37,6 @@ Patch1: wine-rpath.patch # bugfixes # fix for #593140 Patch100: wine-fonts.patch -# fix for #617968 -Patch101: wine-preloader-segfault.patch # Patch200: wine-imagemagick-6.5.patch @@ -422,11 +420,10 @@ This package adds an openal driver for wine. %endif %prep -%setup -q -n %{name}-1.2 +%setup -q %patch1 %patch100 -%patch101 -p1 %patch200 %patch400 -p1 %patch401 -p1 @@ -721,7 +718,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/write.exe.so %{_libdir}/wine/dxdiag.exe.so - %ifarch %{ix86} %{_bindir}/wine %{_bindir}/wine-preloader @@ -762,6 +758,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winemenubuilder.exe.so %{_libdir}/wine/winecfg.exe.so %{_libdir}/wine/winedevice.exe.so +%{_libdir}/wine/wscript.exe.so %{_libdir}/wine/uninstaller.exe.so %{_libdir}/libwine.so.1* %{_libdir}/wine/acledit.dll.so @@ -839,6 +836,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/fltlib.dll.so %{_libdir}/wine/fusion.dll.so %{_libdir}/wine/fwpuclnt.dll.so +%{_libdir}/wine/gameux.dll.so %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so %{_libdir}/wine/glu32.dll.so @@ -910,6 +908,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/msrle32.dll.so %{_libdir}/wine/mstask.dll.so %{_libdir}/wine/msvcirt.dll.so +%{_libdir}/wine/msvcp90.dll.so %{_libdir}/wine/msvcr70.dll.so %{_libdir}/wine/msvcr71.dll.so %{_libdir}/wine/msvcr80.dll.so @@ -1292,6 +1291,10 @@ update-desktop-database &>/dev/null || : %endif %changelog +* Sat Jul 31 2010 Andreas Bierfert +- 1.3.0-1 +- version upgrade + * Wed Jul 28 2010 Andreas Bierfert - 1.2.0-2 - fix segfault (#617968) From c950f73ee42a60296b704d2625e37105037cfff6 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Tue, 17 Aug 2010 14:24:30 +0200 Subject: [PATCH 3/3] - add rundll.exe16.so to 32bit file section --- wine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wine.spec b/wine.spec index e885790..0a17ff4 100644 --- a/wine.spec +++ b/wine.spec @@ -1050,6 +1050,7 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/mmdevldr.vxd.so %{_libdir}/wine/monodebg.vxd.so +%{_libdir}/wine/rundll.exe16.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/user.exe16.so %{_libdir}/wine/vmm.vxd.so