[Midnightbsd-cvs] mports [24733] trunk/devel/glib20: glib20 2.56.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 8 01:40:44 EST 2018
Revision: 24733
http://svnweb.midnightbsd.org/mports/?rev=24733
Author: laffer1
Date: 2018-12-08 01:40:43 -0500 (Sat, 08 Dec 2018)
Log Message:
-----------
glib20 2.56.3
Modified Paths:
--------------
trunk/devel/glib20/Makefile
trunk/devel/glib20/distinfo
trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in
trunk/devel/glib20/pkg-plist
Removed Paths:
-------------
trunk/devel/glib20/files/extra-patch-glib_Makefile.in
trunk/devel/glib20/files/extra-patch-glib_gunicollate.c
Modified: trunk/devel/glib20/Makefile
===================================================================
--- trunk/devel/glib20/Makefile 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/Makefile 2018-12-08 06:40:43 UTC (rev 24733)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= glib
-PORTVERSION= 2.56.1
-PORTREVISION= 1
+PORTVERSION= 2.56.3
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -27,20 +26,19 @@
# 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 \
- pathfix perl5 pkgconfig python shebangfix
+ localbase pathfix perl5 pkgconfig python shebangfix
USE_PYTHON= py3kplist
+USE_PERL5= build
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
- --disable-man --without-xml-catalog \
- --disable-dtrace \
--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
-LIBVERSION= 0.5600.1
+SHEBANG_FILES= */*.pl
+
+LIBVERSION= 0.5600.3
PLIST_SUB+= LIBVERSION=${LIBVERSION}
glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1
@@ -49,18 +47,16 @@
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_DEFINE= DEBUG MANPAGES 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)
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.
-#COLLATION_FIX_CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__"
+MANPAGES_BUILD_DEPENDS= docbook-xml>4.1.2:textproc/docbook-xml \
+ docbook-xsl>0:textproc/docbook-xsl
+MANPAGES_USE= GNOME=libxslt:build
+MANPAGES_CONFIGURE_ENABLE= man
+MANPAGES_CONFIGURE_ON= --with-xml-catalog=${LOCALBASE}/share/xml/catalog
.include <bsd.port.pre.mk>
@@ -98,9 +94,18 @@
s|-Werror|| ; \
s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
+do-build-MANPAGES-on:
+.for m in glib gio gobject
+. for file in ${${m}_MAN}
+ cd ${WRKSRC}/docs/reference/${m} && ${GMAKE} ${file}
+. endfor
+.endfor
+
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules
+
+post-install-MANPAGES-on:
.for m in glib gio gobject
${INSTALL_MAN} ${${m}_MAN:S|^|${WRKSRC}/docs/reference/${m}/|} \
${STAGEDIR}${PREFIX}/man/man1
Modified: trunk/devel/glib20/distinfo
===================================================================
--- trunk/devel/glib20/distinfo 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/distinfo 2018-12-08 06:40:43 UTC (rev 24733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525371429
-SHA256 (gnome2/glib-2.56.1.tar.xz) = 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
-SIZE (gnome2/glib-2.56.1.tar.xz) = 8028716
+TIMESTAMP = 1544250931
+SHA256 (gnome2/glib-2.56.3.tar.xz) = a9a4c5b4c81b6c75bc140bdf5e32120ef3ce841b7413214ecf5f987acec74cb2
+SIZE (gnome2/glib-2.56.3.tar.xz) = 7009912
Deleted: trunk/devel/glib20/files/extra-patch-glib_Makefile.in
===================================================================
--- trunk/devel/glib20/files/extra-patch-glib_Makefile.in 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/files/extra-patch-glib_Makefile.in 2018-12-08 06:40:43 UTC (rev 24733)
@@ -1,11 +0,0 @@
---- glib/Makefile.in.orig 2012-09-27 15:07:28.000000000 +0000
-+++ glib/Makefile.in 2012-09-27 15:08:02.000000000 +0000
-@@ -415,7 +415,7 @@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -licui18n
- LIBELF_CFLAGS = @LIBELF_CFLAGS@
- LIBELF_LIBS = @LIBELF_LIBS@
- LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
Deleted: trunk/devel/glib20/files/extra-patch-glib_gunicollate.c
===================================================================
--- trunk/devel/glib20/files/extra-patch-glib_gunicollate.c 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/files/extra-patch-glib_gunicollate.c 2018-12-08 06:40:43 UTC (rev 24733)
@@ -1,124 +0,0 @@
---- glib/gunicollate.c.orig 2012-11-24 20:50:39.000000000 +0000
-+++ glib/gunicollate.c 2013-03-08 12:16:59.000000000 +0000
-@@ -26,6 +26,10 @@
- #include <wchar.h>
- #endif
-
-+#include <unicode/umachine.h>
-+#include <unicode/ustring.h>
-+#include <unicode/ucol.h>
-+
- #ifdef HAVE_CARBON
- #include <CoreServices/CoreServices.h>
- #endif
-@@ -36,11 +40,54 @@
- #include "gstring.h"
- #include "gstrfuncs.h"
- #include "gtestutils.h"
-+#include "gthread.h"
- #include "gcharset.h"
- #ifndef __STDC_ISO_10646__
- #include "gconvert.h"
- #endif
-
-+static gboolean icu_collator_initialized = FALSE;
-+static UCollator *icu_collator = NULL;
-+G_LOCK_DEFINE_STATIC(icu_collator);
-+
-+static void
-+init_icu_collator (void)
-+{
-+ G_LOCK(icu_collator);
-+ if (! icu_collator_initialized)
-+ {
-+ UErrorCode error = U_ZERO_ERROR;
-+
-+ icu_collator = ucol_open(NULL, &error);
-+ if (icu_collator == NULL)
-+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
-+
-+ icu_collator_initialized = TRUE;
-+ }
-+ G_UNLOCK(icu_collator);
-+}
-+
-+static UChar *
-+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len)
-+{
-+ UErrorCode error = U_ZERO_ERROR;
-+ UChar *result = NULL;
-+
-+ u_strFromUTF8(NULL, 0, result_len, str, len, &error);
-+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR)
-+ {
-+ error = U_ZERO_ERROR;
-+ result = g_new(UChar, *result_len);
-+ u_strFromUTF8(result, *result_len, NULL, str, len, &error);
-+ if (error > U_ZERO_ERROR)
-+ {
-+ g_free(result);
-+ result = NULL;
-+ }
-+ }
-+
-+ return result;
-+}
-
- #ifdef _MSC_VER
- /* Workaround for bug in MSVCR80.DLL */
-@@ -128,6 +175,28 @@
- g_return_val_if_fail (str1 != NULL, 0);
- g_return_val_if_fail (str2 != NULL, 0);
-
-+ init_icu_collator();
-+ if (icu_collator != NULL)
-+ {
-+ int32_t wstr1_len;
-+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
-+ if (wstr1 != NULL)
-+ {
-+ int32_t wstr2_len;
-+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
-+ if (wstr2 != NULL)
-+ {
-+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
-+
-+ g_free(wstr1);
-+ g_free(wstr2);
-+
-+ return result;
-+ }
-+ g_free(wstr1);
-+ }
-+ }
-+
- str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
- str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
-
-@@ -419,6 +488,26 @@
-
- g_return_val_if_fail (str != NULL, NULL);
-
-+ init_icu_collator();
-+ if (icu_collator != NULL)
-+ {
-+ int32_t wstr_len;
-+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
-+ if (wstr != NULL)
-+ {
-+ int32_t result_len;
-+
-+ /* get size of result */
-+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
-+
-+ result = g_new(char, result_len);
-+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
-+ g_free(wstr);
-+
-+ return result;
-+ }
-+ }
-+
- str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
-
- result = NULL;
Modified: trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in 2018-12-08 06:40:43 UTC (rev 24733)
@@ -1,6 +1,6 @@
---- gio/kqueue/Makefile.in.orig 2018-04-09 23:09:21.018712000 +0200
-+++ gio/kqueue/Makefile.in 2018-04-09 23:09:38.517739000 +0200
-@@ -183,9 +183,7 @@ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_L
+--- gio/kqueue/Makefile.in.orig 2018-10-01 19:39:31.421019000 +0200
++++ gio/kqueue/Makefile.in 2018-10-01 19:43:01.841725000 +0200
+@@ -187,9 +187,7 @@ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_L
libkqueue_la_LIBADD =
am__objects_1 =
am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \
@@ -11,7 +11,7 @@
libkqueue_la-dep-list.lo $(am__objects_1)
libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)
AM_V_lt = $(am__v_lt_ at AM_V@)
-@@ -777,19 +775,9 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_te
+@@ -785,19 +783,9 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_te
@ENABLE_INSTALLED_TESTS_TRUE at installed_test_meta_DATA = $(installed_testcases:=.test)
libkqueue_la_SOURCES = \
gkqueuefilemonitor.c \
@@ -31,20 +31,20 @@
dep-list.c \
dep-list.h \
$(NULL)
-@@ -1009,12 +997,8 @@ distclean-compile:
+@@ -1017,12 +1005,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-dep-list.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-gkqueuefilemonitor.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-helper.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-missing.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-sub.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-thread.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-utils.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-dep-list.Plo at am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-gkqueuefilemonitor.Plo at am__quote@ # am--include-marker
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo at am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-helper.Plo at am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-missing.Plo at am__quote@ # am--include-marker
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-sub.Plo at am__quote@ # am--include-marker
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-thread.Plo at am__quote@ # am--include-marker
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-utils.Plo at am__quote@ # am--include-marker
- .c.o:
- @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@@ -1054,40 +1038,12 @@ libkqueue_la-kqueue-helper.lo: kqueue-helper.c
+ $(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+@@ -1068,40 +1052,12 @@ libkqueue_la-kqueue-helper.lo: kqueue-helper.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-helper.lo `test -f 'kqueue-helper.c' || echo '$(srcdir)/'`kqueue-helper.c
Modified: trunk/devel/glib20/pkg-plist
===================================================================
--- trunk/devel/glib20/pkg-plist 2018-11-28 14:14:43 UTC (rev 24732)
+++ trunk/devel/glib20/pkg-plist 2018-12-08 06:40:43 UTC (rev 24733)
@@ -304,21 +304,21 @@
libdata/pkgconfig/gmodule-no-export-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
-man/man1/gapplication.1.gz
-man/man1/gdbus-codegen.1.gz
-man/man1/gdbus.1.gz
-man/man1/gio-querymodules.1.gz
-man/man1/gio.1.gz
-man/man1/glib-compile-resources.1.gz
-man/man1/glib-compile-schemas.1.gz
-man/man1/glib-genmarshal.1.gz
-man/man1/glib-gettextize.1.gz
-man/man1/glib-mkenums.1.gz
-man/man1/gobject-query.1.gz
-man/man1/gresource.1.gz
-man/man1/gsettings.1.gz
-man/man1/gtester-report.1.gz
-man/man1/gtester.1.gz
+%%MANPAGES%%man/man1/gapplication.1.gz
+%%MANPAGES%%man/man1/gdbus-codegen.1.gz
+%%MANPAGES%%man/man1/gdbus.1.gz
+%%MANPAGES%%man/man1/gio-querymodules.1.gz
+%%MANPAGES%%man/man1/gio.1.gz
+%%MANPAGES%%man/man1/glib-compile-resources.1.gz
+%%MANPAGES%%man/man1/glib-compile-schemas.1.gz
+%%MANPAGES%%man/man1/glib-genmarshal.1.gz
+%%MANPAGES%%man/man1/glib-gettextize.1.gz
+%%MANPAGES%%man/man1/glib-mkenums.1.gz
+%%MANPAGES%%man/man1/gobject-query.1.gz
+%%MANPAGES%%man/man1/gresource.1.gz
+%%MANPAGES%%man/man1/gsettings.1.gz
+%%MANPAGES%%man/man1/gtester-report.1.gz
+%%MANPAGES%%man/man1/gtester.1.gz
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/aclocal/gsettings.m4
More information about the Midnightbsd-cvs
mailing list