diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-09-13 00:16:41 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-09-13 00:16:41 +0000 |
| commit | c145ad3f5e59ffacec630fce910865a328798b8f (patch) | |
| tree | fc5d92b8ed116c76075d7402ff001a4f1327d61f /media-gfx/picasa | |
| parent | Upstream broke the download URLs in a site re-arrange, fix em. Also version b... (diff) | |
| download | gentoo-2-c145ad3f5e59ffacec630fce910865a328798b8f.tar.gz gentoo-2-c145ad3f5e59ffacec630fce910865a328798b8f.tar.bz2 gentoo-2-c145ad3f5e59ffacec630fce910865a328798b8f.zip | |
Add patch to fix unicode problems thanks to Guillaume Ramelet <guillaume.ramelet@gmail.com> in bug 147094
(Portage version: 2.1.1)
Diffstat (limited to 'media-gfx/picasa')
| -rw-r--r-- | media-gfx/picasa/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/picasa/files/picasa-unicode.patch | 15 | ||||
| -rw-r--r-- | media-gfx/picasa/picasa-2.2.2820.5.ebuild | 9 |
3 files changed, 26 insertions, 5 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/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() { |