[maemo-commits] [maemo-commits] r15582 - in projects/haf/trunk/pango1.0: debian debian/patches debian/scripts upstream/tarballs
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed May 21 11:04:41 EEST 2008
- Previous message: [maemo-commits] r15581 - projects/haf/branches/pango1.0
- Next message: [maemo-commits] r15583 - projects/haf/tags/pango1.0
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: klattimer Date: 2008-05-21 11:04:38 +0300 (Wed, 21 May 2008) New Revision: 15582 Added: projects/haf/trunk/pango1.0/debian/patches/break-1.20.1.patch projects/haf/trunk/pango1.0/debian/patches/glyphstring-1.20.1.patch projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.20.1.tar.gz Removed: projects/haf/trunk/pango1.0/debian/patches/break.patch projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.16.4.tar.gz Modified: projects/haf/trunk/pango1.0/debian/changelog projects/haf/trunk/pango1.0/debian/scripts/vars projects/haf/trunk/pango1.0/debian/shlibs.local Log: pango1.0 (1.20.1-1osso1) unstable; urgency=low * new upstream release -- Karl Lattimer <karl.lattimer at nokia.com> Wed, 21 May 2008 09:59:00 +0300 Modified: projects/haf/trunk/pango1.0/debian/changelog =================================================================== --- projects/haf/trunk/pango1.0/debian/changelog 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/changelog 2008-05-21 08:04:38 UTC (rev 15582) @@ -1,3 +1,10 @@ +pango1.0 (1.20.1-1osso1) unstable; urgency=low + + * new upstream release + + -- Karl Lattimer <karl.lattimer at nokia.com> Wed, 21 May 2008 09:59:00 +0300 + + pango1.0 (1.16.4-1osso5) unstable; urgency=low * Fix debug packages build. Fixes: NB#70471 @@ -4,7 +11,7 @@ -- Fernando Herrera <fernando.herrera-de-las-heras at nokia.com> Tue, 20 Sep 2007 18:13:15 +0300 -pango1.0 (1.16.4-1osso4) unstable; urgency=low + 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 Added: projects/haf/trunk/pango1.0/debian/patches/break-1.20.1.patch =================================================================== --- projects/haf/trunk/pango1.0/debian/patches/break-1.20.1.patch 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/patches/break-1.20.1.patch 2008-05-21 08:04:38 UTC (rev 15582) @@ -0,0 +1,11 @@ +--- pango-1.20.1.orig/pango/break.c 2008-02-28 13:57:35.000000000 +0200 ++++ pango-1.20.1/pango/break.c 2008-05-21 09:37:46.000000000 +0300 +@@ -907,8 +907,6 @@ + switch (break_op) + { + case BREAK_PROHIBITED: +- /* can't break here */ +- attrs[i].is_char_break = FALSE; + break; + + case BREAK_IF_SPACES: Deleted: projects/haf/trunk/pango1.0/debian/patches/break.patch =================================================================== --- projects/haf/trunk/pango1.0/debian/patches/break.patch 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/patches/break.patch 2008-05-21 08:04:38 UTC (rev 15582) @@ -1,11 +0,0 @@ ---- pango-orig/pango/break.c 2007-02-27 15:01:33.000000000 +0200 -+++ pango-1.16.4/pango/break.c 2007-02-27 15:01:42.000000000 +0200 -@@ -902,8 +902,6 @@ - switch (break_op) - { - case BREAK_PROHIBITED: -- /* can't break here */ -- attrs[i].is_char_break = FALSE; - break; - - case BREAK_IF_SPACES: Deleted: projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch =================================================================== --- projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/patches/clicknext462420.patch 2008-05-21 08:04:38 UTC (rev 15582) @@ -1,32 +0,0 @@ ---- 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); Added: projects/haf/trunk/pango1.0/debian/patches/glyphstring-1.20.1.patch =================================================================== --- projects/haf/trunk/pango1.0/debian/patches/glyphstring-1.20.1.patch 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/patches/glyphstring-1.20.1.patch 2008-05-21 08:04:38 UTC (rev 15582) @@ -0,0 +1,53 @@ +--- pango-1.20.1.orig/pango/glyphstring.c 2008-01-09 01:08:39.000000000 +0200 ++++ pango-1.20.1/pango/glyphstring.c 2008-05-21 09:41:24.000000000 +0300 +@@ -42,6 +42,7 @@ + string->space = 0; + string->glyphs = NULL; + string->log_clusters = NULL; ++ string->has_cache = FALSE; + + return string; + } +@@ -58,6 +59,8 @@ + { + g_return_if_fail (new_len >= 0); + ++ string->has_cache = FALSE; ++ + while (new_len > string->space) + { + if (string->space == 0) +@@ -271,8 +274,18 @@ + PangoRectangle *ink_rect, + PangoRectangle *logical_rect) + { +- pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs, +- font, ink_rect, logical_rect); ++ if (!glyphs->has_cache) ++ { ++ pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs, font, &glyphs->ink_rect, &glyphs->logical_rect); ++ ++ glyphs->has_cache = TRUE; ++ } ++ ++ if (ink_rect) ++ *ink_rect = glyphs->ink_rect; ++ ++ if (logical_rect) ++ *logical_rect = glyphs->logical_rect; + } + + /** +--- pango-1.20.1/pango/pango-glyph.h 2007-07-06 00:30:24.000000000 +0300 ++++ pango-1.20.1.patched/pango/pango-glyph.h 2008-05-21 09:41:24.000000000 +0300 +@@ -77,6 +77,10 @@ + + /*< private >*/ + gint space; ++ ++ gboolean has_cache; ++ PangoRectangle ink_rect; ++ PangoRectangle logical_rect; + }; + + #define PANGO_TYPE_GLYPH_STRING (pango_glyph_string_get_type ()) Deleted: projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch =================================================================== --- projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/patches/glyphstring.patch 2008-05-21 08:04:38 UTC (rev 15582) @@ -1,54 +0,0 @@ ---- pango-orig/pango/glyphstring.c 2007-01-23 01:41:43.000000000 +0200 -+++ pango-1.16.4/pango/glyphstring.c 2007-02-27 15:10:54.000000000 +0200 -@@ -42,6 +42,7 @@ - string->space = 0; - string->glyphs = NULL; - string->log_clusters = NULL; -+ string->has_cache = FALSE; - - return string; - } -@@ -58,6 +59,8 @@ - { - g_return_if_fail (new_len >= 0); - -+ string->has_cache = FALSE; -+ - while (new_len > string->space) - { - if (string->space == 0) -@@ -262,8 +265,18 @@ - PangoRectangle *ink_rect, - PangoRectangle *logical_rect) - { -- pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs, -- font, ink_rect, logical_rect); -+ if (!glyphs->has_cache) -+ { -+ pango_glyph_string_extents_range (glyphs, 0, glyphs->num_glyphs, font, &glyphs->ink_rect, &glyphs->logical_rect); -+ -+ glyphs->has_cache = TRUE; -+ } -+ -+ if (ink_rect) -+ *ink_rect = glyphs->ink_rect; -+ -+ if (logical_rect) -+ *logical_rect = glyphs->logical_rect; - } - - /** -diff -ruN pango-orig/pango/pango-glyph.h pango-1.16.0/pango/pango-glyph.h ---- pango-orig/pango/pango-glyph.h 2002-11-08 21:00:52.000000000 +0200 -+++ pango-1.16.4/pango/pango-glyph.h 2005-03-24 17:15:30.012688332 +0200 -@@ -77,6 +77,10 @@ - - /*< private >*/ - gint space; -+ -+ gboolean has_cache; -+ PangoRectangle ink_rect; -+ PangoRectangle logical_rect; - }; - - #define PANGO_TYPE_GLYPH_STRING (pango_glyph_string_get_type ()) Modified: projects/haf/trunk/pango1.0/debian/scripts/vars =================================================================== --- projects/haf/trunk/pango1.0/debian/scripts/vars 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/scripts/vars 2008-05-21 08:04:38 UTC (rev 15582) @@ -8,7 +8,7 @@ SOURCE_DIR=build-tree # For a single pkg, this is the directory that is embedded in the tarball. # For multiple pkgs, this is null. -TAR_DIR=pango-1.16.4 +TAR_DIR=pango-1.20.1 # Where to place all the stamp files. This directory can be removed, and # all the targets will then be rerun. STAMP_DIR=debian/stampdir Modified: projects/haf/trunk/pango1.0/debian/shlibs.local =================================================================== --- projects/haf/trunk/pango1.0/debian/shlibs.local 2008-05-21 07:16:57 UTC (rev 15581) +++ projects/haf/trunk/pango1.0/debian/shlibs.local 2008-05-21 08:04:38 UTC (rev 15582) @@ -1,15 +1,15 @@ -libpango-1.0 0 libpango1.0-0 (>= 1.16.4) -libpangox-1.0 0 libpango1.0-0 (>= 1.16.4) -libpangoft2-1.0 0 libpango1.0-0 (>= 1.16.4) -libpangoxft-1.0 0 libpango1.0-0 (>= 1.16.4) -libpangocairo-1.0 0 libpango1.0-0 (>= 1.16.4) -pango-arabic fc libpango1.0-0 (>= 1.16.4) -pango-arabic lang libpango1.0-0 (>= 1.16.4) -pango-hangul fc libpango1.0-0 (>= 1.16.4) -pango-hebrew fc libpango1.0-0 (>= 1.16.4) -pango-indic fc libpango1.0-0 (>= 1.16.4) -pango-indic lang libpango1.0-0 (>= 1.16.4) -pango-khmer fc libpango1.0-0 (>= 1.16.4) -pango-syriac fc libpango1.0-0 (>= 1.16.4) -pango-thai fc libpango1.0-0 (>= 1.16.4) -pango-tibetan fc libpango1.0-0 (>= 1.16.4) +libpango-1.0 0 libpango1.0-0 (>= 1.20.1) +libpangox-1.0 0 libpango1.0-0 (>= 1.20.1) +libpangoft2-1.0 0 libpango1.0-0 (>= 1.20.1) +libpangoxft-1.0 0 libpango1.0-0 (>= 1.20.1) +libpangocairo-1.0 0 libpango1.0-0 (>= 1.20.1) +pango-arabic fc libpango1.0-0 (>= 1.20.1) +pango-arabic lang libpango1.0-0 (>= 1.20.1) +pango-hangul fc libpango1.0-0 (>= 1.20.1) +pango-hebrew fc libpango1.0-0 (>= 1.20.1) +pango-indic fc libpango1.0-0 (>= 1.20.1) +pango-indic lang libpango1.0-0 (>= 1.20.1) +pango-khmer fc libpango1.0-0 (>= 1.20.1) +pango-syriac fc libpango1.0-0 (>= 1.20.1) +pango-thai fc libpango1.0-0 (>= 1.20.1) +pango-tibetan fc libpango1.0-0 (>= 1.20.1) Deleted: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.16.4.tar.gz =================================================================== (Binary files differ) Added: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.20.1.tar.gz =================================================================== (Binary files differ) Property changes on: projects/haf/trunk/pango1.0/upstream/tarballs/pango-1.20.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
- Previous message: [maemo-commits] r15581 - projects/haf/branches/pango1.0
- Next message: [maemo-commits] r15583 - projects/haf/tags/pango1.0
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]