r12629 - packages/trunk/playonlinux/debian/patches

Bertrand Marc bbk-guest at alioth.debian.org
Sun Aug 21 17:01:30 UTC 2011


Author: bbk-guest
Date: 2011-08-21 17:01:30 +0000 (Sun, 21 Aug 2011)
New Revision: 12629

Modified:
   packages/trunk/playonlinux/debian/patches/mscorefonts.diff
   packages/trunk/playonlinux/debian/patches/series
Log:
Refresh patches/mscorefonts.diff

Modified: packages/trunk/playonlinux/debian/patches/mscorefonts.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2011-08-21 16:39:47 UTC (rev 12628)
+++ packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2011-08-21 17:01:30 UTC (rev 12629)
@@ -1,68 +1,32 @@
---- a/lib/main
-+++ b/lib/main
-@@ -115,12 +115,46 @@
- 		$PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1" "$2"
- 	fi
- }
-+install_debfonts()
+--- a/bash/first_use
++++ b/bash/first_use
+@@ -23,6 +23,18 @@
+ 
+ export XQUARTZ_VERSION="2.6.3"
+ 
++fonts_install () # Debian tweak to avoid downloading Microsoft Fonts
 +{
-+	if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ]
++	if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ]
 +	then
-+		DEBFONTS="/usr/share/fonts/truetype/msttcorefonts"
-+		if [ -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ ! -d $DEBFONTS ]
-+		then
-+			rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null
-+			rm $HOME/.PlayOnLinux/fonts 2> /dev/null
-+			rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null
-+			rm $HOME/.PlayOnLinux/configurations/msfonts_deb_installed 2> /dev/null
-+		fi
-+		if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ -d $DEBFONTS ]
-+		then
-+			rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null
-+			rm $HOME/.PlayOnLinux/fonts 2> /dev/null
-+			rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null
-+			FONTDIR=$HOME/.PlayOnLinux/fonts/
-+			mkdir -p $FONTDIR
-+			OLDDIR="$PWD"
-+			cd $DEBFONTS
-+			for ttf in *
-+			do
-+				ln -s $DEBFONTS/$ttf $FONTDIR/$ttf
-+			done
-+			cd $OLDDIR
-+			touch "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed"
-+		fi
-+	fi
-+}
- fonts_install()
- {
--	if [ ! "$DEJADIS" == "True" ]
-+	if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ] && [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ]
- 	then
--		export DEJADIS="True"
--		(sleep 1 && install_fonts)&
 +		FONTS_WARNING="Microsoft fonts aren't installed.\n\n\
-+If you encounter any fonts trouble, you should think about installing\
++ If you encounter any fonts trouble, you should think about installing\
 + the debian package\nttf-mscorefonts-installer (see README.Debian)."
 +		POL_SetupWindow_Init "$PLAYONLINUX/etc/setups/fonts/top.png"
 +		POL_SetupWindow_message "$FONTS_WARNING" "Microsoft fonts"
 +		POL_SetupWindow_Close
- 	fi
- }
- install_fonts ()
-@@ -349,13 +383,14 @@
++ 	fi
++}
  
- 	cfg_check 
- 	construire_repertoire_personnel
-+	install_debfonts
- 	if [ ! -d "$HOME/.PlayOnLinux/configurations/listes" ]
- 	then
- 		maj_check --first
-+		sleep 1 && fonts_install
- 	else
- 		bash "$PLAYONLINUX/bash/check_maj_" &
- 	fi
--	fonts_install
- 	install_plugins
+ install_fonts () # Install Microsoft Fonts
+ {
+
+@@ -276,8 +286,8 @@
+ POL_SetupWindow_free_presentation "$(eval_gettext '$APPLICATION_TITLE first use')" "$(eval_gettext 'It appears it is the first time you are using $APPLICATION_TITLE.')\n$(eval_gettext 'This wizard will help you prepare $APPLICATION_TITLE environement')\n$(eval_gettext "Please ensure you are connected to the internet.")"
  
- 	check_new_pol
+ [ "$POL_OS" == "Mac" ] && [ ! -e "/Applications/Utilities/XQuartz.app" ] && [ "$OSX_VERSION" = "10" ] &&  install_x11
+-install_fonts
++fonts_install
+ install_prefix
+ POL_SetupWindow_message "$(eval_gettext 'Thank you for using $APPLICATION_TITLE')" "$(eval_gettext '$APPLICATION_TITLE first use')"
+ POL_SetupWindow_Close
+ $(POL_Config_Write FIRST_USE TRUE)

Modified: packages/trunk/playonlinux/debian/patches/series
===================================================================
--- packages/trunk/playonlinux/debian/patches/series	2011-08-21 16:39:47 UTC (rev 12628)
+++ packages/trunk/playonlinux/debian/patches/series	2011-08-21 17:01:30 UTC (rev 12629)
@@ -1,2 +1,3 @@
 locale.diff
 x-terminal-emulator.diff
+mscorefonts.diff




More information about the Pkg-games-commits mailing list