--- a/ChangeLog Tue May 30 09:29:34 2006 +0000
+++ b/ChangeLog Tue May 30 09:43:57 2006 +0000
@@ -1,3 +1,10 @@
+2006-05-30 Glynn Foster <[email protected]>
+
+ * pango.spec: Update patch list. Fixes #6431566.
+ * patches/pango-01-broken-text.diff: Remove.
+ * patches/pango-02-fullwidth-space.diff: Rename.
+ * patches/pango-03-pua.diff: Rename.
+
2006-05-30 Halton Huo <[email protected]>
* evolution-data-server.spec: Bump to 1.6.2.
--- a/pango.spec Tue May 30 09:29:34 2006 +0000
+++ b/pango.spec Tue May 30 09:43:57 2006 +0000
@@ -19,9 +19,8 @@
Source3: libpangoft2-1.0.3.gz
Source4: libpangox-1.0.3.gz
Source5: mkinstalldirs
-Patch1: pango-01-broken-text.diff
-Patch2: pango-02-fullwidth-space.diff
-Patch3: pango-03-pua.diff
+Patch1: pango-01-fullwidth-space.diff
+Patch2: pango-02-pua.diff
URL: http://www.gtk.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -67,7 +66,6 @@
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%ifos solaris
%ifarch amd64 sparcv9
--- a/patches/pango-01-broken-text.diff Tue May 30 09:29:34 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- pango-1.11.99/pango/pango-layout.c.orig 2006-02-27 17:36:47.865261000 +0000
-+++ pango-1.11.99/pango/pango-layout.c 2006-02-27 17:40:48.096045000 +0000
-@@ -822,6 +822,7 @@
- int length)
- {
- char *old_text, *start, *end;
-+ const char *enable_broken_text = g_getenv ("Pango_Broken_Text");
-
- g_return_if_fail (layout != NULL);
- g_return_if_fail (length == 0 || text != NULL);
-@@ -857,8 +858,15 @@
- }
-
- if (start != layout->text)
-- /* TODO: Write out the beginning excerpt of text? */
-- g_warning ("Invalid UTF-8 string passed to pango_layout_set_text()");
-+ {
-+ if (enable_broken_text)
-+ {
-+ *end = 0x3f;
-+ while (!g_utf8_validate (text, length, &end)) *end = 0x3f;
-+ }
-+ else /* TODO: Write out the beginning excerpt of text? */
-+ g_warning ("Invalid UTF8 string passed to pango_layout_set_text()");
-+ }
-
- layout->n_chars = g_utf8_strlen (layout->text, -1);
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pango-01-fullwidth-space.diff Tue May 30 09:43:57 2006 +0000
@@ -0,0 +1,18 @@
+--- pango-1.11.1/pango/pango-script-table.h.orig 2005-12-20 12:16:15.462241168 +0000
++++ pango-1.11.1/pango/pango-script-table.h 2005-12-20 12:17:01.782199464 +0000
+@@ -2748,6 +2748,7 @@
+ guint16 chars;
+ guint16 script;
+ } pango_script_table[] = {
++ { 0x0020, 95, PANGO_SCRIPT_LATIN },
+ { 0x200c, 2, PANGO_SCRIPT_INHERITED },
+ { 0x2071, 1, PANGO_SCRIPT_LATIN },
+ { 0x207f, 1, PANGO_SCRIPT_LATIN },
+@@ -2775,6 +2776,7 @@
+ { 0x2e80, 26, PANGO_SCRIPT_HAN },
+ { 0x2e9b, 89, PANGO_SCRIPT_HAN },
+ { 0x2f00, 214, PANGO_SCRIPT_HAN },
++ { 0x3000, 1, PANGO_SCRIPT_HAN },
+ { 0x3005, 1, PANGO_SCRIPT_HAN },
+ { 0x3007, 1, PANGO_SCRIPT_HAN },
+ { 0x3021, 9, PANGO_SCRIPT_HAN },
--- a/patches/pango-02-fullwidth-space.diff Tue May 30 09:29:34 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- pango-1.11.1/pango/pango-script-table.h.orig 2005-12-20 12:16:15.462241168 +0000
-+++ pango-1.11.1/pango/pango-script-table.h 2005-12-20 12:17:01.782199464 +0000
-@@ -2748,6 +2748,7 @@
- guint16 chars;
- guint16 script;
- } pango_script_table[] = {
-+ { 0x0020, 95, PANGO_SCRIPT_LATIN },
- { 0x200c, 2, PANGO_SCRIPT_INHERITED },
- { 0x2071, 1, PANGO_SCRIPT_LATIN },
- { 0x207f, 1, PANGO_SCRIPT_LATIN },
-@@ -2775,6 +2776,7 @@
- { 0x2e80, 26, PANGO_SCRIPT_HAN },
- { 0x2e9b, 89, PANGO_SCRIPT_HAN },
- { 0x2f00, 214, PANGO_SCRIPT_HAN },
-+ { 0x3000, 1, PANGO_SCRIPT_HAN },
- { 0x3005, 1, PANGO_SCRIPT_HAN },
- { 0x3007, 1, PANGO_SCRIPT_HAN },
- { 0x3021, 9, PANGO_SCRIPT_HAN },
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pango-02-pua.diff Tue May 30 09:43:57 2006 +0000
@@ -0,0 +1,67 @@
+diff -urNp pango-1.10.0/pango/pango-context.c pango-1.10.0-hacked/pango/pango-context.c
+--- pango-1.10.0/pango/pango-context.c 2005-07-27 04:21:52.000000000 +1200
++++ pango-1.10.0-hacked/pango/pango-context.c 2005-08-16 12:43:10.445977112 +1200
+@@ -1097,7 +1097,7 @@ itemize_state_process_run (ItemizeState
+ * emulated ideographic space for the primary font wouldn't be the
+ * right size.
+ */
+- if (!g_unichar_isgraph (wc) && wc != 0x3000)
++ if (!g_unichar_isgraph (wc) && (wc != 0x3000 || wc < 0xe000 || wc > 0xf8ff))
+ {
+ shape_engine = NULL;
+ font = NULL;
+diff -urNp pango-1.10.0/pango/pango-script.c pango-1.10.0-hacked/pango/pango-script.c
+--- pango-1.10.0/pango/pango-script.c 2005-08-16 09:51:22.000000000 +1200
++++ pango-1.10.0-hacked/pango/pango-script.c 2005-08-16 12:40:44.802118344 +1200
+@@ -547,6 +547,9 @@ pango_script_get_sample_language (PangoS
+ "", /* PANGO_SCRIPT_SYLOTI_NAGRI */
+ "peo", /* PANGO_SCRIPT_OLD_PERSIAN */
+ "", /* PANGO_SCRIPT_KHAROSHTHI */
++
++ /* Used for section with no any script assigned */
++ "", /* PANGO_SCRIPT_OTHER */
+ };
+ const char *sample_language;
+
+diff -urNp pango-1.10.0/pango/pango-script.h pango-1.10.0-hacked/pango/pango-script.h
+--- pango-1.10.0/pango/pango-script.h 2005-08-14 16:24:13.000000000 +1200
++++ pango-1.10.0-hacked/pango/pango-script.h 2005-08-16 12:39:57.862254288 +1200
+@@ -103,7 +103,9 @@ typedef enum { /
+ PANGO_SCRIPT_TIFINAGH, /* Tfng */
+ PANGO_SCRIPT_SYLOTI_NAGRI, /* Sylo */
+ PANGO_SCRIPT_OLD_PERSIAN, /* Xpeo */
+- PANGO_SCRIPT_KHAROSHTHI /* Khar */
++ PANGO_SCRIPT_KHAROSHTHI, /* Khar */
++
++ PANGO_SCRIPT_OTHER /* Fallback */
+ } PangoScript;
+
+ PangoScript pango_script_for_unichar (gunichar ch);
+diff -urNp pango-1.10.0/pango/pango-script-lang-table.h pango-1.10.0-hacked/pango/pango-script-lang-table.h
+--- pango-1.10.0/pango/pango-script-lang-table.h 2005-03-05 13:49:48.000000000 +1300
++++ pango-1.10.0-hacked/pango/pango-script-lang-table.h 2005-08-16 12:41:33.386732360 +1200
+@@ -182,10 +182,10 @@ static const PangoScriptForLang pango_sc
+ { "yap", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+ { "yi", { PANGO_SCRIPT_HEBREW, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+ { "yo", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+- { "zh-cn", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+- { "zh-hk", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
++ { "zh-cn", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
++ { "zh-hk", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
+ { "zh-mo", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+ { "zh-sg", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+- { "zh-tw", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
++ { "zh-tw", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
+ { "zu", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
+ };
+diff -urNp pango-1.10.0/pango/pango-script-table.h pango-1.10.0-hacked/pango/pango-script-table.h
+--- pango-1.10.0/pango/pango-script-table.h 2005-08-14 16:24:13.000000000 +1200
++++ pango-1.10.0-hacked/pango/pango-script-table.h 2005-08-16 12:42:32.053813608 +1200
+@@ -351,6 +351,7 @@ static const struct {
+ { 0xa490, 55, PANGO_SCRIPT_YI },
+ { 0xa800, 44, PANGO_SCRIPT_SYLOTI_NAGRI },
+ { 0xac00, 11172, PANGO_SCRIPT_HANGUL },
++ { 0xe000, 6400, PANGO_SCRIPT_OTHER },
+ { 0xf900, 302, PANGO_SCRIPT_HAN },
+ { 0xfa30, 59, PANGO_SCRIPT_HAN },
+ { 0xfa70, 106, PANGO_SCRIPT_HAN },
--- a/patches/pango-03-pua.diff Tue May 30 09:29:34 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-diff -urNp pango-1.10.0/pango/pango-context.c pango-1.10.0-hacked/pango/pango-context.c
---- pango-1.10.0/pango/pango-context.c 2005-07-27 04:21:52.000000000 +1200
-+++ pango-1.10.0-hacked/pango/pango-context.c 2005-08-16 12:43:10.445977112 +1200
-@@ -1097,7 +1097,7 @@ itemize_state_process_run (ItemizeState
- * emulated ideographic space for the primary font wouldn't be the
- * right size.
- */
-- if (!g_unichar_isgraph (wc) && wc != 0x3000)
-+ if (!g_unichar_isgraph (wc) && (wc != 0x3000 || wc < 0xe000 || wc > 0xf8ff))
- {
- shape_engine = NULL;
- font = NULL;
-diff -urNp pango-1.10.0/pango/pango-script.c pango-1.10.0-hacked/pango/pango-script.c
---- pango-1.10.0/pango/pango-script.c 2005-08-16 09:51:22.000000000 +1200
-+++ pango-1.10.0-hacked/pango/pango-script.c 2005-08-16 12:40:44.802118344 +1200
-@@ -547,6 +547,9 @@ pango_script_get_sample_language (PangoS
- "", /* PANGO_SCRIPT_SYLOTI_NAGRI */
- "peo", /* PANGO_SCRIPT_OLD_PERSIAN */
- "", /* PANGO_SCRIPT_KHAROSHTHI */
-+
-+ /* Used for section with no any script assigned */
-+ "", /* PANGO_SCRIPT_OTHER */
- };
- const char *sample_language;
-
-diff -urNp pango-1.10.0/pango/pango-script.h pango-1.10.0-hacked/pango/pango-script.h
---- pango-1.10.0/pango/pango-script.h 2005-08-14 16:24:13.000000000 +1200
-+++ pango-1.10.0-hacked/pango/pango-script.h 2005-08-16 12:39:57.862254288 +1200
-@@ -103,7 +103,9 @@ typedef enum { /
- PANGO_SCRIPT_TIFINAGH, /* Tfng */
- PANGO_SCRIPT_SYLOTI_NAGRI, /* Sylo */
- PANGO_SCRIPT_OLD_PERSIAN, /* Xpeo */
-- PANGO_SCRIPT_KHAROSHTHI /* Khar */
-+ PANGO_SCRIPT_KHAROSHTHI, /* Khar */
-+
-+ PANGO_SCRIPT_OTHER /* Fallback */
- } PangoScript;
-
- PangoScript pango_script_for_unichar (gunichar ch);
-diff -urNp pango-1.10.0/pango/pango-script-lang-table.h pango-1.10.0-hacked/pango/pango-script-lang-table.h
---- pango-1.10.0/pango/pango-script-lang-table.h 2005-03-05 13:49:48.000000000 +1300
-+++ pango-1.10.0-hacked/pango/pango-script-lang-table.h 2005-08-16 12:41:33.386732360 +1200
-@@ -182,10 +182,10 @@ static const PangoScriptForLang pango_sc
- { "yap", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
- { "yi", { PANGO_SCRIPT_HEBREW, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
- { "yo", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
-- { "zh-cn", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
-- { "zh-hk", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
-+ { "zh-cn", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
-+ { "zh-hk", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
- { "zh-mo", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
- { "zh-sg", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
-- { "zh-tw", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
-+ { "zh-tw", { PANGO_SCRIPT_HAN, PANGO_SCRIPT_OTHER, PANGO_SCRIPT_INVALID_CODE } },
- { "zu", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_INVALID_CODE, PANGO_SCRIPT_INVALID_CODE } },
- };
-diff -urNp pango-1.10.0/pango/pango-script-table.h pango-1.10.0-hacked/pango/pango-script-table.h
---- pango-1.10.0/pango/pango-script-table.h 2005-08-14 16:24:13.000000000 +1200
-+++ pango-1.10.0-hacked/pango/pango-script-table.h 2005-08-16 12:42:32.053813608 +1200
-@@ -351,6 +351,7 @@ static const struct {
- { 0xa490, 55, PANGO_SCRIPT_YI },
- { 0xa800, 44, PANGO_SCRIPT_SYLOTI_NAGRI },
- { 0xac00, 11172, PANGO_SCRIPT_HANGUL },
-+ { 0xe000, 6400, PANGO_SCRIPT_OTHER },
- { 0xf900, 302, PANGO_SCRIPT_HAN },
- { 0xfa30, 59, PANGO_SCRIPT_HAN },
- { 0xfa70, 106, PANGO_SCRIPT_HAN },