summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rw@rlworkman.net>2010-05-11 22:23:17 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-11 22:23:17 +0200
commit1512a965e412ff2b39b89bf0d76600538a133b5a (patch)
tree319e61eba28af1fb291fcb267df94ee4f8c61bbd
parent7fab1c6a752ff31bf056b334a2b834735cde4507 (diff)
downloadslackbuilds-1512a965e412ff2b39b89bf0d76600538a133b5a.tar.gz
graphics/picasa: Updated for version 2.7.3736
-rw-r--r--graphics/picasa/README2
-rw-r--r--graphics/picasa/doinst.sh11
-rw-r--r--graphics/picasa/picasa.SlackBuild86
-rw-r--r--graphics/picasa/picasa.info8
4 files changed, 62 insertions, 45 deletions
diff --git a/graphics/picasa/README b/graphics/picasa/README
index 3ce5605d12..757c160143 100644
--- a/graphics/picasa/README
+++ b/graphics/picasa/README
@@ -1,8 +1,8 @@
Google's Picasa Image Suite
+
Picasa is software that helps you instantly find, edit and share all
the pictures on your PC. Every time you open Picasa, it automatically
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.
-
diff --git a/graphics/picasa/doinst.sh b/graphics/picasa/doinst.sh
index 96a48dc52d..de571c45ba 100644
--- a/graphics/picasa/doinst.sh
+++ b/graphics/picasa/doinst.sh
@@ -1,4 +1,9 @@
-# Update the desktop database
-if [ -x usr/bin/update-desktop-database ]; then
- ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+
+if [ -x /usr/bin/update-desktop-database ]; then
+ /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
+fi
+
diff --git a/graphics/picasa/picasa.SlackBuild b/graphics/picasa/picasa.SlackBuild
index af51d9f75c..9bc81031b1 100644
--- a/graphics/picasa/picasa.SlackBuild
+++ b/graphics/picasa/picasa.SlackBuild
@@ -2,7 +2,7 @@
#
# Slackware build script of picasa (binary repackaging)
-# Copyright 2006 Robby Workman (http://rlworkman.net)
+# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,12 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=picasa
-VERSION=2.2.2820
+VERSION=${VERSION:-2.7.3736}
ARCH=${ARCH:-i386} # The binary is built for i386 - leave this alone
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -38,52 +39,63 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-# Extract the picasa stuff from the installer; don't run the install script
-/bin/sh $CWD/picasa-$VERSION-5.$ARCH.bin --target $TMP/$PRGNAM-$VERSION --noexec
+cd $PKG
+ar -x $CWD/${PRGNAM}_$VERSION-15_${ARCH}.deb
+tar xvf data.tar.gz
+rm data.tar.gz control.tar.gz debian-binary
-# Move the relevant parts into the upcoming package
-cd $TMP/$PRGNAM-$VERSION
-mkdir -p $PKG/opt/$PRGNAM-$VERSION
-mv bin lib wine $PKG/opt/$PRGNAM-$VERSION
+# Create symlinks in /usr/bin to picasa, mediadetector, 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 .
+)
-# Install desktop file and icons; modify desktop files as needed
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -m 0644 $TMP/$PRGNAM-$VERSION/desktop/picasa.xpm \
+# 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 $TMP/$PRGNAM-$VERSION/desktop/google-picasa.desktop.template \
- $PKG/usr/share/applications/google-picasa.desktop
-sed -i s#EXEC#\/usr\/bin\/picasa# \
- $PKG/usr/share/applications/google-picasa.desktop
-sed -i s#ICON#\/usr\/share\/pixmaps\/picasa.xpm# \
- $PKG/usr/share/applications/google-picasa.desktop
-install -m 0644 $TMP/$PRGNAM-$VERSION/desktop/google-picasa-mediadetector.desktop.template \
- $PKG/usr/share/applications/google-picasa-mediadetector.desktop
-sed -i s#EXEC#\/usr\/bin\/mediadetector# \
- $PKG/usr/share/applications/google-picasa-mediadetector.desktop
-sed -i s#ICON#\/usr\/share\/pixmaps\/picasa.xpm# \
- $PKG/usr/share/applications/google-picasa-mediadetector.desktop
+install -m 0644 $PKG/opt/picasa/desktop/picasa-fontcfg.xpm \
+ $PKG/usr/share/pixmaps/picasa-fontcfg.xpm
-# Install documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts
-for i in GPLV2 LGPLV2 LICENSE.FOSS README ;
-do \
- install -m 0644 $TMP/$PRGNAM-$VERSION/$i $PKG/usr/doc/$PRGNAM-$VERSION/$i ;
+# 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 \
+ > $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 \
+ > $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" \
+ >> $i ;
done
+
+# Install mime information
+mkdir -p $PKG/usr/share/mime/packages
+echo 'application/x-picasa-detect; false; description=Picasa Installation detection' \
+ > $PKG/usr/share/mime/packages/picasa
+
+# Relocate docs to appropriate place
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts
+mv $PKG/opt/picasa/{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
for i in \
picasa-hook-email.sh.template picasa-hook-filemanager.sh.template \
picasa-hook-mimehandler.sh.template picasa-hook-urlhandler.sh.template ;
do \
- install -m 0755 $TMP/$PRGNAM-$VERSION/desktop/$i \
+ ln -s /opt/picasa/desktop/$i \
$PKG/usr/doc/$PRGNAM-$VERSION/scripts/$i ;
done
-# Create symlinks in /usr/bin to picasa and mediadetector
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin
- ln -s ../../opt/$PRGNAM-$VERSION/bin/picasa picasa
- ln -s ../../opt/$PRGNAM-$VERSION/bin/mediadetector mediadetector
-)
-
# Add slack-desc and doinst.sh (which updates desktop database after install)
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/picasa/picasa.info b/graphics/picasa/picasa.info
index 1bd35b0373..7579c18f6f 100644
--- a/graphics/picasa/picasa.info
+++ b/graphics/picasa/picasa.info
@@ -1,8 +1,8 @@
PRGNAM="picasa"
-VERSION="2.2.2820"
+VERSION="2.7.3736"
HOMEPAGE="http://picasa.google.com/"
-DOWNLOAD="http://dl.google.com/linux/standalone/picasa-2.2.2820-5.i386.bin"
-MD5SUM="4dc28b3419a16e07984f9bf28a0fcc2e"
+DOWNLOAD="http://dl.google.com/linux/deb/pool/non-free/p/picasa/picasa_2.7.3736-15_i386.deb"
+MD5SUM="5b4a269cfcb8c706af06af3f215a2305"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
-APPROVED="BP{k}"
+APPROVED="David Somero"