This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 57eceda99171ec7e788c86e7999ec0b47c622c67 Author: Bertrand Marc <[email protected]> Date: Sun Aug 21 17:20:58 2011 +0000 Refresh patches/mscorefonts.diff --- debian/patches/mscorefonts.diff | 57 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/debian/patches/mscorefonts.diff b/debian/patches/mscorefonts.diff index dccf9ed..982bf5d 100644 --- a/debian/patches/mscorefonts.diff +++ b/debian/patches/mscorefonts.diff @@ -1,6 +1,6 @@ --- a/bash/first_use +++ b/bash/first_use -@@ -23,6 +23,18 @@ +@@ -23,6 +23,17 @@ export XQUARTZ_VERSION="2.6.3" @@ -11,7 +11,6 @@ + FONTS_WARNING="Microsoft fonts aren't installed.\n\n\ + 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 @@ -19,7 +18,7 @@ install_fonts () # Install Microsoft Fonts { -@@ -276,8 +288,8 @@ +@@ -276,7 +287,7 @@ 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.")" [ "$POL_OS" == "Mac" ] && [ ! -e "/Applications/Utilities/XQuartz.app" ] && [ "$OSX_VERSION" = "10" ] && install_x11 @@ -28,6 +27,52 @@ 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) -\ No newline at end of file -+$(POL_Config_Write FIRST_USE TRUE) +--- a/bash/startup ++++ b/bash/startup +@@ -22,6 +22,39 @@ + [ "$PLAYONLINUX" = "" ] && exit 0 + source "$PLAYONLINUX/lib/sources" + ++install_debfonts () # 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 ++} ++ ++ + # POL / POM won't work without that + construire_repertoire_personnel + # Initialize link between python and bash +@@ -43,5 +76,6 @@ + fi + fi + ++install_debfonts + # First use ? + [ "$(POL_Config_Read FIRST_USE)" = "" ] && bash "$PLAYONLINUX/bash/first_use" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
