graphics/picasa: Updated for version 3.0.5744

4 files changed, 30 insertions, 32 deletions

diff --git a/graphics/picasa/README b/graphics/picasa/README
index 757c160143f5..b8f92968b511 100644
--- a/graphics/picasa/README
+++ b/graphics/picasa/README
@@ -6,3 +6,6 @@ locates all your pictures (even ones you forgot you had) and sorts
 them into visual albums organized by date with folder names you will 
 recognize. Picasa also makes advanced editing simple by putting one
 click fixes and powerful effects at your fingertips.
+
+NOTE: As best I can tell, the browser plugin and screensaver plugin
+do not work correctly, if at all; patches are welcome.
diff --git a/graphics/picasa/doinst.sh b/graphics/picasa/doinst.sh
index de571c45ba58..d132224e6100 100644
--- a/graphics/picasa/doinst.sh
+++ b/graphics/picasa/doinst.sh
@@ -1,9 +1,8 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
 if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
diff --git a/graphics/picasa/picasa.SlackBuild b/graphics/picasa/picasa.SlackBuild
index 9bc81031b121..dcd5547231c3 100644
--- a/graphics/picasa/picasa.SlackBuild
+++ b/graphics/picasa/picasa.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=picasa
-VERSION=${VERSION:-2.7.3736}
+VERSION=${VERSION:-3.0.5744}
 ARCH=${ARCH:-i386}	# The binary is built for i386 - leave this alone
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,42 +33,39 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Require the script to exit if any command fails
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $PKG
-ar -x $CWD/${PRGNAM}_$VERSION-15_${ARCH}.deb
+ar -x $CWD/picasa_3.0-current_i386.deb
 tar xvf data.tar.gz
 rm data.tar.gz control.tar.gz debian-binary
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
 
-# Create symlinks in /usr/bin to picasa, mediadetector, and picasafontcfg
+# Create symlinks in /usr/bin to picasa and picasafontcfg
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
-  ln -fs /opt/picasa/bin/picasa .
-  ln -s /opt/picasa/bin/picasafontcfg .
-  ln -s /opt/picasa/bin/mediadetector .
+  ln -fs /opt/google/picasa/3.0/bin/picasa .
+  ln -s /opt/google/picasa/3.0/bin/picasafontcfg .
 )
 
 # Install icons
 mkdir -p $PKG/usr/share/pixmaps
-install -m 0644 $PKG/opt/picasa/desktop/picasa.xpm \
-  $PKG/usr/share/pixmaps/picasa.xpm
-install -m 0644 $PKG/opt/picasa/desktop/picasa-fontcfg.xpm \
-  $PKG/usr/share/pixmaps/picasa-fontcfg.xpm
+install -m 0644 \
+  $PKG/opt/google/picasa/3.0/desktop/picasa.xpm \
+  $PKG/opt/google/picasa/3.0/desktop/picasa-fontcfg.xpm \
+  $PKG/usr/share/pixmaps
 
 # Install desktop files for menu entries
 mkdir -p $PKG/usr/share/applications
-sed -e s#EXEC#picasa# -e s#ICON#picasa.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa.desktop.template \
+sed -e 's|EXEC|picasa|' -e 's|ICON|picasa.xpm|' \
+  $PKG/opt/google/picasa/3.0/desktop/picasa.desktop.template \
   > $PKG/usr/share/applications/google-picasa.desktop
-sed -e s#EXEC#mediadetector# -e s#ICON#picasa.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa-mediadetector.desktop.template \
-  > $PKG/usr/share/applications/google-picasa-mediadetector.desktop
-sed -e s#EXEC#picasafontcfg# -e s#ICON#picasa-fontcfg.xpm# \
-  $PKG/opt/picasa/desktop/google-picasa-fontcfg.desktop.template \
+sed -e s'|EXEC|picasafontcfg|' -e s'|ICON|picasa-fontcfg.xpm|' \
+  $PKG/opt/google/picasa/3.0/desktop/picasa-fontcfg.desktop.template \
   > $PKG/usr/share/applications/google-picasa-fontcfg.desktop
 for i in $PKG/usr/share/applications/*.desktop ; do
   echo "Categories=Graphics;Photography;Photograph;Viewer;2DGraphics;Application;Applications" \
@@ -82,9 +79,8 @@ echo 'application/x-picasa-detect; false; description=Picasa Installation detect
 
 # Relocate docs to appropriate place
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts
-mv $PKG/opt/picasa/{LICENSE.FOSS,README} \
+mv $PKG/opt/google/picasa/3.0/{LICENSE.FOSS,README} \
   $PKG/usr/doc/$PRGNAM-$VERSION
-
 # Add some unsupported stuff (feel free to play, but unless you figure out
 # how to integrate them correctly for *everyone*, leave us alone) :)  
 # --rworkman
@@ -92,17 +88,17 @@ for i in \
   picasa-hook-email.sh.template picasa-hook-filemanager.sh.template \
   picasa-hook-mimehandler.sh.template picasa-hook-urlhandler.sh.template ;
 do \
-  ln -s /opt/picasa/desktop/$i \
+  ln -s /opt/google/picasa/3.0/desktop/$i \
     $PKG/usr/doc/$PRGNAM-$VERSION/scripts/$i ; 
 done
 
-# Add slack-desc and doinst.sh (which updates desktop database after install)
+# Kill some stuff we don't need/want
+rm -rf $PKG/usr/lib/{xulrunner-addons,mozilla-firefox,iceweasel,firefox}
+rm -rf $PKG/usr/share/gconf
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Ensure sane ownership and permissions and make the package
 cd $PKG
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
 /sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/graphics/picasa/picasa.info b/graphics/picasa/picasa.info
index 7579c18f6fde..fae139f7300c 100644
--- a/graphics/picasa/picasa.info
+++ b/graphics/picasa/picasa.info
@@ -1,8 +1,8 @@
 PRGNAM="picasa"
-VERSION="2.7.3736"
+VERSION="3.0.5744"
 HOMEPAGE="http://picasa.google.com/"
-DOWNLOAD="http://dl.google.com/linux/deb/pool/non-free/p/picasa/picasa_2.7.3736-15_i386.deb"
-MD5SUM="5b4a269cfcb8c706af06af3f215a2305"
+DOWNLOAD="http://dl.google.com/linux/deb/pool/non-free/p/picasa/picasa_3.0-current_i386.deb"
+MD5SUM="4350390a4c2a0fadea9320221a8f9bb9"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="David Somero"
+APPROVED="dsomero"