svn commit: r549741 - in head/devel/glib20: . files
Baptiste Daroussin
bapt at FreeBSD.org
Wed Sep 23 15:35:30 UTC 2020
Author: bapt
Date: Wed Sep 23 15:35:28 2020
New Revision: 549741
URL: https://svnweb.freebsd.org/changeset/ports/549741
Log:
Actually commit the glib 2.66.0 update
Reported by: fluffy
Differential Revision: https://reviews.freebsd.org/D25279
Added:
head/devel/glib20/files/patch-glib_gfileutils.c (contents, props changed)
Deleted:
head/devel/glib20/files/extra-gobject_gdbscripts
head/devel/glib20/files/patch-config.h.in
head/devel/glib20/files/patch-configure
head/devel/glib20/files/patch-docs_reference_Makefile.in
head/devel/glib20/files/patch-gio_gthreadedresolver.c
head/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
head/devel/glib20/files/patch-gio_kqueue_Makefile.in
head/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
head/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
head/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
head/devel/glib20/files/patch-glib_gconvert.c
head/devel/glib20/files/patch-glib_libcharset_Makefile.in
head/devel/glib20/files/patch-keyfile
Modified:
head/devel/glib20/Makefile
head/devel/glib20/distinfo
head/devel/glib20/files/patch-glib_gutils.c
head/devel/glib20/pkg-plist
Modified: head/devel/glib20/Makefile
==============================================================================
--- head/devel/glib20/Makefile Wed Sep 23 15:34:34 2020 (r549740)
+++ head/devel/glib20/Makefile Wed Sep 23 15:35:28 2020 (r549741)
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 2.56.3
-PORTREVISION= 9
+PORTVERSION= 2.66.0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome
MAINTAINER= desktop at FreeBSD.org
COMMENT= Some useful routines of C programming (current stable version)
@@ -22,24 +21,21 @@ PORTSCOUT= limitw:1,even
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
+USES+= compiler:c11 gettext gnome iconv:wchar_t \
+ localbase:ldflags meson perl5 pkgconfig python:3.5+
USE_PYTHON= py3kplist
USE_PERL5= build
-CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
- --enable-static=yes \
- --with-pcre=system \
- --disable-fam
-CONFIGURE_ENV= ac_cv_header_sys_inotify_h=
-INSTALL_TARGET= install-strip
+USE_LDCONFIG= yes
+MESON_ARGS= -Db_lundef=false \
+ -Dlibmount=disabled \
+ -Dselinux=disabled \
+ -Dinstalled_tests=false \
+ -Dxattr=false
+BINARY_ALIAS= python3=${PYTHON_VERSION}
-SHEBANG_FILES= */*.pl
-
-LIBVERSION= 0.5600.3
+LIBVERSION= 0.6600.0
PLIST_SUB+= LIBVERSION=${LIBVERSION}
glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1
@@ -52,63 +48,60 @@ OPTIONS_DEFINE= DEBUG MANPAGES NLS
OPTIONS_DEFAULT= MANPAGES
OPTIONS_SUB= yes
-DEBUG_CONFIGURE_ON= --enable-debug=yes
-
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
+MANPAGES_MESON_TRUE= man
.include <bsd.port.pre.mk>
# doesn't build yet
-CONFIGURE_ARGS+=--disable-dtrace
+MESON_ARGS+= -Ddtrace=false
.if empty(ICONV_LIB)
-CONFIGURE_ARGS+= --with-libiconv=no
+MESON_ARGS+= -Diconv=libc # native?
.else
-CONFIGURE_ARGS+= --with-libiconv=gnu
+MESON_ARGS+= -Diconv=external
.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
+ ${WRKSRC}/glib/gutils.c
+ @${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_VERSION}|g' \
+ ${WRKSRC}/gio/gdbus-2.0/codegen/gdbus-codegen.in \
+ ${WRKSRC}/glib/gtester-report.in \
+ ${WRKSRC}/gobject/glib-genmarshal.in \
+ ${WRKSRC}/gobject/glib-mkenums.in
+ @${REINPLACE_CMD} -e '/inotify_init1/d' \
+ -e '/inotify.h/d' \
+ ${WRKSRC}/meson.build
-do-build-MANPAGES-on:
-.for m in glib gio gobject
-. for file in ${${m}_MAN}
- cd ${WRKSRC}/docs/reference/${m} && ${GMAKE} ${file}
-. endfor
-.endfor
+CODEGENDIR= ${PREFIX}/share/glib-2.0/codegen
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
+# generates .py[co] files for installed modules
+# if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
+# with these files when module is imported from root user
+ @${FIND} ${STAGEDIR}${PREFIX} -name \*.pyc -delete
+ (cd ${STAGEDIR}${PREFIX} && \
+ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+ -d ${CODEGENDIR} -f ${CODEGENDIR:S;${PREFIX}/;;} && \
+ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+ -d ${CODEGENDIR} -f ${CODEGENDIR:S;${PREFIX}/;;})
+ # install bash completion regardless if bash is present
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
+.for file in gapplication gdbus gio gresource gsettings
+ ${INSTALL_DATA} ${WRKSRC}/gio/completion/${file} \
+ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
.endfor
+ @${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests
.include <bsd.port.post.mk>
Modified: head/devel/glib20/distinfo
==============================================================================
--- head/devel/glib20/distinfo Wed Sep 23 15:34:34 2020 (r549740)
+++ head/devel/glib20/distinfo Wed Sep 23 15:35:28 2020 (r549741)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538415400
-SHA256 (gnome2/glib-2.56.3.tar.xz) = a9a4c5b4c81b6c75bc140bdf5e32120ef3ce841b7413214ecf5f987acec74cb2
-SIZE (gnome2/glib-2.56.3.tar.xz) = 7009912
+TIMESTAMP = 1600085241
+SHA256 (gnome/glib-2.66.0.tar.xz) = c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c
+SIZE (gnome/glib-2.66.0.tar.xz) = 4839236
Added: head/devel/glib20/files/patch-glib_gfileutils.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/glib20/files/patch-glib_gfileutils.c Wed Sep 23 15:35:28 2020 (r549741)
@@ -0,0 +1,42 @@
+https://gitlab.gnome.org/GNOME/glib/merge_requests/832
+
+Index: glib/gfileutils.c
+--- glib/gfileutils.c.orig
++++ glib/gfileutils.c
+@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname,
+
+ if (!g_file_test (fn, G_FILE_TEST_EXISTS))
+ {
+- if (g_mkdir (fn, mode) == -1 && errno != EEXIST)
++ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1)))
+ {
+ int errno_save = errno;
+ if (errno != ENOENT || !p)
+https://gitlab.gnome.org/GNOME/glib/merge_requests/832
+
+Index: glib/gfileutils.c
+--- glib/gfileutils.c.orig
++++ glib/gfileutils.c
+@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname,
+
+ if (!g_file_test (fn, G_FILE_TEST_EXISTS))
+ {
+- if (g_mkdir (fn, mode) == -1 && errno != EEXIST)
++ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1)))
+ {
+ int errno_save = errno;
+ if (errno != ENOENT || !p)
+https://gitlab.gnome.org/GNOME/glib/merge_requests/832
+
+Index: glib/gfileutils.c
+--- glib/gfileutils.c.orig
++++ glib/gfileutils.c
+@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname,
+
+ if (!g_file_test (fn, G_FILE_TEST_EXISTS))
+ {
+- if (g_mkdir (fn, mode) == -1 && errno != EEXIST)
++ if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1)))
+ {
+ int errno_save = errno;
+ if (errno != ENOENT || !p)
Modified: head/devel/glib20/files/patch-glib_gutils.c
==============================================================================
--- head/devel/glib20/files/patch-glib_gutils.c Wed Sep 23 15:34:34 2020 (r549740)
+++ head/devel/glib20/files/patch-glib_gutils.c Wed Sep 23 15:35:28 2020 (r549741)
@@ -1,20 +1,11 @@
---- glib/gutils.c.orig Wed Mar 23 09:55:02 2005
-+++ glib/gutils.c Thu Apr 7 01:06:16 2005
-@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void)
- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
+--- glib/gutils.c.orig 2018-12-23 14:10:41.000000000 +0100
++++ glib/gutils.c 2018-12-27 00:18:23.471950000 +0100
+@@ -2219,7 +2219,7 @@
+ }
+ #else
+ if (!conf_dirs || !conf_dirs[0])
+- conf_dirs = "/etc/xdg";
++ conf_dirs = "/usr/local/etc/xdg:/etc/xdg";
- if (!data_dirs || !data_dirs[0])
-- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = "/usr/local/share/";
-
- data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #endif
-@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void)
- conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
-
- if (!conf_dirs || !conf_dirs[0])
-- conf_dirs = "/etc/xdg";
-+ conf_dirs = "/usr/local/etc/xdg:/etc/xdg";
-
- conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
+ conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif
Modified: head/devel/glib20/pkg-plist
==============================================================================
--- head/devel/glib20/pkg-plist Wed Sep 23 15:34:34 2020 (r549740)
+++ head/devel/glib20/pkg-plist Wed Sep 23 15:35:28 2020 (r549741)
@@ -104,12 +104,14 @@ include/glib-2.0/gio/glistmodel.h
include/glib-2.0/gio/gliststore.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
+include/glib-2.0/gio/gmemorymonitor.h
include/glib-2.0/gio/gmemoryoutputstream.h
include/glib-2.0/gio/gmenu.h
include/glib-2.0/gio/gmenuexporter.h
include/glib-2.0/gio/gmenumodel.h
include/glib-2.0/gio/gmount.h
include/glib-2.0/gio/gmountoperation.h
+include/glib-2.0/gio/gnativesocketaddress.h
include/glib-2.0/gio/gnativevolumemonitor.h
include/glib-2.0/gio/gnetworkaddress.h
include/glib-2.0/gio/gnetworking.h
@@ -226,6 +228,9 @@ include/glib-2.0/glib/gqsort.h
include/glib-2.0/glib/gquark.h
include/glib-2.0/glib/gqueue.h
include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/grcbox.h
+include/glib-2.0/glib/grefcount.h
+include/glib-2.0/glib/grefstring.h
include/glib-2.0/glib/gregex.h
include/glib-2.0/glib/gscanner.h
include/glib-2.0/glib/gsequence.h
@@ -246,7 +251,7 @@ include/glib-2.0/glib/gtrashstack.h
include/glib-2.0/glib/gtree.h
include/glib-2.0/glib/gtypes.h
include/glib-2.0/glib/gunicode.h
-include/glib-2.0/glib/gurifuncs.h
+include/glib-2.0/glib/guri.h
include/glib-2.0/glib/gutils.h
include/glib-2.0/glib/guuid.h
include/glib-2.0/glib/gvariant.h
@@ -259,6 +264,7 @@ include/glib-2.0/gobject/gbinding.h
include/glib-2.0/gobject/gboxed.h
include/glib-2.0/gobject/gclosure.h
include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-enumtypes.h
include/glib-2.0/gobject/glib-types.h
include/glib-2.0/gobject/gmarshal.h
include/glib-2.0/gobject/gobject-autocleanups.h
@@ -276,23 +282,18 @@ include/glib-2.0/gobject/gvaluearray.h
include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
lib/glib-2.0/include/glibconfig.h
-lib/libgio-2.0.a
lib/libgio-2.0.so
lib/libgio-2.0.so.0
lib/libgio-2.0.so.%%LIBVERSION%%
-lib/libglib-2.0.a
lib/libglib-2.0.so
lib/libglib-2.0.so.0
lib/libglib-2.0.so.%%LIBVERSION%%
-lib/libgmodule-2.0.a
lib/libgmodule-2.0.so
lib/libgmodule-2.0.so.0
lib/libgmodule-2.0.so.%%LIBVERSION%%
-lib/libgobject-2.0.a
lib/libgobject-2.0.so
lib/libgobject-2.0.so.0
lib/libgobject-2.0.so.%%LIBVERSION%%
-lib/libgthread-2.0.a
lib/libgthread-2.0.so
lib/libgthread-2.0.so.0
lib/libgthread-2.0.so.%%LIBVERSION%%
@@ -324,6 +325,7 @@ share/aclocal/glib-gettext.m4
share/aclocal/gsettings.m4
share/bash-completion/completions/gapplication
share/bash-completion/completions/gdbus
+share/bash-completion/completions/gio
share/bash-completion/completions/gresource
share/bash-completion/completions/gsettings
share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py
More information about the svn-ports-all
mailing list