From 1e744ea35ec31acdce2fe3b423cd6ca2bf262efc Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Fri, 5 May 2017 10:08:16 +0000
Subject: community/corebird: upgrade to 1.5, modernize APKBUILD

---
 community/corebird/APKBUILD                | 24 ++++++++++++------------
 community/corebird/disable-gst-check.diff  | 14 --------------
 community/corebird/disable-gst-check.patch | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 community/corebird/disable-gst-check.diff
 create mode 100644 community/corebird/disable-gst-check.patch

(limited to 'community/corebird')

diff --git a/community/corebird/APKBUILD b/community/corebird/APKBUILD
index 55cdc09e5d..3c3b9ad49b 100644
--- a/community/corebird/APKBUILD
+++ b/community/corebird/APKBUILD
@@ -7,34 +7,34 @@ pkgdesc="Corebird is a modern, easy and fun Twitter client"
 url="http://corebird.baedert.org/"
 arch="all"
 license="GPL3"
-depends=""
-depends_dev=""
 makedepends="gtk+3.0-dev rest-dev json-glib-dev sqlite-dev libsoup-dev libgee-dev
 		vala tiff automake autoconf libtool intltool glib-dev libxml2-utils file"
-install=""
-options="libtool"
+options="libtool !check"
 subpackages="$pkgname-lang $pkgname-doc"
 source="${pkgname}-${pkgver}.tar.gz::https://github.com/baedert/$pkgname/archive/$pkgver.tar.gz
-		disable-gst-check.diff"
+		disable-gst-check.patch"
 builddir=${srcdir}/${pkgname}-${pkgver}
 
-build() {
+prepare() {
 	cd "$builddir"
 	NOCONFIGURE=yes ./autogen.sh
-	patch -p1 < "$srcdir"/disable-gst-check.diff
+	default_prepare
+}
+
+build() {
+	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--disable-video \
 		--disable-gst-check \
-		--disable-spellcheck \
-		|| return 1
-	make || return 1
+		--disable-spellcheck
+	make
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="eb0356c28bd4a3385c2194a4a05448741a579c521df481cff8c5f873e8769ccfe72a38a3fa709a43276b107a94c8c900e9163c517fcd7fe23cd738ff59de3eb0  corebird-1.5.tar.gz
-ce31141924a58b9081453b4c9490b22f2d039624a8f06d8f9418c5b8581cb8443a57db304d1112331dda547905cbe3df0c26f08f62ff78a2b210465fc3506e94  disable-gst-check.diff"
+ce31141924a58b9081453b4c9490b22f2d039624a8f06d8f9418c5b8581cb8443a57db304d1112331dda547905cbe3df0c26f08f62ff78a2b210465fc3506e94  disable-gst-check.patch"
diff --git a/community/corebird/disable-gst-check.diff b/community/corebird/disable-gst-check.diff
deleted file mode 100644
index a6b9d2cde2..0000000000
--- a/community/corebird/disable-gst-check.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure b/configure
-index 1be799c..8f9dd8b 100755
---- a/configure
-+++ b/configure
-@@ -12935,7 +12935,8 @@ fi
- 
- if test "$disable_gst_check" = "no"; then
-   # Check for gtksink
--  GST_ELEMENT_CHECK(gtksink, 1.0, , )
-+  # GST_ELEMENT_CHECK(gtksink, 1.0, , )
-+  return 0
- fi
- 
- 
diff --git a/community/corebird/disable-gst-check.patch b/community/corebird/disable-gst-check.patch
new file mode 100644
index 0000000000..a6b9d2cde2
--- /dev/null
+++ b/community/corebird/disable-gst-check.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index 1be799c..8f9dd8b 100755
+--- a/configure
++++ b/configure
+@@ -12935,7 +12935,8 @@ fi
+ 
+ if test "$disable_gst_check" = "no"; then
+   # Check for gtksink
+-  GST_ELEMENT_CHECK(gtksink, 1.0, , )
++  # GST_ELEMENT_CHECK(gtksink, 1.0, , )
++  return 0
+ fi
+ 
+ 
-- 
cgit v1.2.3