[PC-BSD Commits] r1758 - in pbibuild/modules/wine: . overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2008-04-24 07:10:18 -0700 (Thu, 24 Apr 2008)
New Revision: 1758

Added:
   pbibuild/modules/wine/overlay-dir/bin/wine.sh
Modified:
   pbibuild/modules/wine/build.sh
   pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/wine/pbi.conf
Log:

Fixed up a hang issue with wine 0.9.60 and higher, now we import the color
theme reg file during the users first launch of wine instead of install
time. 



Modified: pbibuild/modules/wine/build.sh
===================================================================
--- pbibuild/modules/wine/build.sh	2008-04-24 13:49:08 UTC (rev 1757)
+++ pbibuild/modules/wine/build.sh	2008-04-24 14:10:18 UTC (rev 1758)
@@ -14,3 +14,8 @@
 mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
 chmod 755 ${PBIDIR}/scripts/removepbi.sh
 
+# Save the right version number in the wine.sh script
+sed -e "s,CHANGEME,Wine${PORTVER},g" ${PBIDIR}/bin/wine.sh > /tmp/wine.sh
+mv /tmp/wine.sh ${PBIDIR}/bin/wine.sh
+chmod 755 ${PBIDIR}/bin/wine.sh
+

Modified: pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh	2008-04-24 13:49:08 UTC (rev 1757)
+++ pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh	2008-04-24 14:10:18 UTC (rev 1758)
@@ -18,24 +18,5 @@
 ln -s /Programs/${PROGDIR}/.sbin/winecfg /usr/local/bin/winecfg
 ln -s /Programs/${PROGDIR}/share/wine /usr/local/share/wine
 
-# Setup the wine profiles for each user, fixing the colors at the same time
-echo "MSG: Setting up Wine profiles..."
-cd /home
-for i in `ls`
-do
+cp /Programs/${PROGDIR}/wine-theme.reg /usr/local/share/wine/wine-theme.reg
 
-  cp /Programs/${PROGDIR}/wine-theme.reg /home/${i}/.wine-theme.reg
-
-  echo "#!/bin/sh
-  DISPLAY=':0.0'
-/usr/local/bin/wine regedit /home/${i}/.wine-theme.reg
-" > ${i}/.winesetup.sh
-
-  # Now run the script to build the wine setup
-  chmod 755 ${i}/.winesetup.sh
-  su ${i} -c "sh /home/${i}/.winesetup.sh"
-
-  rm /home/${i}/.winesetup.sh
-  rm /home/${i}/.wine-theme.reg
-
-done

Added: pbibuild/modules/wine/overlay-dir/bin/wine.sh


Property changes on: pbibuild/modules/wine/overlay-dir/bin/wine.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: pbibuild/modules/wine/pbi.conf
===================================================================
--- pbibuild/modules/wine/pbi.conf	2008-04-24 13:49:08 UTC (rev 1757)
+++ pbibuild/modules/wine/pbi.conf	2008-04-24 14:10:18 UTC (rev 1758)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="16"
+BUILDKEY="06"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE