summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rw@rlworkman.net>2010-05-13 00:28:08 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-13 00:28:08 +0200
commit423eae9d46f6844a3da3462a3e3d8aca7dc2a42f (patch)
tree2664e235d459b08fa0d4a4b19b61900d0c653a5d
parent6105d7b3698334b39eefefd08f77040d49c31077 (diff)
downloadslackbuilds-423eae9d46f6844a3da3462a3e3d8aca7dc2a42f.tar.gz
graphics/picasa: Updated for version 3.0.5744
-rw-r--r--graphics/picasa/README20
-rw-r--r--graphics/picasa/doinst.sh8
-rw-r--r--graphics/picasa/picasa.SlackBuild26
-rw-r--r--graphics/picasa/picasa.info2
-rw-r--r--graphics/picasa/slack-desc4
5 files changed, 42 insertions, 18 deletions
diff --git a/graphics/picasa/README b/graphics/picasa/README
index b8f92968b5..56a085cf09 100644
--- a/graphics/picasa/README
+++ b/graphics/picasa/README
@@ -1,11 +1,15 @@
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.
+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.
-NOTE: As best I can tell, the browser plugin and screensaver plugin
-do not work correctly, if at all; patches are welcome.
+NOTE: As best I can tell, the browser plugin and screensaver plugin do not
+work correctly, if at all; patches are welcome.
+
+Also note that while this should *build* a 64bit package, it requires 32bit
+compatibility libraries to actually be usable. We don't support those those
+here, so caveat lector.
diff --git a/graphics/picasa/doinst.sh b/graphics/picasa/doinst.sh
index d132224e61..9830478e8c 100644
--- a/graphics/picasa/doinst.sh
+++ b/graphics/picasa/doinst.sh
@@ -1,8 +1,14 @@
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 -q 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
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/graphics/picasa/picasa.SlackBuild b/graphics/picasa/picasa.SlackBuild
index dcd5547231..6207d5ef45 100644
--- a/graphics/picasa/picasa.SlackBuild
+++ b/graphics/picasa/picasa.SlackBuild
@@ -1,8 +1,8 @@
#!/bin/bash
-#
+
# Slackware build script of picasa (binary repackaging)
-# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
PRGNAM=picasa
VERSION=${VERSION:-3.0.5744}
-ARCH=${ARCH:-i386} # The binary is built for i386 - leave this alone
-BUILD=${BUILD:-1}
+ARCH=${ARCH:-i386}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -33,13 +33,22 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "x86_64" ]; then
+ SRCARCH=amd64
+ LIBDIRSUFFIX="64"
+else
+ ARCH=i386
+ SRCARCH=i386
+ LIBDIRSUFFIX=""
+fi
+
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $PKG
-ar -x $CWD/picasa_3.0-current_i386.deb
+ar -x $CWD/picasa_3.0-current_${SRCARCH}.deb
tar xvf data.tar.gz
rm data.tar.gz control.tar.gz debian-binary
chown -R root:root .
@@ -68,7 +77,7 @@ 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" \
+ echo "Categories=Graphics;Photography;Photograph;Viewer;2DGraphics;" \
>> $i ;
done
@@ -95,10 +104,13 @@ done
# 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
+if [ "$ARCH" = "x86_64" ]; then
+ mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/picasa/picasa.info b/graphics/picasa/picasa.info
index fae139f730..7f4590fed2 100644
--- a/graphics/picasa/picasa.info
+++ b/graphics/picasa/picasa.info
@@ -3,6 +3,8 @@ VERSION="3.0.5744"
HOMEPAGE="http://picasa.google.com/"
DOWNLOAD="http://dl.google.com/linux/deb/pool/non-free/p/picasa/picasa_3.0-current_i386.deb"
MD5SUM="4350390a4c2a0fadea9320221a8f9bb9"
+DOWNLOAD_x86_64="http://dl.google.com/linux/deb/pool/non-free/p/picasa/picasa_3.0-current_amd64.deb"
+MD5SUM_x86_64="6accd6c633ece16acd177ffda0688572"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="dsomero"
diff --git a/graphics/picasa/slack-desc b/graphics/picasa/slack-desc
index 690c9b052b..d800cf070b 100644
--- a/graphics/picasa/slack-desc
+++ b/graphics/picasa/slack-desc
@@ -14,6 +14,6 @@ picasa: locates all your pictures (even ones you forgot you had) and sorts
picasa: them into visual albums organized by date with folder names you will
picasa: recognize. Picasa also makes advanced editing simple by putting one
picasa: click fixes and powerful effects at your fingertips.
-picasa:
+picasa:
picasa: Homepage: http://picasa.google.com
-picasa:
+picasa: