Merge git://dev.alpinelinux.org/aports

8 files changed, 61 insertions, 16 deletions

diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index 46c2959719..b1d7a9fd00 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=${FLAVOR:-vserver}
 _realname=dahdi-linux
 _name=$_realname-$_flavor
-_kver=3.3.5
+_kver=3.3.6
 _kpkgrel=0
 _myvsver=vs2.3.3.3
 
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index a42e4ababf..19f202cb0f 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.7.10.1
+pkgver=1.7.10.2
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -64,7 +64,7 @@ svn() {
         mv "$pkgdir"/usr/libexec/git-core/git-svn "$subpkgdir"/usr/libexec/git-core
 }
 
-md5sums="41da844a1b8cc2d92864381e2fdeb0e1  git-1.7.10.1.tar.gz
+md5sums="2e2ee53243ab8e7cf10f15c5229c3fce  git-1.7.10.2.tar.gz
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch
 3f0bdf6ca73bf4f015bc8565ab787969  git-daemon.initd
 2258e95d389ccc6de0b5111d53d9eed6  git-daemon.confd"
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index c2e178a21c..a19514289d 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+3.0
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="http://www.gtk.org/"
@@ -57,6 +57,11 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		|| return 1
+	# the configure script checks if isnan is a function. In uclibc
+	# isnan is there, but as a macro
+	# https://bugzilla.gnome.org/show_bug.cgi?id=676087
+	echo "#define HAVE_ISNAN 1" >> config.h
+	echo "#define HAVE_ISINF 1" >> config.h
 	make || return 1
 }
 
@@ -69,4 +74,4 @@ package() {
 	find "$pkgdir" -name *.la -delete
 }
 
-md5sums="9e20443fbaa3ba3e9cbd2fc44d6be121  gtk+-3.4.2.tar.xz"
+md5sums="e552d52c3b0824eb99842dc9c5f4875f  gtk+-3.4.3.tar.xz"
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 0f282158e1..53c79e9cef 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -2,7 +2,7 @@
 _abiver=0.9.32
 pkgname=libc$_abiver
 _gitver=
-pkgver=0.9.33.1
+pkgver=0.9.33.2
 _ver=${pkgver/_/-}
 pkgrel=1
 pkgdesc="C library for developing embedded Linux systems"
@@ -127,7 +127,7 @@ libthread_db() {
 	mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/
 }
 
-md5sums="3f9d8eb9505d059e2c27ca0abcd1e86e  uClibc-0.9.33.1.tar.xz
+md5sums="73e6fe215648d02246f4d195b25fb17e  uClibc-0.9.33.2.tar.xz
 d4c8fb190eb4327453ed924159ca432e  0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
 f9c9de09da5eade2fb9dff8f9f8b3fc9  0002-resolv-res_query-for-CNAMEs.patch
 96e5deaa662695a56571f47c7ac2fc94  0003-resolv-fix-resolver-to-return-TRY_AGAIN-on-timeout.patch
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index db83b7d4de..2ed079420d 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.3.5
+pkgver=3.3.6
 pkgrel=0
 _vsver=vs2.3.3.3
 
@@ -133,7 +133,7 @@ dev() {
 }
 
 md5sums="7133f5a2086a7d7ef97abac610c094f5  linux-3.3.tar.xz
-d346edca5d3de7052f49996b01cef401  patch-3.3.5.xz
-a82be36f04448c87d87c5b4880cc3c0f  patch-3.3.5-vs2.3.3.3.diff
+a7f67e9c491403906e4bb475de194631  patch-3.3.6.xz
+6567b347ebcacb4caaac011cbf04f4ce  patch-3.3.6-vs2.3.3.3.diff
 4b8d805a0eec790472432a39be02f453  kernelconfig.x86
 94555ed5003cd2fc61f7d0e8d6ceb558  kernelconfig.x86_64"
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
index 042485649b..600fb65b11 100644
--- a/main/open-vm-tools-vserver/APKBUILD
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -3,7 +3,7 @@
 _flavor=vserver
 _realname=open-vm-tools
 _name=$_realname-$_flavor
-_kver=3.3.5
+_kver=3.3.6
 _kpkgrel=0
 _myvsver=vs2.3.3.3
 _mypkgrel=1
diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD
index 38dc05424d..9dca63b4dc 100644
--- a/main/sdl/APKBUILD
+++ b/main/sdl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sdl
 pkgver=1.2.15
-pkgrel=0
+pkgrel=2
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 url="http://www.libsdl.org"
 arch="all"
@@ -9,16 +9,33 @@ license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 depends_dev="libx11-dev libiconv-dev"
-makedepends="libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev 
+makedepends="
+	$depends_dev
+	libxext-dev libxrender-dev libx11-dev libice-dev libsm-dev 
 	libxrandr-dev mesa-dev alsa-lib-dev libiconv-dev"
-source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz"
+source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz
+	SDL-1.2.10-GrabNotViewable.patch"
+_builddir="$srcdir"/SDL-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir"/SDL-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--disable-nasm \
 		--disable-esd \
+		--disable-video-svga \
+		--disable-video-ggi \
+		--disable-video-aalib \
 		--enable-alsa \
+		--disable-sdl-dlopen \
 		--with-x \
 		--disable-rpath \
 		--disable-nls 
@@ -31,4 +48,5 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="9d96df8417572a2afb781a7c4c811a85  SDL-1.2.15.tar.gz"
+md5sums="9d96df8417572a2afb781a7c4c811a85  SDL-1.2.15.tar.gz
+37ad001a4d2ff924a5fab356b49f8a78  SDL-1.2.10-GrabNotViewable.patch"
diff --git a/main/sdl/SDL-1.2.10-GrabNotViewable.patch b/main/sdl/SDL-1.2.10-GrabNotViewable.patch
new file mode 100644
index 0000000000..128cf3510d
--- /dev/null
+++ b/main/sdl/SDL-1.2.10-GrabNotViewable.patch
@@ -0,0 +1,22 @@
+Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
+viewable. Patch provided by <pbonzini@redhat.com>.
+See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
+
+--- ./src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
++++ ./src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
+@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
+ 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
+ 						GrabModeAsync, GrabModeAsync,
+ 						SDL_Window, None, CurrentTime);
+-			if ( result == GrabSuccess ) {
++			if ( result == GrabSuccess || result == GrabNotViewable ) {
+ 				break;
+ 			}
+ 			SDL_Delay(100);
+ 		}
+ 		if ( result != GrabSuccess ) {
+ 			/* Uh, oh, what do we do here? */ ;
++			return(SDL_GRAB_OFF);
+ 		}
+ 		/* Now grab the keyboard */
+ 		XGrabKeyboard(SDL_Display, WMwindow, True,