upgpkg: 1.6.0.r7.g9aa0ceb-1

2 files changed, 6 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 898f12d78ce7..a4ed3b3cad98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = photoflare-git
 	pkgdesc = Quick, simple but powerful Cross Platform image editor.
-	pkgver = 1.5.9.r709.g0f815c4
+	pkgver = 1.6.0.r7.g9aa0ceb
 	pkgrel = 1
 	url = http://photoflare.io/
 	arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = photoflare-git
 	depends = graphicsmagick
 	depends = hicolor-icon-theme
 	depends = qt5-base
-	optdepends = qt5-imageformats: support for tiff, webp, and more image formats
+	depends = qt5-imageformats
 	provides = photoflare
 	conflicts = photoflare
 	replaces = photofiltrelx
diff --git a/PKGBUILD b/PKGBUILD
index b8e40a4ed89c..f84a7baf55e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,13 @@
 # Contributor:
 
 pkgname=photoflare-git
-pkgver=1.5.9.r709.g0f815c4
+pkgver=1.6.0.r7.g9aa0ceb
 pkgrel=1
 pkgdesc="Quick, simple but powerful Cross Platform image editor."
 arch=('x86_64')
 url="http://photoflare.io/"
 license=('GPL3')
-depends=('desktop-file-utils' 'graphicsmagick' 'hicolor-icon-theme' 'qt5-base')
-optdepends=('qt5-imageformats: support for tiff, webp, and more image formats')
+depends=('desktop-file-utils' 'graphicsmagick' 'hicolor-icon-theme' 'qt5-base' 'qt5-imageformats')
 makedepends=('git' 'qt5-tools')
 conflicts=("${pkgname%-*}")
 provides=("${pkgname%-*}")
@@ -19,13 +18,12 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname%-*}"
-  #git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-  echo $(cat ./versions/dev.json).r$(git rev-list --count HEAD).g$(git describe --always)
+  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//g'
 }
 
 build() {
   cd "${pkgname%-*}"
-  qmake-qt5 PREFIX=/usr PhotoFlare.pro \
+  qmake-qt5 PREFIX=/usr Photoflare.pro \
     QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
     QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
     QMAKE_LFLAGS_RELEASE="${LDFLAGS}"