Add patch to fix unicode problems thanks to Guillaume Ramelet <guillaume.ramelet@gmail.com> in bug 147094

Package-Manager: portage-2.1.1

4 files changed, 38 insertions, 13 deletions

diff --git a/media-gfx/picasa/ChangeLog b/media-gfx/picasa/ChangeLog
index 4eb5b4f5ba2f..e759a41720ca 100644
--- a/media-gfx/picasa/ChangeLog
+++ b/media-gfx/picasa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/picasa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.5 2006/06/15 02:02:40 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/ChangeLog,v 1.6 2006/09/13 00:16:40 genstef Exp $
+
+  13 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/picasa-unicode.patch, picasa-2.2.2820.5.ebuild:
+  Add patch to fix unicode problems thanks to Guillaume Ramelet
+  <guillaume.ramelet@gmail.com> in bug 147094
 
   15 Jun 2006; Scott Stoddard <deltacow@gentoo.org>
   picasa-2.2.2820.5.ebuild:
diff --git a/media-gfx/picasa/Manifest b/media-gfx/picasa/Manifest
index 4c59f4d7defa..9f93d4377128 100644
--- a/media-gfx/picasa/Manifest
+++ b/media-gfx/picasa/Manifest
@@ -1,12 +1,16 @@
+AUX picasa-unicode.patch 585 RMD160 33b141ccd933f36dbca0cb0ddfc743591a320dfe SHA1 5b39f1355a5be0961f3808e2ff8d56b22cf3ee24 SHA256 faaa7498cea796c068712043df37b4f2070c8d6cc7bdd0e997bad5174ee3e12f
+MD5 df68537c8b5f4ebcfa34ec9419f62fc6 files/picasa-unicode.patch 585
+RMD160 33b141ccd933f36dbca0cb0ddfc743591a320dfe files/picasa-unicode.patch 585
+SHA256 faaa7498cea796c068712043df37b4f2070c8d6cc7bdd0e997bad5174ee3e12f files/picasa-unicode.patch 585
 DIST picasa-2.2.2820-5.i386.bin 26872893 RMD160 f36c43bbe83f14fbfccd98ebb53fbc316d645945 SHA1 8355e33400cfd1d7d389348455a56e45e0cd2e91 SHA256 a96203833ba333fad3dcae60eab539cc07472851be34fdddbb7d63d7c82bc63d
-EBUILD picasa-2.2.2820.5.ebuild 2391 RMD160 1762f029f51ee2c1559aa12dc03052f8a726d215 SHA1 de268a7d6f75906c1f07cbe45bc2decea368146e SHA256 9c26cf8ca5b8c132a6d8ed46f433d4a4bb57f61f32dc61a9a01a1dca74b298a7
-MD5 f66d874342896fbbb8c68f3164ad03a8 picasa-2.2.2820.5.ebuild 2391
-RMD160 1762f029f51ee2c1559aa12dc03052f8a726d215 picasa-2.2.2820.5.ebuild 2391
-SHA256 9c26cf8ca5b8c132a6d8ed46f433d4a4bb57f61f32dc61a9a01a1dca74b298a7 picasa-2.2.2820.5.ebuild 2391
-MISC ChangeLog 806 RMD160 b1edeee5d767a61e6fcda318612a899b55ab3f52 SHA1 27146d50c28b1574021495ed3d2e27430f97bf90 SHA256 1211ff31cfaf0a9f471800b0d956e3abd12a6f9f12d0fd6e4d3b0a92ec49ab30
-MD5 a268ee2140149e6a84203c8e03366393 ChangeLog 806
-RMD160 b1edeee5d767a61e6fcda318612a899b55ab3f52 ChangeLog 806
-SHA256 1211ff31cfaf0a9f471800b0d956e3abd12a6f9f12d0fd6e4d3b0a92ec49ab30 ChangeLog 806
+EBUILD picasa-2.2.2820.5.ebuild 2379 RMD160 c26d8fa425d57de474e720b029a2e0dcd8122b6c SHA1 011d162cfd369038b2d04e8fb0754b0bdec2ac3e SHA256 9278cd5f2e9a2a3b1c2dc2d7f00b29013c0da30069631456fd864968dbc1c317
+MD5 87d858c1601b3a098eb914ebb35943f7 picasa-2.2.2820.5.ebuild 2379
+RMD160 c26d8fa425d57de474e720b029a2e0dcd8122b6c picasa-2.2.2820.5.ebuild 2379
+SHA256 9278cd5f2e9a2a3b1c2dc2d7f00b29013c0da30069631456fd864968dbc1c317 picasa-2.2.2820.5.ebuild 2379
+MISC ChangeLog 1026 RMD160 9d45e3cadb5b313143bfad0731a426389ae6df79 SHA1 5e51c6e14d542a82e97a85b8676286e01428950b SHA256 b9b0cdee0bd99dc17da48f3e4af8d99ecbd0c115a4ca386913a8f010d62dcf4f
+MD5 911e01238d98b7b39d48142300030a87 ChangeLog 1026
+RMD160 9d45e3cadb5b313143bfad0731a426389ae6df79 ChangeLog 1026
+SHA256 b9b0cdee0bd99dc17da48f3e4af8d99ecbd0c115a4ca386913a8f010d62dcf4f ChangeLog 1026
 MISC metadata.xml 304 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 SHA1 9776781765288eeb9d4009f8ace681f40d7750d5 SHA256 3bdfb86f3f30de8bc5487eccdbe237404452967ea374e0e56e86e8a09d7d3290
 MD5 b2b1706c8796732b917f1c2bbdfd39d4 metadata.xml 304
 RMD160 3cd9315c196ed4d0ec474fb1b9e3cf7567af3c91 metadata.xml 304
