summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO31
-rw-r--r--PKGBUILD43
2 files changed, 28 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0e676efbca3e..d23caff8a455 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,23 @@
-# Generated by mksrcinfo v8
-# Tue Nov 27 16:49:52 UTC 2018
pkgbase = shotwell-git
pkgdesc = A digital photo organizer designed for the GNOME desktop environment
- pkgver = 0.31.4094
+ pkgver = 0.31.3.r143.g5e21249f
pkgrel = 1
- url = http://yorba.org/shotwell/
+ url = https://wiki.gnome.org/Apps/Shotwell
arch = x86_64
license = LGPL2.1
- makedepends = intltool
- makedepends = vala>=0.17.2
- makedepends = gnome-doc-utils
+ makedepends = git
+ makedepends = vala
+ makedepends = meson
+ makedepends = ninja
makedepends = itstool
depends = libgee
- depends = webkit2gtk
- depends = libgexiv2-git
+ depends = libgexiv2
depends = libraw
- depends = rest
- depends = desktop-file-utils
- depends = dconf
- depends = hicolor-icon-theme
- depends = json-glib
- depends = gst-plugins-base
- depends = libgphoto2
- depends = libgudev
- depends = gcr
depends = libgdata
- depends = opencv
+ depends = libgphoto2
+ provides = shotwell
conflicts = shotwell
- source = shotwell::git+https://gitlab.gnome.org/GNOME/shotwell.git
+ source = git+https://gitlab.gnome.org/GNOME/shotwell.git
sha256sums = SKIP
pkgname = shotwell-git
-
diff --git a/PKGBUILD b/PKGBUILD
index dae9cb522c43..f5f50d44314b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,32 @@
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: gaelic
+
pkgname=shotwell-git
-_pkgname=shotwell
-pkgver=0.31.4094
-_pkgver=0.31
+pkgver=0.31.3.r143.g5e21249f
pkgrel=1
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('x86_64')
-url="http://yorba.org/shotwell/"
-license=('LGPL2.1')
-depends=('libgee' 'webkit2gtk' 'libgexiv2-git' 'libraw' 'rest'
- 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib'
- 'gst-plugins-base' 'libgphoto2' 'libgudev'
- 'gcr' 'libgdata' 'opencv')
-makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool')
+arch=(x86_64)
+url="https://wiki.gnome.org/Apps/Shotwell"
+license=(LGPL2.1)
+depends=(libgee libgexiv2 libraw libgdata libgphoto2)
+makedepends=(git vala meson ninja itstool)
+provides=(shotwell)
conflicts=(shotwell)
-source=("$_pkgname"::'git+https://gitlab.gnome.org/GNOME/shotwell.git')
+source=("git+https://gitlab.gnome.org/GNOME/shotwell.git")
sha256sums=('SKIP')
pkgver() {
- cd "$srcdir/$_pkgname"
- echo $_pkgver.$(git rev-list --count HEAD)
-}
-
-prepare() {
- cd "$srcdir/$_pkgname"
- sed -e 's/org.gnome.Shotwell/shotwell/g' -i data/org.gnome.Shotwell.desktop.in
- sed -e 's/org.gnome.Shotwell/shotwell/g' -i data/org.gnome.Shotwell-Viewer.desktop.in
- meson build -Dface-detection=true --prefix=/usr
+ cd "${srcdir}/${pkgname%-git}"
+ git describe --long --tags | sed 's/^shotwell-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "$_pkgname/build"
- ninja
+ cd "${srcdir}/${pkgname%-git}"
+ arch-meson -D unity_support=false build
+ ninja -C build
}
package() {
- cd "$_pkgname/build"
- DESTDIR="$pkgdir" ninja install
+ cd "${srcdir}/${pkgname%-git}"
+ DESTDIR="${pkgdir}" meson install -C build
}