complete rewrite

2 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1251b3c508cf..dde2f557f372 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = birdie-git
 	pkgdesc = Twitter client for Linux
-	pkgver = 1.1+git.106.gba4adb3
+	pkgver = 1.1.r12.g20b3c83
 	pkgrel = 1
-	url = https://github.com/ivonunes/birdie
-	arch = i686
-	arch = x86_64
+	url = https://github.com/mizhka/birdie
+	arch = any
 	license = GPL3
 	makedepends = git
 	makedepends = desktop-file-utils
@@ -13,8 +12,6 @@ pkgbase = birdie-git
 	makedepends = yelp-tools
 	makedepends = gnome-common
 	makedepends = gobject-introspection
-	makedepends = meson
-	makedepends = ninja
 	depends = glib2
 	depends = gtk3
 	depends = hicolor-icon-theme
@@ -27,8 +24,7 @@ pkgbase = birdie-git
 	provides = birdie
 	conflicts = birdie
 	conflicts = birdie-bzr
-	options = !libtool
-	source = birdie::git+https://github.com/ivonunes/birdie.git
+	source = git+https://github.com/mizhka/birdie.git
 	md5sums = SKIP
 
 pkgname = birdie-git
diff --git a/PKGBUILD b/PKGBUILD
index 230d144c6d55..41f895c51338 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,36 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com0
-# Contributor : Ivo Nunes <ivoavnunes at gmail dot com>
-_pkgname="birdie"
-pkgname="${_pkgname}-git"
-pkgver=1.1+git.106.gba4adb3
+# Contributor: Frederic Bezies <fredbezies at gmail dot com0
+# Contributor: Ivo Nunes <ivoavnunes at gmail dot com>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+
+pkgname=birdie-git
+pkgver=1.1.r12.g20b3c83
 pkgrel=1
 pkgdesc="Twitter client for Linux"
-arch=('i686' 'x86_64')
-url="https://github.com/ivonunes/birdie"
+arch=('any')
+url="https://github.com/mizhka/birdie"
 license=('GPL3')
-depends=('glib2' 'gtk3' 'hicolor-icon-theme' 'vala' 'granite' 'libpurple' 'gtksourceview3' 'libdbusmenu-gtk3' 'webkit2gtk') 
-makedepends=('git' 'desktop-file-utils' 'hicolor-icon-theme' 'intltool' 'yelp-tools' 'gnome-common' 'gobject-introspection' 'meson' 'ninja')
-options=('!libtool')
+depends=('glib2' 'gtk3' 'hicolor-icon-theme' 'vala' 'granite' 'libpurple'
+	 'gtksourceview3' 'libdbusmenu-gtk3' 'webkit2gtk') 
+makedepends=('git' 'desktop-file-utils' 'hicolor-icon-theme' 'intltool'
+	     'yelp-tools' 'gnome-common' 'gobject-introspection')
 conflicts=('birdie' 'birdie-bzr')
 provides=('birdie')
-source=("${_pkgname}::git+https://github.com/ivonunes/birdie.git")
+source=("git+$url.git")
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${_pkgname}"
-        echo $(git describe --tags | sed s'/v\.//;s/-/./g')
+  cd ${pkgname%-git}
+  echo $(git describe --tags | sed s/+git./.r/ | sed s'/v\.//;s/-/./g')
 }
 
 build() {
-	cd "${_pkgname}"
-	arch-meson build \
-    -Db_pie=false
-	ninja -C build
+  cd ${pkgname%-git}
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-	cd "${_pkgname}"
-	DESTDIR="${pkgdir}/" ninja -C build install
+  cd ${pkgname%-git}
+  DESTDIR="${pkgdir}/" make install
 }