diff --git a/media-gfx/picasa/files/picasa-unicode.patch b/media-gfx/picasa/files/picasa-unicode.patch
new file mode 100644
index 000000000000..0174d1b5250f
--- /dev/null
+++ b/media-gfx/picasa/files/picasa-unicode.patch
@@ -0,0 +1,15 @@
+--- bin/wrapper.orig	2006-09-13 01:39:17.000000000 +0200
++++ bin/wrapper	2006-09-13 01:39:38.000000000 +0200
+@@ -221,12 +221,6 @@
+     exec >/dev/null 2>&1
+ fi
+ 
+-# FIXME - Only US English has been well tested to this point,
+-#         so we unset all LOCALE strings, causing us to default to Posix and hence US English
+- for x in `locale 2>/dev/null | sed 's/=.*$//'` ; do 
+-    unset $x 
+-done
+-
+ # Apply the .inf files (reapply if they've changed)
+ for infcmd in wine.inf/DefaultInstall mozctl.inf/Mozctl picasa.inf/DefaultInstall ; do
+     inffile=`echo $infcmd | cut -d '/' -f 1`
diff --git a/media-gfx/picasa/picasa-2.2.2820.5.ebuild b/media-gfx/picasa/picasa-2.2.2820.5.ebuild
index cee8ba653949..b0d06bc1e2ab 100644
--- a/media-gfx/picasa/picasa-2.2.2820.5.ebuild
+++ b/media-gfx/picasa/picasa-2.2.2820.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.5 2006/06/15 02:02:40 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/picasa/picasa-2.2.2820.5.ebuild,v 1.6 2006/09/13 00:16:40 genstef Exp $
 
 inherit eutils versionator
 
@@ -41,15 +41,16 @@ RDEPEND="dev-libs/atk
 S=${WORKDIR}
 
 src_unpack() {
-	MY_FILE=${DISTDIR}/${MY_P}.i386.bin
-	MY_OFFSET=`head -n 375 ${MY_FILE} | wc -c | tr -d " "`
-	dd if=${MY_FILE} bs=${MY_OFFSET} skip=1 | tar xfz -
+	unpack_makeself
 
 	sed -i -e "s:28.20:28.3205:" \
 		'wine/drive_c/Program Files/Picasa2/update/LifeScapeUpdater/currentversion.ini'
 	sed -i -e "s:;;HKLM,Soft:HKLM,Soft:" -e \
 		's:"DisableMediaDetector",0x10003,0x00000001:"DisableMediaDetector",0x10003,0x00000000:' \
 		wine/drive_c/windows/inf/picasa.inf
+
+	# Display unicode filenames correctly by not unsetting locale, bug #147094
+	epatch ${FILESDIR}/picasa-unicode.patch
 }
 
 src_install() {