[Lunar-commits] <moonbase-gnome3> Merge branch 'master' of github.com:lunar-linux/moonbase-gnome3

[Florin Braescu]

commit 81b01502fdfa5a31279a6c4523611e2313fcad0c
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sat, 23 Mar 2013 12:41:50 -0700
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/81b01502fdfa5a31279a6c4523611e2313fcad0c

Merge branch 'master' of github.com:lunar-linux/moonbase-gnome3
---
  apps/shotwell/BUILD     | +2/-10    
  apps/shotwell/DEPENDS   | +2/-0     
  apps/shotwell/DETAILS   | +5/-5     
  libs/webkitgtk3/DEPENDS | +1/-0     
  4 files changed, 10 insertions(+), 15 deletions(-)

--- a/apps/shotwell/BUILD
+++ b/apps/shotwell/BUILD
@@ -1,11 +1,3 @@
-(
+./configure --prefix=/usr --release --install-headers --disable-desktop-update --disable-icon-update &&
 
-  # 0.12.3 doesn't compile with current vala
-  # see http://redmine.yorba.org/issues/5453
-  sedit "s:store.remove(wrapper.get_iter()):Gtk.TreeIter iter = wrapper.get_iter();store.remove(ref iter):" src/sidebar/Tree.vala &&
-
-  OPTS+=" --release --install-headers" &&
-
-  default_build
-
-) > $C_FIFO 2>&1
+default_make
--- a/apps/shotwell/DEPENDS
+++ b/apps/shotwell/DEPENDS
@@ -10,3 +10,5 @@ depends gtk+-3
 depends webkitgtk3
 depends LibRaw
 depends rest
+depends gstreamer
+depends gst-plugins-base-1.0
--- a/apps/shotwell/DETAILS
+++ b/apps/shotwell/DETAILS
@@ -1,12 +1,12 @@
           MODULE=shotwell
-         VERSION=0.13.1
+         VERSION=0.14.0
           SOURCE=$MODULE-$VERSION.tar.xz
-      SOURCE_URL=http://yorba.org/download/$MODULE/stable
-      SOURCE_VFY=sha1:2748966e851baa465906c3c9bbfedcd48008432d
+      SOURCE_URL=http://yorba.org/download/$MODULE/${VERSION%.*}
+      SOURCE_VFY=
         WEB_SITE=http://yorba.org/shotwell
          ENTERED=20100909
-         UPDATED=20120510
-           PSAFE=no
+         UPDATED=20130323
+           #PSAFE=no
            SHORT="A photo organizer"
 
 cat << EOF
--- a/libs/webkitgtk3/DEPENDS
+++ b/libs/webkitgtk3/DEPENDS
@@ -12,6 +12,7 @@ depends  libsoup
 depends  enchant
 depends  gst-plugins-base
 depends  gst-plugins-good
+depends  ruby
 
 # workaround for make_names.pl
 depends Switch