Date: Thu, 18 Jun 2020 00:56:15 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539511 - in head/x11-toolkits/gtk30: . files Message-ID: <202006180056.05I0uFiY017075@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jun 18 00:56:15 2020 New Revision: 539511 URL: https://svnweb.freebsd.org/changeset/ports/539511 Log: x11-toolkits/gtk30: update to 3.24.20 Changes: https://gitlab.gnome.org/GNOME/gtk/compare/3.24.10...3.24.20 PR: 247067 Exp-run by: antoine Added: head/x11-toolkits/gtk30/files/patch-glib-2.56 (contents, props changed) Modified: head/x11-toolkits/gtk30/Makefile (contents, props changed) head/x11-toolkits/gtk30/distinfo (contents, props changed) head/x11-toolkits/gtk30/pkg-plist (contents, props changed) Modified: head/x11-toolkits/gtk30/Makefile ============================================================================== --- head/x11-toolkits/gtk30/Makefile Thu Jun 18 00:56:08 2020 (r539510) +++ head/x11-toolkits/gtk30/Makefile Thu Jun 18 00:56:15 2020 (r539511) @@ -4,8 +4,7 @@ # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk -PORTVERSION= 3.24.10 -PORTREVISION= 1 +PORTVERSION= 3.24.20 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -39,7 +38,7 @@ CPPFLAGS+= -fno-omit-frame-pointer INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -LIBVERSION= 0.2404.6 +LIBVERSION= 0.2404.16 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ Modified: head/x11-toolkits/gtk30/distinfo ============================================================================== --- head/x11-toolkits/gtk30/distinfo Thu Jun 18 00:56:08 2020 (r539510) +++ head/x11-toolkits/gtk30/distinfo Thu Jun 18 00:56:15 2020 (r539511) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562456019 -SHA256 (gnome/gtk+-3.24.10.tar.xz) = 35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03 -SIZE (gnome/gtk+-3.24.10.tar.xz) = 20958300 +TIMESTAMP = 1570971851 +SHA256 (gnome/gtk+-3.24.20.tar.xz) = 2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3 +SIZE (gnome/gtk+-3.24.20.tar.xz) = 22726768 Added: head/x11-toolkits/gtk30/files/patch-glib-2.56 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtk30/files/patch-glib-2.56 Thu Jun 18 00:56:15 2020 (r539511) @@ -0,0 +1,220 @@ +--- configure 2020-06-07 20:13:09.165799417 +0000 ++++ configure 2020-06-07 20:12:54.318912986 +0000 +@@ -3308,7 +3308,7 @@ GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=GLIB_ + + + +-GLIB_REQUIRED_VERSION=2.57.2 ++GLIB_REQUIRED_VERSION=2.56.3 + PANGO_REQUIRED_VERSION=1.41.0 + ATK_REQUIRED_VERSION=2.15.1 + CAIRO_REQUIRED_VERSION=1.14.0 +@@ -23543,12 +23543,12 @@ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null` ++ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -23560,12 +23560,12 @@ if test -n "$BASE_DEPENDENCIES_LIBS"; then + pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null` ++ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -23586,14 +23586,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1` + else +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (glib-2.0 >= 2.57.2 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0) were not met: ++ as_fn_error $? "Package requirements (glib-2.0 >= 2.56.3 atk >= 2.15.1 pango >= 1.41.0 fribidi >= 0.19.7 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0) were not met: + + $BASE_DEPENDENCIES_PKG_ERRORS + +@@ -24385,7 +24385,7 @@ else + fi + + +- min_glib_version=2.57.2 ++ min_glib_version=2.56.3 + pkg_config_args="glib-2.0 >= $min_glib_version" + for module in . gobject gmodule-no-export + do +@@ -24879,7 +24879,7 @@ rm -f core conftest.err conftest.$ac_objext \ + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + as_fn_error $? " +-*** GLIB 2.57.2 or better is required. The latest version of ++*** GLIB 2.56.3 or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5 + fi + rm -f conf.glibtest +@@ -26825,12 +26825,12 @@ if test "$os_win32" != "yes"; then + have_gio_unix=yes + fi + if test "$have_gio_unix" = "yes"; then +- GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.57.2" ++ GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.56.3" + + $as_echo "#define HAVE_GIO_UNIX 1" >>confdefs.h + + else +- GDK_GIO_PACKAGE="gio-2.0 >= 2.57.2" ++ GDK_GIO_PACKAGE="gio-2.0 >= 2.56.3" + fi + + # Check for Pango flags +@@ -27134,13 +27134,13 @@ $as_echo "yes" >&6; } + + fi + +-GTK_PACKAGES="atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.57.2" ++GTK_PACKAGES="atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.56.3" + GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= 1.4 fribidi >= 0.19.7" + if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then + GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" + fi + if test "$have_gio_unix" = "yes"; then +- GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.57.2" ++ GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.56.3" + fi + GTK_EXTRA_LIBS= + +diff --git gtk/gtkmountoperation.c gtk/gtkmountoperation.c +index 43b039e40e..8ca5c55413 100644 +--- gtk/gtkmountoperation.c ++++ gtk/gtkmountoperation.c +@@ -121,10 +121,14 @@ struct _GtkMountOperationPrivate { + GtkWidget *username_entry; + GtkWidget *domain_entry; + GtkWidget *password_entry; ++#if GLIB_CHECK_VERSION(2, 57, 2) + GtkWidget *pim_entry; ++#endif + GtkWidget *anonymous_toggle; ++#if GLIB_CHECK_VERSION(2, 57, 2) + GtkWidget *tcrypt_hidden_toggle; + GtkWidget *tcrypt_system_toggle; ++#endif + GList *user_widgets; + + GAskPasswordFlags ask_flags; +@@ -351,6 +355,7 @@ pw_dialog_got_response (GtkDialog *dialog, + g_mount_operation_set_password (op, text); + } + ++#if GLIB_CHECK_VERSION(2, 57, 2) + if (priv->pim_entry) + { + text = gtk_entry_get_text (GTK_ENTRY (priv->pim_entry)); +@@ -371,6 +376,7 @@ pw_dialog_got_response (GtkDialog *dialog, + + if (priv->tcrypt_system_toggle && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->tcrypt_system_toggle))) + g_mount_operation_set_is_tcrypt_system_volume (op, TRUE); ++#endif + + if (priv->ask_flags & G_ASK_PASSWORD_SAVING_SUPPORTED) + g_mount_operation_set_password_save (op, priv->password_save); +@@ -399,6 +405,7 @@ entry_has_input (GtkWidget *entry_widget) + return text != NULL && text[0] != '\0'; + } + ++#if GLIB_CHECK_VERSION(2, 57, 2) + static gboolean + pim_entry_is_valid (GtkWidget *entry_widget) + { +@@ -421,6 +428,7 @@ pim_entry_is_valid (GtkWidget *entry_widget) + else + return TRUE; + } ++#endif + + static gboolean + pw_dialog_input_is_valid (GtkMountOperation *operation) +@@ -435,8 +443,12 @@ pw_dialog_input_is_valid (GtkMountOperation *operation + * definitively needs a password. + */ + is_valid = entry_has_input (priv->username_entry) && ++#if GLIB_CHECK_VERSION(2, 57, 2) + entry_has_input (priv->domain_entry) && + pim_entry_is_valid (priv->pim_entry); ++#else ++ entry_has_input (priv->domain_entry); ++#endif + + return is_valid; + } +@@ -705,6 +717,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS + priv->domain_entry = table_add_entry (operation, rows++, _("_Domain"), + default_domain, operation); + ++#if GLIB_CHECK_VERSION(2, 57, 2) + priv->pim_entry = NULL; + if (priv->ask_flags & G_ASK_PASSWORD_TCRYPT) + { +@@ -729,6 +742,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS + + priv->pim_entry = table_add_entry (operation, rows++, _("_PIM"), NULL, operation); + } ++#endif + + priv->password_entry = NULL; + if (priv->ask_flags & G_ASK_PASSWORD_NEED_PASSWORD) +@@ -846,12 +860,14 @@ call_password_proxy_cb (GObject *source, + g_mount_operation_set_password (op, g_variant_get_string (value, NULL)); + else if (strcmp (key, "password_save") == 0) + g_mount_operation_set_password_save (op, g_variant_get_uint32 (value)); ++#if GLIB_CHECK_VERSION(2, 57, 2) + else if (strcmp (key, "hidden_volume") == 0) + g_mount_operation_set_is_tcrypt_hidden_volume (op, g_variant_get_boolean (value)); + else if (strcmp (key, "system_volume") == 0) + g_mount_operation_set_is_tcrypt_system_volume (op, g_variant_get_boolean (value)); + else if (strcmp (key, "pim") == 0) + g_mount_operation_set_pim (op, g_variant_get_uint32 (value)); ++#endif + } + + out: +diff --git meson.build meson.build +index 415a66c732..9081b03381 100644 +--- meson.build ++++ meson.build +@@ -8,8 +8,8 @@ project('gtk+-3.0', 'c', + license: 'LGPLv2.1+') + + glib_major_req = 2 +-glib_minor_req = 57 +-glib_micro_req = 2 ++glib_minor_req = 56 ++glib_micro_req = 3 + + if glib_minor_req.is_odd() + glib_min_required = 'GLIB_VERSION_@0@_@1@'.format(glib_major_req, glib_minor_req - 1) Modified: head/x11-toolkits/gtk30/pkg-plist ============================================================================== --- head/x11-toolkits/gtk30/pkg-plist Thu Jun 18 00:56:08 2020 (r539510) +++ head/x11-toolkits/gtk30/pkg-plist Thu Jun 18 00:56:15 2020 (r539511) @@ -103,6 +103,7 @@ include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h include/gtk-3.0/gtk/a11y/gtkframeaccessible.h +include/gtk-3.0/gtk/a11y/gtkheaderbaraccessible.h include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h include/gtk-3.0/gtk/a11y/gtkimageaccessible.h include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h @@ -474,6 +475,7 @@ share/gir-1.0/Gdk-3.0.gir %%X11%%share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir %%DATADIR%%-3.0/gtkbuilder.rng +%%DATADIR%%-3.0/valgrind/gtk.supp %%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html %%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html %%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2 @@ -1011,7 +1013,6 @@ share/gir-1.0/Gtk-3.0.gir %%DATADIR%%-doc/html/gtk3/gtk-migrating-smclient-GtkApplication.html %%DATADIR%%-doc/html/gtk3/gtk-migrating-theme-GtkStyleContext-engines.html %%DATADIR%%-doc/html/gtk3/gtk-migrating-unique-GtkApplication.html -%%DATADIR%%-doc/html/gtk3/gtk-mir.html %%DATADIR%%-doc/html/gtk3/gtk-osx.html %%DATADIR%%-doc/html/gtk3/gtk-query-immodules-3.0.html %%DATADIR%%-doc/html/gtk3/gtk-query-settings.html @@ -1100,6 +1101,7 @@ share/gir-1.0/Gtk-3.0.gir %%DATADIR%%-doc/html/gtk3/placessidebar.png %%DATADIR%%-doc/html/gtk3/platform-support.html %%DATADIR%%-doc/html/gtk3/popup-anchors.png +%%DATADIR%%-doc/html/gtk3/popup-at.svg %%DATADIR%%-doc/html/gtk3/popup-flip.png %%DATADIR%%-doc/html/gtk3/popup-slide.png %%DATADIR%%-doc/html/gtk3/printdialog.png @@ -1202,6 +1204,8 @@ share/locale/ca/LC_MESSAGES/gtk30-properties.mo share/locale/ca/LC_MESSAGES/gtk30.mo share/locale/ca@valencia/LC_MESSAGES/gtk30-properties.mo share/locale/ca@valencia/LC_MESSAGES/gtk30.mo +share/locale/ckb/LC_MESSAGES/gtk30-properties.mo +share/locale/ckb/LC_MESSAGES/gtk30.mo share/locale/crh/LC_MESSAGES/gtk30-properties.mo share/locale/crh/LC_MESSAGES/gtk30.mo share/locale/cs/LC_MESSAGES/gtk30-properties.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006180056.05I0uFiY017075>