summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndlessEden2021-01-09 18:04:32 +1100
committerEndlessEden2021-01-09 18:04:32 +1100
commit90490731319133cf21600a3795eb89e1c65fedb8 (patch)
treed9f6ab15959c72ef0149f02c1c6790615caf27ef
parentc5c92d7504e6c080e397f647666e125dc6caf441 (diff)
downloadaur-90490731319133cf21600a3795eb89e1c65fedb8.tar.gz
Updated: used previously updated PKGBUILD.(UNTESTED!)
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD30
2 files changed, 23 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a97ed3f0f88..aa0e85a8248c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = ephoto-git
pkgdesc = A light image viewer based on EFL
- pkgver = 1.5.888
+ pkgver = 1.19.0.934.09873c6
pkgrel = 1
- url = http://www.smhouston.us/ephoto
+ url = http://www.enlightenment.org
arch = i686
arch = x86_64
license = BSD
makedepends = git
depends = efl
- provides = ephoto=1.5
+ provides = ephoto=1.19.0.934.09873c6
conflicts = ephoto
- source = https://git.enlightenment.org/apps/ephoto.git
+ source = git+https://git.enlightenment.org/apps/ephoto.git
sha256sums = SKIP
pkgname = ephoto-git
diff --git a/PKGBUILD b/PKGBUILD
index d80383779b7b..3ece9a1a4693 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
# Submitter: Doug Newgard <scimmia22 at outlook dot com>
# Contributor: Ronald vandd Haren <ronald.archlinux.org>
-# Current Maintainer: chchch
+# Previous Maintainer: chchch
+# Current Maintainer: endlesseden
_pkgname=ephoto
pkgname=$_pkgname-git
-pkgver=1.5.888.ccf4979
+pkgver=1.19.0.934.09873c6
pkgrel=1
pkgdesc="A light image viewer based on EFL"
arch=('i686' 'x86_64')
@@ -14,7 +15,7 @@ depends=('efl')
makedepends=('git')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-source=("git://git.enlightenment.org/apps/$_pkgname.git")
+source=("git+https://git.enlightenment.org/apps/$_pkgname.git")
#source=("http://www.smhouston.us/stuff/ephoto-1.5.tar.gz")
sha256sums=('SKIP')
@@ -23,8 +24,7 @@ pkgver() {
#cd ephoto-1.5
cd $_pkgname
- local efl_version=$(grep -m1 EFL_VERSION configure.ac | awk -F [][] '{print $2 "." $4 "." $6}')
- efl_version=$(awk -F , -v efl_version=${efl_version%.} '/^AC_INIT/ {gsub(/efl_version/, efl_version); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
+ efl_version=$(grep -m1 efl_version meson.build | sed -e 's/\s\+/\n/g' | tail -1 | sed -e "s/'/\n/g" | head -1)
printf "$efl_version.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
@@ -34,11 +34,19 @@ build() {
cd $_pkgname
#cd ephoto-1.5
- ./autogen.sh \
- --prefix=/usr \
- --disable-static
+ rm -rf build
+ arch-meson $@ . build \
+ --prefix=/usr \
+ --buildtype=release \
+ --default-library=shared \
+ --optimization=3
- make
+ meson compile -C build
+}
+
+check() {
+ cd $_pkgname
+ meson test -C build
}
package() {
@@ -46,10 +54,10 @@ package() {
cd $_pkgname
#cd ephoto-1.5
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
# install text files
- install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname/" ChangeLog NEWS README
+ install -Dm644 -t "$pkgdir/usr/share/doc/$_pkgname/" TODO README
# install license files
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" AUTHORS COPYING