0.9.60

2 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e5916a680e4..f61e02ee606b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,27 @@
 pkgbase = eolie-git
 	pkgdesc = Simple web browser for GNOME
-	pkgver = 0.9.r1.ge5a7d6f
+	pkgver = 0.9.60+19+gd9c3ad4
 	pkgrel = 1
 	url = https://gnumdk.github.io/eolie-web/
 	arch = x86_64
 	arch = i686
 	license = GPL3
+	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = intltool
-	makedepends = itstool
+	makedepends = meson
 	depends = gtkspell3
-	depends = python-beautifulsoup4
 	depends = python-cairo
+	depends = python-dateutil
 	depends = python-gobject
 	depends = webkit2gtk
-	provides = eolie=0.9.r1.ge5a7d6f
+	optdepends = python-beautifulsoup4: Import html bookmarks
+	optdepends = python-crypto: Firefox Sync support
+	optdepends = python-fxa: Firefox Sync support
+	optdepends = python-pyopenssl: Show SSL certificates
+	optdepends = python-requests-hawk: Firefox Sync support
+	provides = eolie=0.9.60+19+gd9c3ad4
 	conflicts = eolie
-	source = git+https://github.com/gnumdk/eolie.git
+	source = git+https://gitlab.gnome.org/World/eolie.git
 	sha256sums = SKIP
 
 pkgname = eolie-git
diff --git a/PKGBUILD b/PKGBUILD
index e7ef0c7d4f2b..20f6c8ada61d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,36 @@
 # $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Cedric Bellegarde <cedric.bellegarde @t adishatz.org>
 
 pkgname=eolie-git
 _gitname=eolie
-pkgver=0.9.r1.ge5a7d6f
+pkgver=0.9.60+19+gd9c3ad4
 pkgrel=1
 pkgdesc="Simple web browser for GNOME"
 arch=('x86_64' 'i686')
 url="https://gnumdk.github.io/eolie-web/"
 license=('GPL3')
-depends=('gtkspell3' 'python-beautifulsoup4' 'python-cairo' 'python-gobject' 'webkit2gtk')
-makedepends=('gobject-introspection' 'intltool' 'itstool')
-source=("git+https://github.com/gnumdk/${_gitname}.git")
+depends=('gtkspell3' 'python-cairo' 'python-dateutil' 'python-gobject' 'webkit2gtk')
+makedepends=('git' 'gobject-introspection' 'meson')
+optdepends=('python-beautifulsoup4: Import html bookmarks'
+            'python-crypto: Firefox Sync support' 
+            'python-fxa: Firefox Sync support'
+            'python-pyopenssl: Show SSL certificates'
+            'python-requests-hawk: Firefox Sync support')
+source=("git+https://gitlab.gnome.org/World/eolie.git")
 sha256sums=('SKIP')
 conflicts=('eolie')
 provides=("eolie=$pkgver")
 
-prepare() {
+pkgver() {
 	cd "${_gitname}"
- 	git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	git describe --tags | sed 's/-/+/g'
 }
 
 build() {
-	cd "$srcdir/${_gitname}"
-	./autogen.sh --prefix=/usr --disable-schemas-compile
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
+	arch-meson "${_gitname}" build
+	ninja -C build
 }
 
 package() {
-	cd "$srcdir/${_gitname}"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install -C build
 }