Index: branches/2018Q4/devel/glib20/Makefile =================================================================== --- branches/2018Q4/devel/glib20/Makefile (revision 484300) +++ branches/2018Q4/devel/glib20/Makefile (revision 484301) @@ -1,111 +1,111 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= glib PORTVERSION= 2.56.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 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+= compiler:c11 gettext gmake gnome iconv:wchar_t libtool \ localbase 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= INSTALL_TARGET= install-strip SHEBANG_FILES= */*.pl LIBVERSION= 0.5600.1 PLIST_SUB+= LIBVERSION=${LIBVERSION} glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1 gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.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 NLS OPTIONS_SUB= yes # 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) OPTIONS_EXCLUDE_FreeBSD_11= COLLATION_FIX OPTIONS_EXCLUDE_FreeBSD_12= COLLATION_FIX DEBUG_CONFIGURE_ON= --enable-debug=yes COLLATION_FIX_LIB_DEPENDS+= libicui18n.so:devel/icu COLLATION_FIX_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@ #COLLATION_FIX_CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .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} 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|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/2018Q4/devel/glib20/files/patch-revert-8abf3a0 =================================================================== --- branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 (nonexistent) +++ branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 (revision 484301) @@ -0,0 +1,61 @@ +Revert https://gitlab.gnome.org/GNOME/glib/commit/8abf3a04e699 for +breaking at least graphics/inkscape as wchar_t is locale-dependent. + +--- glib/gconvert.c.orig 2018-03-12 16:23:37 UTC ++++ glib/gconvert.c +@@ -264,13 +264,6 @@ g_iconv_open (const gchar *to_codeset, + * GLib provides g_convert() and g_locale_to_utf8() which are likely + * more convenient than the raw iconv wrappers. + * +- * Note that the behaviour of iconv() for characters which are valid in the +- * input character set, but which have no representation in the output character +- * set, is implementation defined. This function may return success (with a +- * positive number of non-reversible conversions as replacement characters were +- * used), or it may return -1 and set an error such as %EILSEQ, in such a +- * situation. +- * + * Returns: count of non-reversible conversions, or -1 on error + **/ + gsize +@@ -379,14 +372,6 @@ close_converter (GIConv cd) + * character until it knows that the next character is not a mark that + * could combine with the base character.) + * +- * Characters which are valid in the input character set, but which have no +- * representation in the output character set will result in a +- * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE error. This is in contrast to the iconv() +- * specification, which leaves this behaviour implementation defined. Note that +- * this is the same error code as is returned for an invalid byte sequence in +- * the input character set. To get defined behaviour for conversion of +- * unrepresentable characters, use g_convert_with_fallback(). +- * + * Returns: (array length=bytes_written) (element-type guint8) (transfer full): + * If the conversion was successful, a newly allocated buffer + * containing the converted string, which must be freed with +@@ -466,13 +451,6 @@ g_convert_with_iconv (const gchar *str, + break; + } + } +- else if (err > 0) +- { +- /* @err gives the number of replacement characters used. */ +- g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, +- _("Unrepresentable character in conversion input")); +- have_error = TRUE; +- } + else + { + if (!reset) +--- glib/gconvert.h.orig 2018-02-06 15:44:20 UTC ++++ glib/gconvert.h +@@ -37,9 +37,7 @@ G_BEGIN_DECLS + * GConvertError: + * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character + * sets is not supported. +- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input; +- * or the character sequence could not be represented in the target +- * character set. ++ * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input. + * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason. + * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input. + * @G_CONVERT_ERROR_BAD_URI: URI is invalid. Property changes on: branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 ___________________________________________________________________ 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/2018Q4 =================================================================== --- branches/2018Q4 (revision 484300) +++ branches/2018Q4 (revision 484301) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r483878