Attachment #215338 for bug #247067

View | Details | Raw Unified | Return to bug 247067
Collapse All | Expand All

Lines 4-11 Link Here

(-)b/x11-toolkits/gtk30/Makefile (-3 / +2 lines)
4	# adwaita-icon-theme, gnome-themes-standard and mate-themes	4	# adwaita-icon-theme, gnome-themes-standard and mate-themes
5		5
6	PORTNAME= gtk	6	PORTNAME= gtk
7	PORTVERSION= 3.24.10	7	PORTVERSION= 3.24.20
8	PORTREVISION= 1
9	CATEGORIES= x11-toolkits	8	CATEGORIES= x11-toolkits
10	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}	9	MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
11	PKGNAMESUFFIX= 3	10	PKGNAMESUFFIX= 3
Lines 42-48 CPPFLAGS+= -fno-omit-frame-pointer Link Here
42	INSTALLS_ICONS= yes	41	INSTALLS_ICONS= yes
43	INSTALL_TARGET= install-strip	42	INSTALL_TARGET= install-strip
44		43
45	LIBVERSION= 0.2404.6	44	LIBVERSION= 0.2404.16
46	PLIST_SUB+= LIBVERSION=${LIBVERSION}	45	PLIST_SUB+= LIBVERSION=${LIBVERSION}
47		46
48	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \	47	GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \

Lines 1-3 Link Here

(-)b/x11-toolkits/gtk30/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562456019	1	TIMESTAMP = 1570971851
2	SHA256 (gnome/gtk+-3.24.10.tar.xz) = 35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03	2	SHA256 (gnome/gtk+-3.24.20.tar.xz) = 2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3
3	SIZE (gnome/gtk+-3.24.10.tar.xz) = 20958300	3	SIZE (gnome/gtk+-3.24.20.tar.xz) = 22726768




--- 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)




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

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

%%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

%%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

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

Return to bug 247067

Added Link Here

