From 7743bf727c6f063ac7b79ca059d30c2fc64d2ccd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 21 2014 12:33:32 +0000 Subject: import gtk2-2.24.22-5.el7_0.1 --- diff --git a/SOURCES/0001-Print-to-a-file-in-the-current-directory-by-default.patch b/SOURCES/0001-Print-to-a-file-in-the-current-directory-by-default.patch new file mode 100644 index 0000000..45e66ef --- /dev/null +++ b/SOURCES/0001-Print-to-a-file-in-the-current-directory-by-default.patch @@ -0,0 +1,38 @@ +From 60189143a4097c615f9cda0dbec2cd48b4eca77d Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Wed, 30 Oct 2013 15:42:09 -0500 +Subject: [PATCH] Print to a file in the current directory by default + +When printing to a file, the filename was not being propagated if a +directory was not specified. + +https://bugzilla.gnome.org/show_bug.cgi?id=711177 +--- + gtk/gtkprinteroptionwidget.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c +index 2f43edf..08c2aff 100644 +--- a/gtk/gtkprinteroptionwidget.c ++++ b/gtk/gtkprinteroptionwidget.c +@@ -521,7 +521,16 @@ filesave_changed_cb (GtkWidget *button, + if (g_uri_parse_scheme (file) != NULL) + uri = g_strdup (file); + else +- uri = g_build_path ("/", gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo)), file, NULL); ++ { ++ gchar *chooser_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (priv->combo)); ++ if (chooser_uri) ++ { ++ uri = g_build_path ("/", chooser_uri, file, NULL); ++ g_free (chooser_uri); ++ } ++ else ++ uri = g_filename_to_uri (file, NULL, NULL); ++ } + } + + if (uri) +-- +1.9.3 + diff --git a/SPECS/gtk2.spec b/SPECS/gtk2.spec index 049c631..753d4b8 100644 --- a/SPECS/gtk2.spec +++ b/SPECS/gtk2.spec @@ -18,7 +18,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: 2.24.22 -Release: 5%{?dist} +Release: 5%{?dist}.1 License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -39,6 +39,8 @@ Patch15: window-dragging.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1054751 Patch31: 0001-gdkwindow-Handle-references-in-update_windows-list-c.patch Patch32: 0002-gdkwindow-Don-t-add-the-same-window-to-update_window.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1130207 +Patch33: 0001-Print-to-a-file-in-the-current-directory-by-default.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -152,6 +154,7 @@ This package contains developer documentation for the GTK+ widget toolkit. %patch15 -p1 -b .window-dragging %patch31 -p1 -b .gdkwindow-Handle-references %patch32 -p1 -b .gdkwindow-Don-t-add +%patch33 -p1 -b .print-to-file %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -338,6 +341,11 @@ gtk-query-immodules-2.0-%{__isa_bits} --update-cache %doc tmpdocs/examples %changelog +* Mon Aug 18 2014 Marek Kasik - 2.24.22-5.el7_0.1 +- Propagate filename if directory was not specified +- when printing to a file +- Resolves: #1130207 + * Fri Jan 24 2014 Daniel Mach - 2.24.22-5 - Mass rebuild 2014-01-24