git: 9962b53facb0 - main - devel/glib20: update to 2.74.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Sep 2022 20:59:06 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9962b53facb0f9295ceca9b69ce7f94ec1e2c425
commit 9962b53facb0f9295ceca9b69ce7f94ec1e2c425
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-09-17 18:38:17 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-09-26 20:56:15 +0000
devel/glib20: update to 2.74.0
Changes: https://gitlab.gnome.org/GNOME/glib/-/blob/2.74.0/NEWS
PR: 266466
Reported by: GitLab (notify releases)
Exp-run by: antoine
---
devel/glib20/Makefile | 13 +++----------
devel/glib20/distinfo | 6 +++---
devel/glib20/files/patch-glib_meson.build | 8 ++++----
devel/glib20/pkg-plist | 7 ++++++-
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5ffee25b32ee..6b6237dc8f71 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,5 +1,5 @@
PORTNAME= glib
-DISTVERSION= 2.72.4
+DISTVERSION= 2.74.0
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -12,7 +12,7 @@ WWW= https://www.gtk.org/
LICENSE= LGPL20
LIB_DEPENDS= libffi.so:devel/libffi \
- libpcre.so:devel/pcre
+ libpcre2-8.so:devel/pcre2
# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
# (wchar_t is used by glibmm, rawtherapee triggered this)
@@ -35,7 +35,7 @@ CPE_VENDOR= gnome
CONFLICTS_INSTALL= p5-Giovanni
-_LIBVERSION= 0.7200.4
+_LIBVERSION= 0.7400.0
PLIST_SUB= LIBVERSION=${_LIBVERSION}
OPTIONS_DEFINE= DEBUG DOCS FAM_ALTBACKEND MANPAGES NLS TEST
@@ -61,13 +61,6 @@ TEST_MESON_TRUE= tests
# doesn't build yet
MESON_ARGS+= -Ddtrace=false
-.if empty(ICONV_LIB)
-# native?
-MESON_ARGS+= -Diconv=libc
-.else
-MESON_ARGS+= -Diconv=external
-.endif
-
pre-configure-FAM_ALTBACKEND-on:
@${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \
s|.*kqueue-missing.c.*||g ; \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index ac83c9910d5c..4c2e341d1817 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663758356
-SHA256 (gnome/glib-2.72.4.tar.xz) = 8848aba518ba2f4217d144307a1d6cb9afcc92b54e5c13ac1f8c4d4608e96f0e
-SIZE (gnome/glib-2.72.4.tar.xz) = 4884256
+TIMESTAMP = 1663439897
+SHA256 (gnome/glib-2.74.0.tar.xz) = 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+SIZE (gnome/glib-2.74.0.tar.xz) = 5183072
diff --git a/devel/glib20/files/patch-glib_meson.build b/devel/glib20/files/patch-glib_meson.build
index 3c5d770a633a..40cc18b594b6 100644
--- a/devel/glib20/files/patch-glib_meson.build
+++ b/devel/glib20/files/patch-glib_meson.build
@@ -1,11 +1,11 @@
---- glib/meson.build.orig 2022-03-17 15:01:31 UTC
+--- glib/meson.build.orig 2022-09-17 18:38:17 UTC
+++ glib/meson.build
-@@ -375,7 +375,7 @@ libglib = library('glib-2.0',
+@@ -379,7 +379,7 @@ libglib = library('glib-2.0',
link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
include_directories : configinc,
link_with: [charset_lib, gnulib_lib],
-- dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
-+ dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
+- dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
++ dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
c_args : glib_c_args,
objc_args : glib_c_args,
)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 9af3d066310a..a763c42df695 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -15,7 +15,6 @@ bin/gtester
bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
-include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
@@ -170,6 +169,7 @@ include/glib-2.0/gio/gtlspassword.h
include/glib-2.0/gio/gtlsserverconnection.h
include/glib-2.0/gio/gunixconnection.h
include/glib-2.0/gio/gunixcredentialsmessage.h
+include/glib-2.0/gio/gunixfdlist.h
include/glib-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
@@ -317,6 +317,7 @@ libdata/pkgconfig/gmodule-export-2.0.pc
libdata/pkgconfig/gmodule-no-export-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
+libexec/gio-launch-desktop
%%MANPAGES%%man/man1/gapplication.1.gz
%%MANPAGES%%man/man1/gdbus-codegen.1.gz
%%MANPAGES%%man/man1/gdbus.1.gz
@@ -550,6 +551,7 @@ share/gettext/its/gschema.loc
%%DOCS%%share/gtk-doc/html/gio/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/gio/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/gio/api-index-2-72.html
+%%DOCS%%share/gtk-doc/html/gio/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/gio/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/gio/api-index-full.html
%%DOCS%%share/gtk-doc/html/gio/application.html
@@ -686,6 +688,7 @@ share/gettext/its/gschema.loc
%%DOCS%%share/gtk-doc/html/glib/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-72.html
+%%DOCS%%share/gtk-doc/html/glib/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-8.html
%%DOCS%%share/gtk-doc/html/glib/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/glib/api-index-full.html
@@ -831,6 +834,7 @@ share/gettext/its/gschema.loc
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-72.html
+%%DOCS%%share/gtk-doc/html/gobject/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-8.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-full.html
@@ -894,6 +898,7 @@ share/gettext/its/gschema.loc
%%DOCS%%share/gtk-doc/html/gobject/tools-vala.html
%%DOCS%%share/gtk-doc/html/gobject/up-insensitive.png
%%DOCS%%share/gtk-doc/html/gobject/up.png
+%%NLS%%share/locale/ab/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo