View | Details | Raw Unified | Return to bug 199872 | Differences between
and this patch

Collapse All | Expand All

(-)devel/glib20/Makefile (-6 / +5 lines)
Lines 19-24 Link Here
19
.if !defined(REFERENCE_PORT)
19
.if !defined(REFERENCE_PORT)
20
20
21
LIB_DEPENDS+=	libpcre.so:devel/pcre \
21
LIB_DEPENDS+=	libpcre.so:devel/pcre \
22
		libinotify.so:devel/libinotify \
22
		libffi.so:devel/libffi
23
		libffi.so:devel/libffi
23
24
24
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
Lines 33-41 Link Here
33
		--enable-static=yes \
34
		--enable-static=yes \
34
		--with-pcre=system \
35
		--with-pcre=system \
35
		--disable-fam
36
		--disable-fam
36
CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=
37
CONFIGURE_ENV=	ac_cv_header_sys_event_h=
37
CPPFLAGS+=	-I${LOCALBASE}/include
38
CPPFLAGS+=	-I${LOCALBASE}/include
38
LDFLAGS+=	-L${LOCALBASE}/lib
39
LDFLAGS+=	-L${LOCALBASE}/lib -linotify
39
INSTALL_TARGET=	install-strip
40
INSTALL_TARGET=	install-strip
40
41
41
SHEBANG_FILES=	*/*.pl
42
SHEBANG_FILES=	*/*.pl
Lines 60-66 Link Here
60
CONFIGURE_ARGS+=--disable-dtrace
61
CONFIGURE_ARGS+=--disable-dtrace
61
62
62
.if empty(ICONV_LIB)
63
.if empty(ICONV_LIB)
63
CONFIGURE_ARGS+=	--with-libiconv=native
64
CONFIGURE_ARGS+=	--with-libiconv=maybe
64
.else
65
.else
65
CONFIGURE_ARGS+=	--with-libiconv=gnu
66
CONFIGURE_ARGS+=	--with-libiconv=gnu
66
.endif
67
.endif
Lines 107-115 Link Here
107
	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
108
	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
108
		${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \
109
		${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \
109
		${WRKSRC}/po/*.po
110
		${WRKSRC}/po/*.po
110
	@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
111
	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
111
		s|-Werror|| ; \
112
		s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
113
112
114
post-install:
113
post-install:
115
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
114
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
(-)devel/glib20/files/patch-gio_inotify_inotify-path.c (+16 lines)
Line 0 Link Here
1
--- gio/inotify/inotify-path.c.orig	2015-05-13 05:39:04.000000000 +0300
2
+++ gio/inotify/inotify-path.c	2015-08-19 14:48:51.657572000 +0300
3
@@ -36,7 +36,13 @@
4
 #include "inotify-path.h"
5
 #include "inotify-missing.h"
6
 
7
+#ifdef __linux__
8
 #define IP_INOTIFY_DIR_MASK (IN_MODIFY|IN_ATTRIB|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|IN_CREATE|IN_DELETE_SELF|IN_UNMOUNT|IN_MOVE_SELF|IN_CLOSE_WRITE)
9
+#else
10
+/* libinotify-kqueue opens each file in watched directory if one of IN_MODIFY,
11
+ * IN_ATTRIB or IN_CLOSE_WRITE flags specified. Exclude them from mask */
12
+#define IP_INOTIFY_DIR_MASK (IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|IN_CREATE|IN_DELETE_SELF|IN_UNMOUNT|IN_MOVE_SELF)
13
+#endif
14
 
15
 #define IP_INOTIFY_FILE_MASK (IN_MODIFY|IN_ATTRIB|IN_CLOSE_WRITE)
16
 

Return to bug 199872