(-)b/x11-toolkits/gtk30/files/patch-glib-2.56 (+220 lines)
1	--- configure 2020-06-07 20:13:09.165799417 +0000
2	+++ configure 2020-06-07 20:12:54.318912986 +0000
3	@@ -3308,7 +3308,7 @@ GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=GLIB_
4
5
6
7	-GLIB_REQUIRED_VERSION=2.57.2
8	+GLIB_REQUIRED_VERSION=2.56.3
9	PANGO_REQUIRED_VERSION=1.41.0
10	ATK_REQUIRED_VERSION=2.15.1
11	CAIRO_REQUIRED_VERSION=1.14.0
12	@@ -23543,12 +23543,12 @@ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
13	pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
14	elif test -n "$PKG_CONFIG"; then
15	if test -n "$PKG_CONFIG" && \
16	- { { $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
17	- ($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
18	+ { { $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
19	+ ($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
20	ac_status=$?
21	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
22	test $ac_status = 0; }; then
23	- 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`
24	+ 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`
25	test "x$?" != "x0" && pkg_failed=yes
26	else
27	pkg_failed=yes
28	@@ -23560,12 +23560,12 @@ if test -n "$BASE_DEPENDENCIES_LIBS"; then
29	pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
30	elif test -n "$PKG_CONFIG"; then
31	if test -n "$PKG_CONFIG" && \
32	- { { $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
33	- ($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
34	+ { { $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
35	+ ($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
36	ac_status=$?
37	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
38	test $ac_status = 0; }; then
39	- 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`
40	+ 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`
41	test "x$?" != "x0" && pkg_failed=yes
42	else
43	pkg_failed=yes
44	@@ -23586,14 +23586,14 @@ else
45	_pkg_short_errors_supported=no
46	fi
47	if test $_pkg_short_errors_supported = yes; then
48	- 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`
49	+ 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`
50	else
51	- 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`
52	+ 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`
53	fi
54	# Put the nasty error message in config.log where it belongs
55	echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
56
57	- 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:
58	+ 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:
59
60	$BASE_DEPENDENCIES_PKG_ERRORS
61
62	@@ -24385,7 +24385,7 @@ else
63	fi
64
65
66	- min_glib_version=2.57.2
67	+ min_glib_version=2.56.3
68	pkg_config_args="glib-2.0 >= $min_glib_version"
69	for module in . gobject gmodule-no-export
70	do
71	@@ -24879,7 +24879,7 @@ rm -f core conftest.err conftest.$ac_objext \
72	GLIB_MKENUMS=""
73	GLIB_COMPILE_RESOURCES=""
74	as_fn_error $? "
75	-*** GLIB 2.57.2 or better is required. The latest version of
76	+*** GLIB 2.56.3 or better is required. The latest version of
77	*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
78	fi
79	rm -f conf.glibtest
80	@@ -26825,12 +26825,12 @@ if test "$os_win32" != "yes"; then
81	have_gio_unix=yes
82	fi
83	if test "$have_gio_unix" = "yes"; then
84	- GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.57.2"
85	+ GDK_GIO_PACKAGE="gio-unix-2.0 >= 2.56.3"
86
87	$as_echo "#define HAVE_GIO_UNIX 1" >>confdefs.h
88
89	else
90	- GDK_GIO_PACKAGE="gio-2.0 >= 2.57.2"
91	+ GDK_GIO_PACKAGE="gio-2.0 >= 2.56.3"
92	fi
93
94	# Check for Pango flags
95	@@ -27134,13 +27134,13 @@ $as_echo "yes" >&6; }
96
97	fi
98
99	-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"
100	+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"
101	GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= 1.4 fribidi >= 0.19.7"
102	if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
103	GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
104	fi
105	if test "$have_gio_unix" = "yes"; then
106	- GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.57.2"
107	+ GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= 2.56.3"
108	fi
109	GTK_EXTRA_LIBS=
110
111	diff --git gtk/gtkmountoperation.c gtk/gtkmountoperation.c
112	index 43b039e40e..8ca5c55413 100644
113	--- gtk/gtkmountoperation.c
114	+++ gtk/gtkmountoperation.c
115	@@ -121,10 +121,14 @@ struct _GtkMountOperationPrivate {
116	GtkWidget *username_entry;
117	GtkWidget *domain_entry;
118	GtkWidget *password_entry;
119	+#if GLIB_CHECK_VERSION(2, 57, 2)
120	GtkWidget *pim_entry;
121	+#endif
122	GtkWidget *anonymous_toggle;
123	+#if GLIB_CHECK_VERSION(2, 57, 2)
124	GtkWidget *tcrypt_hidden_toggle;
125	GtkWidget *tcrypt_system_toggle;
126	+#endif
127	GList *user_widgets;
128
129	GAskPasswordFlags ask_flags;
130	@@ -351,6 +355,7 @@ pw_dialog_got_response (GtkDialog *dialog,
131	g_mount_operation_set_password (op, text);
132	}
133
134	+#if GLIB_CHECK_VERSION(2, 57, 2)
135	if (priv->pim_entry)
136	{
137	text = gtk_entry_get_text (GTK_ENTRY (priv->pim_entry));
138	@@ -371,6 +376,7 @@ pw_dialog_got_response (GtkDialog *dialog,
139
140	if (priv->tcrypt_system_toggle && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->tcrypt_system_toggle)))
141	g_mount_operation_set_is_tcrypt_system_volume (op, TRUE);
142	+#endif
143
144	if (priv->ask_flags & G_ASK_PASSWORD_SAVING_SUPPORTED)
145	g_mount_operation_set_password_save (op, priv->password_save);
146	@@ -399,6 +405,7 @@ entry_has_input (GtkWidget *entry_widget)
147	return text != NULL && text[0] != '\0';
148	}
149
150	+#if GLIB_CHECK_VERSION(2, 57, 2)
151	static gboolean
152	pim_entry_is_valid (GtkWidget *entry_widget)
153	{
154	@@ -421,6 +428,7 @@ pim_entry_is_valid (GtkWidget *entry_widget)
155	else
156	return TRUE;
157	}
158	+#endif
159
160	static gboolean
161	pw_dialog_input_is_valid (GtkMountOperation *operation)
162	@@ -435,8 +443,12 @@ pw_dialog_input_is_valid (GtkMountOperation *operation
163	* definitively needs a password.
164	*/
165	is_valid = entry_has_input (priv->username_entry) &&
166	+#if GLIB_CHECK_VERSION(2, 57, 2)
167	entry_has_input (priv->domain_entry) &&
168	pim_entry_is_valid (priv->pim_entry);
169	+#else
170	+ entry_has_input (priv->domain_entry);
171	+#endif
172
173	return is_valid;
174	}
175	@@ -705,6 +717,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
176	priv->domain_entry = table_add_entry (operation, rows++, _("_Domain"),
177	default_domain, operation);
178
179	+#if GLIB_CHECK_VERSION(2, 57, 2)
180	priv->pim_entry = NULL;
181	if (priv->ask_flags & G_ASK_PASSWORD_TCRYPT)
182	{
183	@@ -729,6 +742,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
184
185	priv->pim_entry = table_add_entry (operation, rows++, _("_PIM"), NULL, operation);
186	}
187	+#endif
188
189	priv->password_entry = NULL;
190	if (priv->ask_flags & G_ASK_PASSWORD_NEED_PASSWORD)
191	@@ -846,12 +860,14 @@ call_password_proxy_cb (GObject *source,
192	g_mount_operation_set_password (op, g_variant_get_string (value, NULL));
193	else if (strcmp (key, "password_save") == 0)
194	g_mount_operation_set_password_save (op, g_variant_get_uint32 (value));
195	+#if GLIB_CHECK_VERSION(2, 57, 2)
196	else if (strcmp (key, "hidden_volume") == 0)
197	g_mount_operation_set_is_tcrypt_hidden_volume (op, g_variant_get_boolean (value));
198	else if (strcmp (key, "system_volume") == 0)
199	g_mount_operation_set_is_tcrypt_system_volume (op, g_variant_get_boolean (value));
200	else if (strcmp (key, "pim") == 0)
201	g_mount_operation_set_pim (op, g_variant_get_uint32 (value));
202	+#endif
203	}
204
205	out:
206	diff --git meson.build meson.build
207	index 415a66c732..9081b03381 100644
208	--- meson.build
209	+++ meson.build
210	@@ -8,8 +8,8 @@ project('gtk+-3.0', 'c',
211	license: 'LGPLv2.1+')
212
213	glib_major_req = 2
214	-glib_minor_req = 57
215	-glib_micro_req = 2
216	+glib_minor_req = 56
217	+glib_micro_req = 3
218
219	if glib_minor_req.is_odd()
220	glib_min_required = 'GLIB_VERSION_@0@_@1@'.format(glib_major_req, glib_minor_req - 1)

Lines 103-108 include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h Link Here

(-)b/x11-toolkits/gtk30/pkg-plist (-1 / +5 lines)
103	include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h	103	include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h
104	include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h	104	include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h
105	include/gtk-3.0/gtk/a11y/gtkframeaccessible.h	105	include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
		106	include/gtk-3.0/gtk/a11y/gtkheaderbaraccessible.h
106	include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h	107	include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
107	include/gtk-3.0/gtk/a11y/gtkimageaccessible.h	108	include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
108	include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h	109	include/gtk-3.0/gtk/a11y/gtkimagecellaccessible.h
Lines 474-479 share/gir-1.0/Gdk-3.0.gir Link Here
474	share/gir-1.0/GdkX11-3.0.gir	475	share/gir-1.0/GdkX11-3.0.gir
475	share/gir-1.0/Gtk-3.0.gir	476	share/gir-1.0/Gtk-3.0.gir
476	%%DATADIR%%-3.0/gtkbuilder.rng	477	%%DATADIR%%-3.0/gtkbuilder.rng
		478	%%DATADIR%%-3.0/valgrind/gtk.supp
477	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html	479	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailMisc.html
478	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html	480	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
479	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2	481	%%DATADIR%%-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2
Lines 1011-1017 share/gir-1.0/Gtk-3.0.gir Link Here
1011	%%DATADIR%%-doc/html/gtk3/gtk-migrating-smclient-GtkApplication.html	1013	%%DATADIR%%-doc/html/gtk3/gtk-migrating-smclient-GtkApplication.html
1012	%%DATADIR%%-doc/html/gtk3/gtk-migrating-theme-GtkStyleContext-engines.html	1014	%%DATADIR%%-doc/html/gtk3/gtk-migrating-theme-GtkStyleContext-engines.html
1013	%%DATADIR%%-doc/html/gtk3/gtk-migrating-unique-GtkApplication.html	1015	%%DATADIR%%-doc/html/gtk3/gtk-migrating-unique-GtkApplication.html
1014	%%DATADIR%%-doc/html/gtk3/gtk-mir.html
1015	%%DATADIR%%-doc/html/gtk3/gtk-osx.html	1016	%%DATADIR%%-doc/html/gtk3/gtk-osx.html
1016	%%DATADIR%%-doc/html/gtk3/gtk-query-immodules-3.0.html	1017	%%DATADIR%%-doc/html/gtk3/gtk-query-immodules-3.0.html
1017	%%DATADIR%%-doc/html/gtk3/gtk-query-settings.html	1018	%%DATADIR%%-doc/html/gtk3/gtk-query-settings.html
Lines 1100-1105 share/gir-1.0/Gtk-3.0.gir Link Here
1100	%%DATADIR%%-doc/html/gtk3/placessidebar.png	1101	%%DATADIR%%-doc/html/gtk3/placessidebar.png
1101	%%DATADIR%%-doc/html/gtk3/platform-support.html	1102	%%DATADIR%%-doc/html/gtk3/platform-support.html
1102	%%DATADIR%%-doc/html/gtk3/popup-anchors.png	1103	%%DATADIR%%-doc/html/gtk3/popup-anchors.png
		1104	%%DATADIR%%-doc/html/gtk3/popup-at.svg
1103	%%DATADIR%%-doc/html/gtk3/popup-flip.png	1105	%%DATADIR%%-doc/html/gtk3/popup-flip.png
1104	%%DATADIR%%-doc/html/gtk3/popup-slide.png	1106	%%DATADIR%%-doc/html/gtk3/popup-slide.png
1105	%%DATADIR%%-doc/html/gtk3/printdialog.png	1107	%%DATADIR%%-doc/html/gtk3/printdialog.png
Lines 1202-1207 share/locale/ca/LC_MESSAGES/gtk30-properties.mo Link Here
1202	share/locale/ca/LC_MESSAGES/gtk30.mo	1204	share/locale/ca/LC_MESSAGES/gtk30.mo
1203	share/locale/ca@valencia/LC_MESSAGES/gtk30-properties.mo	1205	share/locale/ca@valencia/LC_MESSAGES/gtk30-properties.mo
1204	share/locale/ca@valencia/LC_MESSAGES/gtk30.mo	1206	share/locale/ca@valencia/LC_MESSAGES/gtk30.mo
		1207	share/locale/ckb/LC_MESSAGES/gtk30-properties.mo
		1208	share/locale/ckb/LC_MESSAGES/gtk30.mo
1205	share/locale/crh/LC_MESSAGES/gtk30-properties.mo	1209	share/locale/crh/LC_MESSAGES/gtk30-properties.mo
1206	share/locale/crh/LC_MESSAGES/gtk30.mo	1210	share/locale/crh/LC_MESSAGES/gtk30.mo
1207	share/locale/cs/LC_MESSAGES/gtk30-properties.mo	1211	share/locale/cs/LC_MESSAGES/gtk30-properties.mo