OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2006 10:44:56
Branch: HEAD Handle: 2006011209445600
Modified files:
openpkg-src/wine wine.patch wine.spec
Log:
upgrading package: wine 0.9.3 -> 0.9.5
Summary:
Revision Changes Path
1.16 +15 -40 openpkg-src/wine/wine.patch
1.48 +2 -2 openpkg-src/wine/wine.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wine/wine.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 wine.patch
--- openpkg-src/wine/wine.patch 12 Nov 2005 19:28:16 -0000 1.15
+++ openpkg-src/wine/wine.patch 12 Jan 2006 09:44:56 -0000 1.16
@@ -1,32 +1,18 @@
-Index: dlls/ntdll/virtual.c
---- dlls/ntdll/virtual.c.orig 2005-09-26 11:57:38 +0200
-+++ dlls/ntdll/virtual.c 2005-10-27 10:21:46 +0200
-@@ -118,6 +118,12 @@
- /* Note: these are Windows limits, you cannot change them. */
- # define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total
available address space */
- # define USER_SPACE_LIMIT ((void *)0x80000000) /* top of the user
address space */
-+# ifdef __FreeBSD__
-+# define LOW_SPACE_LIMIT ((void *)0x110000) /* lower address space
limit */
-+# else
-+# define LOW_SPACE_LIMIT NULL
-+# endif
-+
- #else
- static UINT page_shift;
- static UINT page_size;
-@@ -619,7 +625,7 @@
+Index: include/winternl.h
+--- include/winternl.h.orig 2006-01-04 17:05:13 +0100
++++ include/winternl.h 2006-01-12 10:23:21 +0100
+@@ -22,6 +22,7 @@
+ #define __WINE_WINTERNL_H
- for (;;)
- {
-- if ((ptr = wine_anon_mmap( NULL, view_size,
VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
-+ if ((ptr = wine_anon_mmap( LOW_SPACE_LIMIT, view_size,
VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
- {
- if (errno == ENOMEM) return STATUS_NO_MEMORY;
- return STATUS_INVALID_PARAMETER;
+ #include <windef.h>
++#include <stdarg.h>
+
+ #ifdef __cplusplus
+ extern "C" {
Index: programs/Makefile.in
---- programs/Makefile.in.orig 2005-07-12 22:41:52 +0200
-+++ programs/Makefile.in 2005-10-27 10:21:46 +0200
-@@ -33,7 +33,6 @@
+--- programs/Makefile.in.orig 2006-01-04 17:05:16 +0100
++++ programs/Makefile.in 2006-01-12 10:23:21 +0100
+@@ -35,7 +35,6 @@
winemenubuilder \
winemine \
winepath \
@@ -34,7 +20,7 @@
winevdm \
winhelp \
winver
-@@ -65,7 +64,6 @@
+@@ -69,7 +68,6 @@
winemenubuilder \
winemine \
winepath \
@@ -42,7 +28,7 @@
winevdm \
winhelp \
winver
-@@ -120,7 +118,6 @@
+@@ -126,7 +124,6 @@
winemenubuilder.exe$(DLLEXT) \
winemine.exe$(DLLEXT) \
winepath.exe$(DLLEXT) \
@@ -50,14 +36,3 @@
winevdm.exe$(DLLEXT) \
winhelp.exe$(DLLEXT) \
winver.exe$(DLLEXT)
-Index: include/winternl.h
---- include/winternl.h.orig 2005-11-07 12:14:45 +0100
-+++ include/winternl.h 2005-11-12 20:05:19 +0100
-@@ -22,6 +22,7 @@
- #define __WINE_WINTERNL_H
-
- #include <windef.h>
-+#include <stdarg.h>
-
- #ifdef __cplusplus
- extern "C" {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wine/wine.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 wine.spec
--- openpkg-src/wine/wine.spec 1 Jan 2006 13:23:59 -0000 1.47
+++ openpkg-src/wine/wine.spec 12 Jan 2006 09:44:56 -0000 1.48
@@ -32,8 +32,8 @@
Class: EVAL
Group: XWindow
License: LGPL
-Version: 0.9.3
-Release: 20051208
+Version: 0.9.5
+Release: 20060112
# list of sources
Source0:
http://ibiblio.org/pub/linux/system/emulators/wine/wine-%{version}.tar.bz2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
