From f915fed717c83ba848ddc31486b1e1b6fe54b83a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 8 Aug 2013 07:07:12 +0000
Subject: main/glib: upgrade to 2.36.4

---
 main/glib/APKBUILD | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'main')

diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index fbe1f164de..ac650d386f 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glib
-pkgver=2.36.1
+pkgver=2.36.4
 pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="http://www.gtk.org"
@@ -18,8 +18,17 @@ _builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	# workaround packaing issue. gtk-doc.make timestamp was newer than
+	# Makefile.am, which triggers automake re-run
+	touch -r docs/reference/glib/Makefile.am gtk-doc.make
 }
 
+
 build() {
 	cd "$_builddir"
 	./configure \
@@ -27,6 +36,7 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--disable-gtk-doc \
 		|| return 1
 	make || return 1
 }
@@ -40,13 +50,30 @@ package() {
 # move the stuff in /usr/bin to the glib-dev package
 dev() {
 	default_dev
-	mkdir -p "$subpkgdir"/usr/bin/
+	replaces="glib"
+	mkdir -p "$subpkgdir"/usr/bin/ \
+		"$subpkgdir"/usr/share/bash-completion/completions \
+		|| return 1
 	cd "$pkgdir"/usr/bin
-	mv glib-genmarshal glib-gettextize glib-mkenums gobject-query \
-		gtester gtester-report \
+	mv \
+		gdbus-codegen \
+		glib-compile-resources \
+		glib-genmarshal \
+		glib-gettextize \
+		glib-mkenums \
+		gobject-query \
+		gresource \
+		gtester \
+		gtester-report \
 		"$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/share/gdb \
+		"$pkgdir"/usr/share/glib-2.0 \
+		"$subpkgdir"/usr/share/ || return 1
+	mv "$pkgdir"/usr/share/bash-completion/completions/gresource \
+		"$subpkgdir"/usr/share/bash-completion/completions \
+		|| return 1
 }
 
-md5sums="a3bbee44a13facb5a3cab18be5ece14c  glib-2.36.1.tar.xz"
-sha256sums="7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24  glib-2.36.1.tar.xz"
-sha512sums="e738ef537fc8b05f535a42a46c3e5cf8d7c9c3aed788adea1bfd924e6031e6f3e8366850a3a1a0ea2c2a4c5e54f08eacf6cccbf32fb8a361b62a6caf9c4b7852  glib-2.36.1.tar.xz"
+md5sums="2f4b15f7ef43d8702d067ab987bf7aba  glib-2.36.4.tar.xz"
+sha256sums="f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e  glib-2.36.4.tar.xz"
+sha512sums="ed3b01051695858724d854c4d1c20df19d4c19526538d87c995e41376e3479e5758afccc9550cf7f4d1104bdd4edb8b436a716ab2b95e7bdf198ff3f17749304  glib-2.36.4.tar.xz"
-- 
cgit v1.2.3