picasa-beta/picasa.patch

   1 diff -ur picasa-orig/opt/google/picasa/3.0/bin/picasa picasa/opt/google/picasa/3.0/bin/picasa
   2 --- picasa-orig/opt/google/picasa/3.0/bin/picasa        2008-09-16 13:38:03.000000000 -0600
   3 +++ picasa/opt/google/picasa/3.0/bin/picasa     2008-10-20 19:01:45.000000000 -0600
   4 @@ -2,6 +2,12 @@
   5  #   picasa
   6  #   Simple script to launch Picasa
   7
   8 +# Run using linux32 if architecture is x86_64
   9 +if [ "`uname -m`" = "x86_64" ] ; then
  10 +       /usr/bin/linux32 "$0" "$@"
  11 +       exit $?
  12 +fi
  13 +
  14  close_splash() {
  15    if [ -n "$SPLASH_PID" ]; then
  16      kill "$SPLASH_PID" > /dev/null 2>&1
  17 @@ -128,35 +134,6 @@
  18      WINEPREFIX="$PICASA_WINEPREFIX"
  19  fi
  20
  21 -# Check for the 32-bit OpenSSL libs that Picasa needs.
  22 -if [ "`uname -m`" = "x86_64" ] ; then
  23 -    SSLSETUP="$PIC_BINDIR/repackage32.sh"
  24 -    SSLPROMPT="Many online features of Picasa will not work
  25 -until you install a 32-bit version of OpenSSL.
  26 -If you skip this step, you can perform it later by running:
  27 -$SSLSETUP openssl
  28 -For additional assistance, please visit:
  29 -http://groups.google.com/group/Google-Labs-Picasa-for-Linux
  30 -
  31 -Would you like to install 32-bit OpenSSL now?"
  32 -    "$SSLSETUP" -p "$SSLPROMPT" openssl
  33 -
  34 -    MDNSFIX="$PIC_BINDIR"/mdns.sh
  35 -    MDNSPROMPT="
  36 -With certain 64-bit Linux configuration, you may not be
  37 -able to access Picasa's internet features unless you install
  38 -the lib32nss-mdns package.
  39 -
  40 -If you skip this step, you can perform it later by running:
  41 -$MDNSFIX
  42 -For additional assistance, please visit:
  43 -http://groups.google.com/group/Google-Labs-Picasa-for-Linux
  44 -
  45 -Would you like to install the lib32nss-mdns package now?
  46 -"
  47 -  "$MDNSFIX" -p "$MDNSPROMPT" -c "$WINEPREFIX/.mdnsfix"
  48 -fi
  49 -
  50  # Try to avoid Wine crashes due to font problem, as described at:
  51  # http://www.codeweavers.com/support/wiki/faq/fontissues
  52  BADVER="Version 0.1.20060928"
  53 Only in picasa/opt/google/picasa/3.0/bin: picasa~
  54 diff -ur picasa-orig/opt/google/picasa/3.0/bin/wrapper picasa/opt/google/picasa/3.0/bin/wrapper
  55 --- picasa-orig/opt/google/picasa/3.0/bin/wrapper       2008-09-16 13:38:03.000000000 -0600
  56 +++ picasa/opt/google/picasa/3.0/bin/wrapper    2008-10-20 18:57:47.000000000 -0600
  57 @@ -335,6 +335,7 @@
  58
  59  # Set the environment up
  60  export PATH=$parentdir/wine/bin:$mydir:"$mydir/xdg-utils-1.0.2/scripts":"$mydir/xdg-user-dirs-0.8/bin":$PATH
  61 +[ "`uname -m`" = "x86_64" ] && export LD_LIBRARY_PATH=/opt/lib32/usr/lib/:/opt/lib32/lib/:$LD_LIBRARY_PATH
  62  export LD_LIBRARY_PATH=$parentdir/wine/lib:$parentdir/lib:$LD_LIBRARY_PATH
  63  export WINEDLLPATH=$parentdir/wine/lib/wine
  64  export WINELOADER=$parentdir/wine/bin/wine