add icons, desktop and face-recognition

2 files changed, 17 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e305008dd7f1..be47fd64a588 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Sep 18 19:05:20 UTC 2018
+# Sat Sep 22 19:41:50 UTC 2018
 pkgbase = shotwell-git
 	pkgdesc = A digital photo organizer designed for the GNOME desktop environment
-	pkgver = 0.31.4083
+	pkgver = 0.31.4086
 	pkgrel = 1
 	url = http://yorba.org/shotwell/
 	arch = x86_64
@@ -25,6 +25,7 @@ pkgbase = shotwell-git
 	depends = libgudev
 	depends = gcr
 	depends = libgdata
+	depends = opencv
 	source = shotwell::git+https://gitlab.gnome.org/GNOME/shotwell.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 210bc90f46ae..d3d1522faefa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=shotwell-git
 _pkgname=shotwell
-pkgver=0.31.4083
+pkgver=0.31.4086
 _pkgver=0.31
 pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
@@ -10,7 +10,7 @@ license=('LGPL2.1')
 depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest'
 	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
 	 'gst-plugins-base' 'libgphoto2' 'libgudev'
-	 'gcr' 'libgdata')
+	 'gcr' 'libgdata' 'opencv')
 makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool')
 
 source=("$_pkgname"::'git+https://gitlab.gnome.org/GNOME/shotwell.git')
@@ -23,7 +23,7 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/$_pkgname"
-    meson build --prefix=/opt/shotwell-git
+    meson build -Dface-detection=true --prefix=/opt/shotwell-git
 }
 
 build() {
@@ -38,4 +38,15 @@ package() {
     ln -s $pkgdir/opt/$pkgname/bin/shotwell $pkgdir/usr/bin/shotwell-git
     install -d -m755 $pkgdir/etc/ld.so.conf.d/
     echo /opt/shotwell-git/lib > $pkgdir/etc/ld.so.conf.d/shotwell-git.conf
+    install -d -m755 $pkgdir/usr/share/applications
+    sed -e 's/shotwell/shotwell\-git/g' \
+  		-i $pkgdir/opt/$pkgname/share/applications/org.gnome.Shotwell.desktop
+    cp $pkgdir/opt/$pkgname/share/applications/org.gnome.Shotwell.desktop $pkgdir/usr/share/applications/org.gnome.Shotwell-git.desktop
+    for dir in `find /usr/share/icons/hicolor/ -mindepth 1 -maxdepth 1 -type d | sed 's|^/[^/]*||'`; do
+    install -d -m755 $pkgdir/usr/$dir/apps
+  	if [ -e $pkgdir/opt/$pkgname/$dir/apps/org.gnome.Shotwell.png ]
+  	then
+	  	install -Dm644 $pkgdir/opt/$pkgname/$dir/apps/org.gnome.Shotwell.png $pkgdir/usr/$dir/apps/org.gnome.Shotwell.png
+	  fi 
+  done
 }