2009-04-23 Ghee Teo <[email protected]>
authorgheet
Thu, 23 Apr 2009 13:14:00 +0000
changeset 15672 353b754cc3ff
parent 15671 c286ee5eb965
child 15673 b56ec726d176
2009-04-23 Ghee Teo <[email protected]> Fixed bugster#6795517. * base-specs/gtk2.spec: modified * patches/gtk+-17-default-print-ps.diff: added
ChangeLog
base-specs/gtk2.spec
patches/gtk+-17-default-print-ps.diff
--- a/ChangeLog	Thu Apr 23 01:09:10 2009 +0000
+++ b/ChangeLog	Thu Apr 23 13:14:00 2009 +0000
@@ -1,3 +1,9 @@
+2009-04-23  Ghee Teo  <[email protected]>
+
+	Fixed bugster#6795517.
+	* base-specs/gtk2.spec: modified
+	* patches/gtk+-17-default-print-ps.diff: added
+
 2009-04-22  Brian Cameron  <[email protected]>
 
 	* base-specs/gtk2.spec, patches/gtk+-16-fix-module.diff: Add patch
--- a/base-specs/gtk2.spec	Thu Apr 23 01:09:10 2009 +0000
+++ b/base-specs/gtk2.spec	Thu Apr 23 13:14:00 2009 +0000
@@ -53,6 +53,8 @@
 Patch15:      gtk+-15-xfree-xinerama.diff
 # date:2009-04-22 owner:yippi type:bug bugzilla:579884
 Patch16:      gtk+-16-fix-module.diff
+# date:2009-04-22 owner:gheet type:bug bugster:6795517
+Patch17:      gtk+-17-default-print-ps.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -138,6 +140,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 %ifos linux
@@ -242,6 +245,8 @@
 %{_mandir}/man3/*.gz
 
 %changelog -n gtk2
+* Thu Apr 23 2009 - [email protected]
+- Added patch gtk+-17-default-print-ps.diff.
 * Wed Apr 22 2009 - [email protected]
 - Add patch gtk+-16-fix-module.diff to fix bugzilla bug #579884.
 * Thu Apr 16 2009 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk+-17-default-print-ps.diff	Thu Apr 23 13:14:00 2009 +0000
@@ -0,0 +1,30 @@
+diff -urN gtk+-2.14.5/gtk/gtkprintoperation-unix.c ../../SUNWgnome-base-libs-2.24.2.hacked/i386/gtk+-2.14.5/gtk/gtkprintoperation-unix.c
+--- gtk+-2.14.5/gtk/gtkprintoperation-unix.c	2008-11-24 06:35:36.000000000 +0000
++++ ../../SUNWgnome-base-libs-2.24.2.hacked/i386/gtk+-2.14.5/gtk/gtkprintoperation-unix.c	2009-04-22 16:16:15.025967000 +0100
+@@ -665,7 +665,7 @@
+   cairo_surface_t *surface;
+   static cairo_user_data_key_t key;
+   
+-  filename = g_build_filename (g_get_tmp_dir (), "previewXXXXXX.pdf", NULL);
++  filename = g_build_filename (g_get_tmp_dir (), "previewXXXXXX.ps", NULL);
+   fd = g_mkstemp (filename);
+ 
+   if (fd < 0)
+@@ -681,7 +681,7 @@
+   h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
+     
+   *dpi_x = *dpi_y = 72;
+-  surface = cairo_pdf_surface_create_for_stream (write_preview, GINT_TO_POINTER (fd), w, h);
++  surface = cairo_ps_surface_create_for_stream (write_preview, GINT_TO_POINTER (fd), w, h);
+  
+   cairo_surface_set_user_data (surface, &key, GINT_TO_POINTER (fd), close_preview);
+ 
+@@ -714,7 +714,7 @@
+   paper_size = gtk_page_setup_get_paper_size (page_setup);
+   w = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS);
+   h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
+-  cairo_pdf_surface_set_size (surface, w, h);
++  cairo_ps_surface_set_size (surface, w, h);
+ }
+ 
+