[maemo-commits] [maemo-commits] r13578 - in projects/haf/trunk/pango1.0/debian: . patches

[From: subversion at stage.maemo.org]

Author: fherrera
Date: 2007-09-04 16:06:45 +0300 (Tue, 04 Sep 2007)
New Revision: 13578

Added:
   projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch
Modified:
   projects/haf/trunk/pango1.0/debian/changelog
   projects/haf/trunk/pango1.0/debian/control
Log:
  *  Updated maintainer in contol file.
  *  Add a patch backporting upstream fix for gnome bugzilla 462420 (Clicking
     on pixbuf should move the cursor to the position nearest to the click
     point. Fixes: #NB64784

 -- Fernando Herrera <fernando.herrera-de-las-heras at nokia.com>  Tue,  4 Sep 2007 15:52:15 +0300



Modified: projects/haf/trunk/pango1.0/debian/changelog
===================================================================
--- projects/haf/trunk/pango1.0/debian/changelog	2007-09-04 12:54:07 UTC (rev 13577)
+++ projects/haf/trunk/pango1.0/debian/changelog	2007-09-04 13:06:45 UTC (rev 13578)
@@ -1,3 +1,12 @@
+pango1.0 (1.16.4-1osso4) unstable; urgency=low
+
+  *  Updated maintainer in contol file.
+  *  Add a patch backporting upstream fix for gnome bugzilla 462420 (Clicking
+     on pixbuf should move the cursor to the position nearest to the click
+     point. Fixes: #NB64784
+
+ -- Fernando Herrera <fernando.herrera-de-las-heras at nokia.com>  Tue,  4 Sep 2007 15:52:15 +0300
+
 pango1.0 (1.16.4-1osso3) unstable; urgency=low
 
   * Enable floating point. Patch by Leonid Moiseichuk. Fixes: NB#61989

Modified: projects/haf/trunk/pango1.0/debian/control
===================================================================
--- projects/haf/trunk/pango1.0/debian/control	2007-09-04 12:54:07 UTC (rev 13577)
+++ projects/haf/trunk/pango1.0/debian/control	2007-09-04 13:06:45 UTC (rev 13578)
@@ -1,7 +1,7 @@
 Source: pango1.0
 Section: libs
 Priority: optional
-Maintainer: Tapani Palli <tapani.palli at nokia.com>
+Maintainer: Fernando Herrera <fernando.herrera-de-las-heras at nokia.com>
 Build-Depends: debhelper (>= 4.1.16), libfreetype6-dev (>= 2.1.7), libx11-dev | xlibs-dev, libxrender-dev | xlibs-dev, libxt-dev | xlibs-dev, libglib2.0-dev (>= 2.10.0), pkg-config, libxft-dev, libfontconfig1-dev (>= 2.1.91), autotools-dev, po-debconf, gnome-pkg-tools, libcairo2-dev (>= 1.2.2)
 Standards-Version: 3.6.1
 

Added: projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch
===================================================================
--- projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch	2007-09-04 12:54:07 UTC (rev 13577)
+++ projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch	2007-09-04 13:06:45 UTC (rev 13578)
@@ -0,0 +1,32 @@
+--- pango.orig/pango/pango-layout.c	(revisión: 2401)
++++ pango-1.16.4/pango/pango-layout.c	(revisión: 2402)
+@@ -3891,23 +3891,14 @@
+ 	  int pos;
+ 	  int char_index;
+ 
+-	  char_index = run->item->offset;
++	  pango_glyph_string_x_to_index (run->glyphs,
++					 layout->text + run->item->offset, run->item->length,
++					 &run->item->analysis,
++					 x_pos - start_pos,
++					 &pos, &char_trailing);
+ 
+-	  if (properties.shape_set)
+-	    {
+-	      char_trailing = FALSE;
+-	    }
+-	  else
+-	    {
+-	      pango_glyph_string_x_to_index (run->glyphs,
+-					     layout->text + run->item->offset, run->item->length,
+-					     &run->item->analysis,
+-					     x_pos - start_pos,
+-					     &pos, &char_trailing);
++	  char_index = run->item->offset + pos;
+ 
+-	      char_index += pos;
+-	    }
+-
+ 	  /* Convert from characters to graphemes */
+ 
+ 	  offset = g_utf8_pointer_to_offset (layout->text, layout->text + char_index);