OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Dec-2004 12:43:27
Branch: HEAD Handle: 2004122411432700
Modified files:
openpkg-src/wine wine.patch wine.spec winesetup.sh
Log:
1. fix run-time under FreeBSD by applying an important
ports-collection patch; 2. adjust winesetup for latest Wine world
order (where wineprefixcreate exists)
Summary:
Revision Changes Path
1.13 +25 -0 openpkg-src/wine/wine.patch
1.32 +1 -1 openpkg-src/wine/wine.spec
1.6 +18 -81 openpkg-src/wine/winesetup.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wine/wine.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 wine.patch
--- openpkg-src/wine/wine.patch 14 Aug 2004 06:59:18 -0000 1.12
+++ openpkg-src/wine/wine.patch 24 Dec 2004 11:43:27 -0000 1.13
@@ -38,3 +38,28 @@
winevdm.exe$(DLLEXT) \
winhelp.exe$(DLLEXT) \
winver.exe$(DLLEXT)
+Index: dlls/ntdll/virtual.c
+--- dlls/ntdll/virtual.c 11 Oct 2004 20:59:06 -0000 1.41
++++ dlls/ntdll/virtual.c 3 Dec 2004 04:06:42 -0000
+@@ -119,6 +119,12 @@ static CRITICAL_SECTION csVirtual = { &c
+ /* 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_mask;
+@@ -600,7 +606,7 @@ static NTSTATUS map_view( struct file_vi
+
+ 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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wine/wine.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 wine.spec
--- openpkg-src/wine/wine.spec 2 Dec 2004 08:03:58 -0000 1.31
+++ openpkg-src/wine/wine.spec 24 Dec 2004 11:43:27 -0000 1.32
@@ -34,7 +34,7 @@
Group: XWindow
License: LGPL
Version: 20041201
-Release: 20041202
+Release: 20041224
# list of sources
Source0:
http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/Wine-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wine/winesetup.sh
============================================================================
$ cvs diff -u -r1.5 -r1.6 winesetup.sh
--- openpkg-src/wine/winesetup.sh 13 Sep 2003 12:44:51 -0000 1.5
+++ openpkg-src/wine/winesetup.sh 24 Dec 2004 11:43:27 -0000 1.6
@@ -5,92 +5,29 @@
# configuration
l_prefix="@l_prefix@"
-
-# create important directory structure under $HOME/.wine
umask 022
-for dir in \
- "$HOME/.wine" \
- "$HOME/.wine/c_drive" \
- "$HOME/.wine/c_drive/Windows" \
- "$HOME/.wine/c_drive/Windows/Command" \
- "$HOME/.wine/c_drive/Windows/Fonts" \
- "$HOME/.wine/c_drive/Windows/Start Menu" \
- "$HOME/.wine/c_drive/Windows/Start Menu/Programs" \
- "$HOME/.wine/c_drive/Windows/Start Menu/Programs/Startup" \
- "$HOME/.wine/c_drive/Windows/System" \
- "$HOME/.wine/c_drive/Windows/System32" \
- "$HOME/.wine/c_drive/Windows/Profiles" \
- "$HOME/.wine/c_drive/Windows/Profiles/Administrator" \
- "$HOME/.wine/c_drive/Windows/Temp" \
- "$HOME/.wine/c_drive/Program Files" \
- "$HOME/.wine/c_drive/Program Files/Common Files"; \
-do
- if [ ! -d "$dir" ]; then
- echo "++ creating directory \"$dir\""
- mkdir "$dir"
- fi
-done
-
-# install important configuration file
-if [ ! -f "$HOME/.wine/config" ]; then
- echo "++ creating file \"$HOME/.wine/config\""
- sed -e 's;Drive E;Drive T;' \
- -e 's;Drive F;Drive U;' \
- -e 's;Drive Z;Drive R;' \
- -e '/^\[Drive C\]/,/^$/s/"\/c"/"%HOME%\/.wine\/c_drive"/' \
- -e '/^\[Drive R\]/,/^$/s/"hd"/"network"/' \
- -e '/^\[wine\]/,/^$/s/e:/t:/g' \
- -e '/^\[wine\]/,/^$/s/f:/u:/g' \
- <$l_prefix/share/wine/config >$HOME/.wine/config
-fi
-# install important system files
-if [ ! -f "$HOME/.wine/c_drive/Windows/system.ini" ]; then
- echo "++ creating file \"$HOME/.wine/c_drive/Windows/system.ini\""
- cp $l_prefix/share/wine/system.ini $HOME/.wine/c_drive/Windows/system.ini
-fi
-if [ ! -f "$HOME/.wine/c_drive/Windows/win.ini" ]; then
- echo "++ creating file \"$HOME/.wine/c_drive/Windows/win.ini\""
- cp $l_prefix/share/wine/win.ini $HOME/.wine/c_drive/Windows/win.ini
-fi
-if [ ! -f "$HOME/.wine/c_drive/Windows/generic.ppd" ]; then
- echo "++ creating file \"$HOME/.wine/c_drive/Windows/generic.ppd\""
- cp $l_prefix/share/wine/generic.ppd
$HOME/.wine/c_drive/Windows/generic.ppd
+# check existence of $HOME/.wine/ to make
+# sure an existing setup is not destroyed
+if [ -d $HOME/.wine/ ]; then
+ echo "winesetup:ERROR: \"$HOME/.wine/\" already exists" 1>&2
+ exit 1
fi
-# install application links
-link_app () {
- if [ ! -f $2 ]; then
- echo "++ installing application \"$2\""
- ln -s $l_prefix/lib/wine/$1.exe.so $2
- fi
-}
-link_app start $HOME/.wine/c_drive/Windows/Command/start.exe
-link_app notepad $HOME/.wine/c_drive/Windows/notepad.exe
-link_app regedit $HOME/.wine/c_drive/Windows/regedit.exe
-link_app rundll32 $HOME/.wine/c_drive/Windows/rundll32.exe
-link_app wcmd $HOME/.wine/c_drive/Windows/System/wcmd.exe
-link_app control $HOME/.wine/c_drive/Windows/System/control.exe
-link_app winhelp $HOME/.wine/c_drive/Windows/System/help.exe
-link_app notepad $HOME/.wine/c_drive/Windows/System/notepad.exe
-link_app progman $HOME/.wine/c_drive/Windows/System/progman.exe
-link_app regsvr32 $HOME/.wine/c_drive/Windows/System/regsvr32.exe
-link_app winemine $HOME/.wine/c_drive/Windows/System/winmine.exe
-link_app winver $HOME/.wine/c_drive/Windows/System/winver.exe
-link_app user $HOME/.wine/c_drive/Windows/System/user.exe
-link_app uninstaller $HOME/.wine/c_drive/Windows/uninstall.exe
-link_app winhelp $HOME/.wine/c_drive/Windows/winhelp.exe
-link_app winhelp $HOME/.wine/c_drive/Windows/winhlp32.exe
+# create important directory structure under $HOME/.wine/,
+# install default registry entries, and add initial applications
+echo "winesetup: creating directory hierarchy \"$HOME/.wine/\""
+$l_prefix/bin/wineprefixcreate 2>/dev/null
-# install default registry entries
-if [ ! -f $HOME/.wine/system.reg ]; then
- echo "++ installing initial registry"
- $l_prefix/bin/regedit $l_prefix/share/wine/winedefault.reg
+# install default Wine user configuration file
+if [ ! -f "$HOME/.wine/config" ]; then
+ echo "winesetup: creating file \"$HOME/.wine/config\""
+ cp $l_prefix/share/wine/config $HOME/.wine/config
fi
-# run an initial Windows application for enforcing the
-# a default registry entries
-echo "++ running WINE configuration utility"
-echo " (be patient, it enforces font scanning)"
-$l_prefix/bin/winecfg
+# install more system files
+if [ ! -f "$HOME/.wine/drive_c/windows/generic.ppd" ]; then
+ echo "winesetup: creating file
\"$HOME/.wine/drive_c/windows/generic.ppd\""
+ cp $l_prefix/share/wine/generic.ppd
$HOME/.wine/drive_c/windows/generic.ppd
+fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
