Index: branches/2017Q2/devel/glib20/Makefile =================================================================== --- branches/2017Q2/devel/glib20/Makefile (revision 444862) +++ branches/2017Q2/devel/glib20/Makefile (revision 444863) @@ -1,124 +1,124 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= glib PORTVERSION= 2.46.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Some useful routines of C programming (current stable version) LICENSE= LGPL20 USES= tar:xz PORTSCOUT= limitw:1,even .if !defined(REFERENCE_PORT) LIB_DEPENDS+= libpcre.so:devel/pcre \ libffi.so:devel/libffi GNU_CONFIGURE= yes USE_LDCONFIG= yes # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo) # (wchar_t is used by glibmm, rawtherapee triggered this) USES+= gettext gmake gnome iconv:wchar_t libtool pathfix perl5 \ pkgconfig python shebangfix USE_PYTHON= py3kplist CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ --enable-static=yes \ --with-pcre=system \ --disable-fam CONFIGURE_ENV= ac_cv_header_sys_inotify_h= CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip SHEBANG_FILES= */*.pl LIBVERSION= 0.4600.2 PLIST_SUB+= LIBVERSION=${LIBVERSION} glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1 gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 \ glib-compile-schemas.1 gapplication.1 \ glib-compile-resources.1 gresource.1 gdbus-codegen.1 gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1 OPTIONS_DEFINE= COLLATION_FIX DEBUG GDB # libc collation was fixed by https://svnweb.freebsd.org/changeset/base/290494 COLLATION_FIX_DESC= Use ICU for UTF-8 string collation (if libc is broken) GDB_DESC= Install python gdb scripts .include # doesn't build yet CONFIGURE_ARGS+=--disable-dtrace .if empty(ICONV_LIB) CONFIGURE_ARGS+= --with-libiconv=no .else CONFIGURE_ARGS+= --with-libiconv=gnu .endif .if ${ARCH} == powerpc64 EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64 .endif # Let glib use asm code for implementing atomic ops on i386 and amd64. .if ${ARCH} == "i386" GLIB_ARCH= i486 .elif ${ARCH} == "amd64" GLIB_ARCH= x86_64 .else GLIB_ARCH= ${ARCH} .endif CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL} .if ${PORT_OPTIONS:MCOLLATION_FIX} LIB_DEPENDS+= libicui18n.so:devel/icu EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ ${FILESDIR}/extra-patch-glib_gunicollate.c # Disable it until someone can figure why it causes net-im/pidgin crashed. # http://www.freebsd.org/cgi/query-pr.cgi?pr=175930 see comment by ed@ #CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .endif .if ${PORT_OPTIONS:MGDB} PLIST_SUB+= GDB="" .else EXTRA_PATCHES+= ${FILESDIR}/extra-glib_gdbscripts \ ${FILESDIR}/extra-gobject_gdbscripts PLIST_SUB+= GDB="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug=yes .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \ ${WRKSRC}/glib/gutils.c @${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 post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules .for m in glib gio gobject ${INSTALL_MAN} ${${m}_MAN:S|^|${WRKSRC}/docs/reference/${m}/|} \ ${STAGEDIR}${PREFIX}/man/man1 .endfor .include .endif Index: branches/2017Q2/devel/glib20/files/patch-gio_glocalfileoutputstream.c =================================================================== --- branches/2017Q2/devel/glib20/files/patch-gio_glocalfileoutputstream.c (nonexistent) +++ branches/2017Q2/devel/glib20/files/patch-gio_glocalfileoutputstream.c (revision 444863) @@ -0,0 +1,38 @@ +From 45d4b59e3f7ef7b41db08f0c11ee5000126cfedb Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan +Date: Sun, 4 Dec 2016 15:02:54 +0800 +Subject: [PATCH] glocalfileoutputstream: Fix symlink writing on FreeBSD and + NetBSD + +FreeBSD, DragonflyBSD and NetBSD support O_NOFOLLOW, but they use error +numbers that are different from what POSIX standard specifies. They are +not going to change the behavior, and existing programs on these systems +already take advantage of this difference. To support them, we have to +add a check in GIO to use different error numbers on these systems. + +https://bugzilla.gnome.org/show_bug.cgi?id=775593 +--- + gio/glocalfileoutputstream.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c +index 81184a671..4b3733cce 100644 +--- gio/glocalfileoutputstream.c ++++ gio/glocalfileoutputstream.c +@@ -763,7 +763,13 @@ handle_overwrite_open (const char *filename, + #ifdef O_NOFOLLOW + is_symlink = FALSE; + fd = g_open (filename, open_flags | O_NOFOLLOW, mode); ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ++ if (fd == -1 && errno == EMLINK) ++#elif defined(__NetBSD__) ++ if (fd == -1 && errno == EFTYPE) ++#else + if (fd == -1 && errno == ELOOP) ++#endif + { + /* Could be a symlink, or it could be a regular ELOOP error, + * but then the next open will fail too. */ +-- +2.13.0 + Property changes on: branches/2017Q2/devel/glib20/files/patch-gio_glocalfileoutputstream.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 Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 444862) +++ branches/2017Q2 (revision 444863) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r444811