r12619 - packages/trunk/playonlinux/debian/patches

[Bertrand Marc]

Author: bbk-guest
Date: 2011-08-21 14:13:14 +0000 (Sun, 21 Aug 2011)
New Revision: 12619

Modified:
   packages/trunk/playonlinux/debian/patches/locale.diff
   packages/trunk/playonlinux/debian/patches/series
   packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff
Log:
Refresh patches

Modified: packages/trunk/playonlinux/debian/patches/locale.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/locale.diff	2011-08-21 13:46:15 UTC (rev 12618)
+++ packages/trunk/playonlinux/debian/patches/locale.diff	2011-08-21 14:13:14 UTC (rev 12619)
@@ -1,26 +1,25 @@
 --- a/lib/variables
 +++ b/lib/variables
-@@ -88,7 +88,6 @@
- fi
+@@ -27,7 +27,6 @@
+ if [ ! "$NOGETTEXT" = "TRUE" ]
+ then
  
- ### Language
 -export TEXTDOMAINDIR="$PLAYONLINUX/lang/locale/"
  export TEXTDOMAIN="pol"
  . gettext.sh
- 
+ eval_gettext > /dev/null || eval_gettext() { printf "$@"; }
 --- a/python/lib/lng.py
 +++ b/python/lib/lng.py
-@@ -6,11 +6,10 @@
- import locale, string, wx
- class Lang(object):
- 	def __init__(self):
--		languages = os.listdir(Variables.playonlinux_env+'/lang/locale')
-+		languages = os.listdir('/usr/share/locale')
+@@ -26,10 +26,10 @@
  
- 		langid = wx.LANGUAGE_DEFAULT
--		basepath = os.popen("printf \"$PLAYONLINUX\"","r").read()
--		localedir = os.path.join(basepath, "lang/locale")
-+		localedir = "/usr/share/locale"
- 		domain = "pol"
- 		mylocale = wx.Locale(langid)
- 		mylocale.AddCatalogLookupPathPrefix(localedir)
+ class iLang(object):
+ 	def __init__(self):
+-			languages = os.listdir(Variables.playonlinux_env+'/lang/locale')
++			languages = os.listdir('/usr/share/locale')
+ 			
+ 			langid = wx.LANGUAGE_DEFAULT
+-			localedir = os.path.join(Variables.playonlinux_env, "lang/locale")
++			localedir = "/usr/share/locale"
+ 			domain = "pol"
+ 			mylocale = wx.Locale(langid)
+ 			mylocale.AddCatalogLookupPathPrefix(localedir)

Modified: packages/trunk/playonlinux/debian/patches/series
===================================================================
--- packages/trunk/playonlinux/debian/patches/series	2011-08-21 13:46:15 UTC (rev 12618)
+++ packages/trunk/playonlinux/debian/patches/series	2011-08-21 14:13:14 UTC (rev 12619)
@@ -1,3 +1,2 @@
-mscorefonts.diff
 locale.diff
 x-terminal-emulator.diff

Modified: packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff	2011-08-21 13:46:15 UTC (rev 12618)
+++ packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff	2011-08-21 14:13:14 UTC (rev 12619)
@@ -3,56 +3,30 @@
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +x-terminal-emulator -e "$@"
---- a/lib/check_depend
-+++ b/lib/check_depend
-@@ -45,7 +45,6 @@
+--- a/lib/depend.lib
++++ b/lib/depend.lib
+@@ -57,7 +57,6 @@
+ 	check_one wget "wget"
  	check_one wine "wine"
  	check_one unzip "unzip"
- 	check_one ar "binutils" 
 -	check_one xterm "xterm"
  	check_one convert "imagemagick"
  	check_one cabextract "cabextract" 
- 	check_one cabextract "cabextract" 
+ 	check_one gpg "gnupg"
 --- a/lib/variables
 +++ b/lib/variables
-@@ -57,14 +57,14 @@
- fi	
+@@ -18,7 +18,7 @@
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
  
  ### Terminal
 -export POL_TERM="xterm"
 +export POL_TERM="Default"
- if [ -e "$REPERTOIRE/configurations/options/terminal" ]
- then
- 	export POL_TERM=$(cat $REPERTOIRE/configurations/options/terminal)
- fi
- if [ $POL_TERM = "" ]
- then
--	export POL_TERM="xterm"
-+	export POL_TERM="Default"
- fi
  
  ### Desktop
-@@ -84,7 +84,7 @@
- fi
- if [ $POL_TERM = "" ]
- then
--	export POL_TERM="xterm"
-+	export POL_TERM="Default"
- fi
- 
- ### Language
-@@ -139,7 +139,7 @@
- 
- if [ $POL_TERM = "" ]
- then
--	export POL_TERM="xterm"
-+	export POL_TERM="Default"
- fi
- 
- export POL_LANG=$(echo "$LANG" | cut -d\_ -f 1)
+ [ "$(which xdg-user-dir)" ] && export DESKTOP="$(xdg-user-dir DESKTOP)" || export DESKTOP="$HOME/Desktop"
 --- a/python/options.py
 +++ b/python/options.py
-@@ -106,7 +106,7 @@
+@@ -113,7 +113,7 @@
  		if(os.path.exists(Variables.playonlinux_rep+"/configurations/options/terminal")):
  			default_terminal = open(Variables.playonlinux_rep+"/configurations/options/terminal","r").read()
  		else: