diff options
| author | Brad Hermanson <apeitheo@gmail.com> | 2012-05-29 17:31:41 -0400 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2012-06-03 15:21:08 -0500 |
| commit | 6782b437bd7157c129158d810e224591256344f7 (patch) | |
| tree | faefe7ba8a2f5d18c912ab6f2283cff17ab49c2a /graphics/shotwell | |
| parent | a1bb68f9dcd0b5ef9dbe008d32fbe8ef66365135 (diff) | |
graphics/shotwell: Updated to work with our vala-12 build.
Newer versions of shotwell won't compile on 13.37 and
this version on shotwell won't compile with newer vala. :/
So we made a vala-12 build that can install side by side
other vala build.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'graphics/shotwell')
| -rw-r--r-- | graphics/shotwell/README | 2 | ||||
| -rw-r--r-- | graphics/shotwell/shotwell.SlackBuild | 8 | ||||
| -rw-r--r-- | graphics/shotwell/shotwell.info | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/graphics/shotwell/README b/graphics/shotwell/README index a1318372e57b..b535bd041c30 100644 --- a/graphics/shotwell/README +++ b/graphics/shotwell/README @@ -3,7 +3,7 @@ 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, icu4c, and webkit. +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 diff --git a/graphics/shotwell/shotwell.SlackBuild b/graphics/shotwell/shotwell.SlackBuild index 2dd03af005c2..ecbf94b5e3c0 100644 --- a/graphics/shotwell/shotwell.SlackBuild +++ b/graphics/shotwell/shotwell.SlackBuild @@ -4,7 +4,7 @@ PRGNAM=shotwell VERSION=0.11.6 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -55,11 +55,15 @@ CXXFLAGS="$SLKCFLAGS" \ --install-headers \ --release +# Allow shotwell to find our tweaked vala-12 package. +sed -e 's/valac/valac-0.12/' -i plugins/Makefile.plugin.mk +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 +# 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) diff --git a/graphics/shotwell/shotwell.info b/graphics/shotwell/shotwell.info index 907aca927392..ffff7efd3697 100644 --- a/graphics/shotwell/shotwell.info +++ b/graphics/shotwell/shotwell.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Brad Hermanson" EMAIL="apeitheo@gmail.com" -APPROVED="Niels Horn" +APPROVED="dsomero" |