r18636 - in /desktop/experimental/gtk+2.0/debian: changelog patches/022_disable-viqr-im-for-vi-locale.patch patches/061_use_pdf_as_default_printing_standard.patch

[kov at users.alioth.debian.org]

Author: kov
Date: Wed Mar  4 00:58:51 2009
New Revision: 18636

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18636
Log:
  [ Imported from Ubuntu ]
  * 022_disable-viqr-im-for-vi-locale.patch,
    061_use_pdf_as_default_printing_standard.patch:
  - for the rationale for the PDF for printing one see:
    https://wiki.ubuntu.com/PDFasStandardPrintJobFormat


Added:
    desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
    desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=18636&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Mar  4 00:58:51 2009
@@ -14,7 +14,13 @@
   * debian/rules:
   - bumped SHVER to 2.15.5
 
- -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 21:43:35 -0300
+  [ Imported from Ubuntu ]
+  * 022_disable-viqr-im-for-vi-locale.patch,
+    061_use_pdf_as_default_printing_standard.patch:
+  - for the rationale for the PDF for printing one see:
+    https://wiki.ubuntu.com/PDFasStandardPrintJobFormat
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 21:58:20 -0300
 
 gtk+2.0 (2.15.5-1) experimental; urgency=low
 

Added: desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch?rev=18636&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch Wed Mar  4 00:58:51 2009
@@ -1,0 +1,13 @@
+Index: gtk+2.0-2.15.2/modules/input/imviqr.c
+===================================================================
+--- gtk+2.0-2.15.2.orig/modules/input/imviqr.c	2009-01-27 05:03:01.000000000 +0100
++++ gtk+2.0-2.15.2/modules/input/imviqr.c	2009-01-27 11:21:08.000000000 +0100
+@@ -244,7 +244,7 @@
+   N_("Vietnamese (VIQR)"), /* Human readable name */
+   GETTEXT_PACKAGE,	   /* Translation domain */
+    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
+-  "vi"			   /* Languages for which this module is the default */
++  ""			   /* Languages for which this module is the default */
+ };
+ 
+ static const GtkIMContextInfo *info_list[] = {

Added: desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch?rev=18636&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch Wed Mar  4 00:58:51 2009
@@ -1,0 +1,45 @@
+Index: gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c
+===================================================================
+--- gtk+2.0-2.15.2.orig/modules/printbackends/cups/gtkprintbackendcups.c	2009-01-27 05:03:03.000000000 +0100
++++ gtk+2.0-2.15.2/modules/printbackends/cups/gtkprintbackendcups.c	2009-01-27 11:23:44.000000000 +0100
+@@ -329,8 +329,9 @@
+  
+   /* TODO: check if it is a ps or pdf printer */
+   
+-  surface = cairo_ps_surface_create_for_stream  (_cairo_write_to_cups, cache_io, width, height);
++  surface = cairo_pdf_surface_create_for_stream  (_cairo_write_to_cups, cache_io, width, height);
+ 
++  /*
+   ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
+ 
+   if (ppd_file != NULL)
+@@ -397,6 +398,7 @@
+ 
+   if (level == 3)
+     cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
++  */
+ 
+   cairo_surface_set_fallback_resolution (surface,
+                                          2.0 * gtk_print_settings_get_printer_lpi (settings),
+Index: gtk+2.0-2.15.2/modules/printbackends/lpr/gtkprintbackendlpr.c
+===================================================================
+--- gtk+2.0-2.15.2.orig/modules/printbackends/lpr/gtkprintbackendlpr.c	2009-01-27 05:03:03.000000000 +0100
++++ gtk+2.0-2.15.2/modules/printbackends/lpr/gtkprintbackendlpr.c	2009-01-27 11:24:49.000000000 +0100
+@@ -31,6 +31,8 @@
+ #include <cairo.h>
+ #include <cairo-ps.h>
+ 
++#include <cairo-pdf.h>
++
+ #include <glib/gi18n-lib.h>
+ 
+ #include <gtk/gtk.h>
+@@ -209,7 +211,7 @@
+ {
+   cairo_surface_t *surface;
+   
+-  surface = cairo_ps_surface_create_for_stream (_cairo_write, cache_io, width, height);
++  surface = cairo_pdf_surface_create_for_stream (_cairo_write, cache_io, width, height);
+ 
+   if (gtk_print_settings_get_printer_lpi (settings) == 0.0)
+     gtk_print_settings_set_printer_lpi (settings, 150.0);