aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2012-08-17 23:46:32 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-08-17 23:46:32 -0500
commitd970f348bd40afa9da7b5794734fa831b9e79218 (patch)
tree30c656ac8e9c8b044048256606b91482d54fe44d
parentcb24263cc215e8a1f2700ecfe24d9cdf7f9fde58 (diff)
graphics/shotwell: Fix dep list and remove deprcated build stuff
GConf, ORBit2, libsoup, and icu4c are part of Slackware 14.0, so we don't need to mention them as deps any more. Also, we don't need to overwrite the udev rules any more either - that got fixed in the -current cycle. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--graphics/shotwell/README7
-rw-r--r--graphics/shotwell/shotwell.SlackBuild11
2 files changed, 2 insertions, 16 deletions
diff --git a/graphics/shotwell/README b/graphics/shotwell/README
index b535bd041c308..36d5820aad5e1 100644
--- a/graphics/shotwell/README
+++ b/graphics/shotwell/README
@@ -2,9 +2,4 @@ Shotwell is a digital photo organizer for GNOME. It allows the user to import
photos from a digital camera or disk, organize them in various ways, and export
to share with others.
-This requires GConf, ORBit2, libgee, libgexiv2, LibRaw, libsoup, libunique,
-vala-12, icu4c, and webkit.
-
-Kernel options CONFIG_USB_DEVICEFS and CONFIG_USB_DEVICE_CLASS will likely
-need to be disabled before shotwell recognizes the camera. We hope that
-this will be fixed in the next release of Slackware. :)
+This requires libgee, libgexiv2, LibRaw, libunique, vala-12, and webkit.
diff --git a/graphics/shotwell/shotwell.SlackBuild b/graphics/shotwell/shotwell.SlackBuild
index ecbf94b5e3c0b..c9a88cc0bbecc 100644
--- a/graphics/shotwell/shotwell.SlackBuild
+++ b/graphics/shotwell/shotwell.SlackBuild
@@ -4,7 +4,7 @@
PRGNAM=shotwell
VERSION=0.11.6
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -62,15 +62,6 @@ sed -e 's/valac/valac-0.12/' -i Makefile
make
make install DESTDIR=$PKG
-# Yes, we're going to overwrite the Slackware-provided rules file.
-# 1. It's incorrect (it should have been generated this way in the
-# libgphoto2 package, but blame rworkman for that) :)
-# 2. Shotwell needs this to function correctly
-# 3. It won't hurt at all to leave it if/when shotwell is removed (see #1)
-mkdir -p $PKG/lib/udev/rules.d
-print-camera-list udev-rules version 136 mode 0660 owner root group plugdev > \
- $PKG/lib/udev/rules.d/90-libgphoto2.rules
-
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true