Attachment 177118 Details for Bug 199872 – glib20-libinotify.patch

[patch] glib20-libinotify.patch

devel.glib20.patch (text/plain), 2.70 KB, created by Vladimir Kondratyev on 2016-11-17 16:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratyev

Created: 2016-11-17 16:06:16 UTC

Size: 2.70 KB

patch

obsolete

>Index: devel/glib20/Makefile
>===================================================================
>--- devel/glib20/Makefile	(revision 426205)
>+++ devel/glib20/Makefile	(working copy)
>@@ -19,6 +19,7 @@
> .if !defined(REFERENCE_PORT)
> 
> LIB_DEPENDS+=	libpcre.so:devel/pcre \
>+		libinotify.so:devel/libinotify \
> 		libffi.so:devel/libffi
> 
> GNU_CONFIGURE=	yes
>@@ -33,9 +34,9 @@
> 		--enable-static=yes \
> 		--with-pcre=system \
> 		--disable-fam
>-CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=
>+CONFIGURE_ENV=	ac_cv_header_sys_event_h=
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+LDFLAGS+=	-L${LOCALBASE}/lib -linotify
> INSTALL_TARGET=	install-strip
> 
> SHEBANG_FILES=	*/*.pl
>@@ -60,7 +61,7 @@
> CONFIGURE_ARGS+=--disable-dtrace
> 
> .if empty(ICONV_LIB)
>-CONFIGURE_ARGS+=	--with-libiconv=native
>+CONFIGURE_ARGS+=	--with-libiconv=maybe
> .else
> CONFIGURE_ARGS+=	--with-libiconv=gnu
> .endif
>@@ -107,9 +108,7 @@
> 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
> 		${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \
> 		${WRKSRC}/po/*.po
>-	@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
>-		s|-Werror|| ; \
>-		s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/configure
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
>Index: devel/glib20/files/patch-gio_inotify_inotify-path.c
>===================================================================
>--- devel/glib20/files/patch-gio_inotify_inotify-path.c	(nonexistent)
>+++ devel/glib20/files/patch-gio_inotify_inotify-path.c	(working copy)
>@@ -0,0 +1,16 @@
>+--- gio/inotify/inotify-path.c.orig	2015-05-13 05:39:04.000000000 +0300
>++++ gio/inotify/inotify-path.c	2015-08-19 14:48:51.657572000 +0300
>+@@ -36,7 +36,13 @@
>+ #include "inotify-path.h"
>+ #include "inotify-missing.h"
>+ 
>++#ifdef __linux__
>+ #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)
>++#else
>++/* libinotify-kqueue opens each file in watched directory if one of IN_MODIFY,
>++ * IN_ATTRIB or IN_CLOSE_WRITE flags specified. Exclude them from mask */
>++#define IP_INOTIFY_DIR_MASK (IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|IN_CREATE|IN_DELETE_SELF|IN_UNMOUNT|IN_MOVE_SELF)
>++#endif
>+ 
>+ #define IP_INOTIFY_FILE_MASK (IN_MODIFY|IN_ATTRIB|IN_CLOSE_WRITE)
>+ 
>
>Property changes on: devel/glib20/files/patch-gio_inotify_inotify-path.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 199872: 156258 | 177083 | 177118 | 186826 | 188059 | 188365 | 189330 | 189354