New revision of the kqueue patch; hopefully to be pushed upstream soon...

This commit is contained in:
ajacoutot 2012-11-13 16:34:59 +00:00
parent 28196f6018
commit 87f6510efa
3 changed files with 9 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.195 2012/11/10 07:37:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.196 2012/11/13 16:34:59 ajacoutot Exp $
COMMENT= general-purpose utility library
@ -7,6 +7,8 @@ DISTNAME= glib-${V}
PKGNAME= ${DISTNAME:S/glib/glib2/}
EXTRACT_SUFX= .tar.xz
REVISION= 0
CATEGORIES= devel
HOMEPAGE= http://www.gtk.org/
@ -82,9 +84,8 @@ AUTOCONF_VERSION= 2.68
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
#MASTER_SITES0= http://dmitrymatveev.co.uk/files/
MASTER_SITES0= http://distfiles.bsdfrog.org/
PATCHFILES= glib-gio-kqueue-2.32.4-v3.patch:0
PATCHFILES= glib-gio-kqueue-2.34.2-v1.patch:0
PATCH_DIST_STRIP= -p1
AUTO_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION}

View File

@ -1,4 +1,4 @@
SHA256 (glib-2.34.2.tar.xz) = LZmoMJzdDFhL1ThqSSZfsZrGRXX+EI/ZAdbybI1zxwg=
SHA256 (glib-gio-kqueue-2.32.4-v3.patch) = H8wqMyMQKnemBvZ7nYfNC6skI0uKJgL5WHhzpxNfbc4=
SHA256 (glib-gio-kqueue-2.34.2-v1.patch) = G/6ZleWY8o7jCLL43B8vxYgJePbMuMGtGLMRObX43Ec=
SIZE (glib-2.34.2.tar.xz) = 6367740
SIZE (glib-gio-kqueue-2.32.4-v3.patch) = 100892
SIZE (glib-gio-kqueue-2.34.2-v1.patch) = 101174

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gio_tests_file_c,v 1.2 2012/11/12 10:19:39 ajacoutot Exp $
$OpenBSD: patch-gio_tests_file_c,v 1.3 2012/11/13 16:34:59 ajacoutot Exp $
XXX why isn't this working with kqueue?
push upstream when the kqueue patch is committed there
--- gio/tests/file.c.orig Sat Nov 10 04:18:46 2012
+++ gio/tests/file.c Mon Nov 12 11:18:31 2012
+++ gio/tests/file.c Tue Nov 13 17:16:38 2012
@@ -424,13 +424,14 @@ test_create_delete (gconstpointer d)
data->monitor = g_file_monitor_file (data->file, 0, NULL, &error);
g_assert_no_error (error);
@ -12,7 +12,7 @@ push upstream when the kqueue patch is committed there
- /* This test doesn't work with GPollFileMonitor, because it assumes
- * that the monitor will notice a create immediately followed by a
- * delete, rather than coalescing them into nothing.
+ /* This test doesn't work with GPollFileMonitor nor GKqueueDirectoryMonitor,
+ /* This test doesn't work with GPollFileMonitor nor GKqueueFileMonitor,
+ * because it assumes that the monitor will notice a create immediately
+ * followed by a delete, rather than coalescing them into nothing.
*/