summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-11-06 18:08:16 +0200
committerTor Lillqvist <tml@iki.fi>2012-11-06 18:59:44 +0200
commite10124b20efb8cb7caf0f02fc537147a6505aa1d (patch)
tree4b1590fccf7d083da11a2e7e5b197af34d30b8f4 /pango
parent7b58bf4c0bd6614e8ebf8d4fee880a235834323c (diff)
Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg
Now with librsvg no longer used, and liblangtag no longer using glib, a bunch of bundled (in some configurations, always on some platforms) 3rd-party libraries are no longer needed. Initial work by rene, continued by tml. Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
Diffstat (limited to 'pango')
-rw-r--r--pango/README3
-rw-r--r--pango/makefile.mk170
-rw-r--r--pango/pango-1.28.3-non-ascii.patch528
-rw-r--r--pango/pango-1.28.3-win32.patch649
-rw-r--r--pango/pango-1.28.3.patch95
-rw-r--r--pango/prj/build.lst3
-rw-r--r--pango/prj/d.lst44
-rw-r--r--pango/prj/dmake0
8 files changed, 0 insertions, 1492 deletions
diff --git a/pango/README b/pango/README
deleted file mode 100644
index d80b4501108f..000000000000
--- a/pango/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most usage so far as been in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+ 2. Pango is designed to be modular; the core Pango layout can be used with four different font backends: Core X windowing system fonts, Client-side fonts on X using the Xft2 library, Direct rendering of scalable fonts using the FreeType library, Native fonts on Microsoft platforms. Dynamically loaded modules then handle text layout for particular combinations of script and font backend. Pango-1.2 ships with a wide selection of modules, including modules for Hebrew, Arabic, Hangul, Thai, and a number of Indic scripts. Virtually all of the world's major scripts are supported.
-
-As well as the low level layout rendering routines, Pango includes PangoLayout, a high level driver for laying out entire blocks of text, and routines to assist in editing internationalized text. \ No newline at end of file
diff --git a/pango/makefile.mk b/pango/makefile.mk
deleted file mode 100644
index 1815b6c1d773..000000000000
--- a/pango/makefile.mk
+++ /dev/null
@@ -1,170 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=pango
-TARGET=so_pango
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_PANGO)" == "YES"
-all:
- @echo "An already available installation of pango should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-PANGOVERSION=1.28.3
-
-TARFILE_NAME=$(PRJNAME)-$(PANGOVERSION)
-TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
-
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
-
-.IF "$(OS)" == "MACOSX"
-
-PATCH_FILES=pango-1.28.3.patch
-
-LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
-LOADER_LIBS:=glib-2.0.0 gthread-2.0.0
-EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
- ./configure --prefix=/@.__________________________________________________$(EXTRPATH) --disable-dependency-tracking --disable-doc-cross-references \
- CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
- CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
- LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" \
- CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \
- CAIRO_LIBS="-lcairo" \
- GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
- GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl"
-CONFIGURE_FLAGS=--with-included-modules=yes $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
-CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
-CONFIGURE_ACTION+="--without-x"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-.IF "$(VERBOSE)"!=""
-VFLAG=V=1
-.ENDIF
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=pango/.libs/libpango-1.0.0.dylib
-OUT2LIB+=pango/.libs/libpangocairo-1.0.0.dylib
-
-OUT2BIN_NONE+=pango/.libs/pango-querymodules
-
-OUT2INC+=pango/pango-attributes.h
-OUT2INC+=pango/pango-enum-types.h
-OUT2INC+=pango/pango-glyph.h
-OUT2INC+=pango/pango-modules.h
-OUT2INC+=pango/pango.h
-OUT2INC+=pango/pango-bidi-type.h
-OUT2INC+=pango/pango-features.h
-OUT2INC+=pango/pango-gravity.h
-OUT2INC+=pango/pango-renderer.h
-OUT2INC+=pango/pangoatsui.h
-OUT2INC+=pango/pango-break.h
-OUT2INC+=pango/pango-font.h
-OUT2INC+=pango/pango-item.h
-OUT2INC+=pango/pango-script.h
-OUT2INC+=pango/pangocairo.h
-OUT2INC+=pango/pango-context.h
-OUT2INC+=pango/pango-fontmap.h
-OUT2INC+=pango/pango-language.h
-OUT2INC+=pango/pango-tabs.h
-OUT2INC+=pango/pango-coverage.h
-OUT2INC+=pango/pango-fontset.h
-OUT2INC+=pango/pango-layout.h
-OUT2INC+=pango/pango-types.h
-OUT2INC+=pango/pango-engine.h
-OUT2INC+=pango/pango-glyph-item.h
-OUT2INC+=pango/pango-matrix.h
-OUT2INC+=pango/pango-utils.h
-
-.ELIF "$(OS)"=="WNT"
-
-PATCH_FILES=pango-1.28.3-win32.patch pango-1.28.3-non-ascii.patch
-ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-BUILD_DIR=./pango
-BUILD_ACTION=unset debug; nmake -f makefile.msc
-
-OUT2LIB+=pango/pango-1.0.lib
-OUT2LIB+=pango/pangocairo-1.0.lib
-OUT2LIB+=pango/pangowin32-1.0.lib
-
-OUT2BIN+=pango/pangolo.dll
-OUT2BIN+=pango/pangocairolo.dll
-OUT2BIN+=pango/pangowin32lo.dll
-OUT2BIN+=pango/querymodules.exe
-
-OUT2INC+=pango/pango.h
-OUT2INC+=pango/pangocairo.h
-OUT2INC+=pango/pango-attributes.h
-OUT2INC+=pango/pango-bidi-type.h
-OUT2INC+=pango/pango-break.h
-OUT2INC+=pango/pango-context.h
-OUT2INC+=pango/pango-coverage.h
-OUT2INC+=pango/pango-engine.h
-OUT2INC+=pango/pango-enum-types.h
-OUT2INC+=pango/pango-features.h
-OUT2INC+=pango/pango-font.h
-OUT2INC+=pango/pango-fontmap.h
-OUT2INC+=pango/pango-fontset.h
-OUT2INC+=pango/pango-glyph.h
-OUT2INC+=pango/pango-glyph-item.h
-OUT2INC+=pango/pango-gravity.h
-OUT2INC+=pango/pango-item.h
-OUT2INC+=pango/pango-language.h
-OUT2INC+=pango/pango-layout.h
-OUT2INC+=pango/pango-matrix.h
-OUT2INC+=pango/pango-renderer.h
-OUT2INC+=pango/pango-script.h
-OUT2INC+=pango/pango-tabs.h
-OUT2INC+=pango/pango-types.h
-OUT2INC+=pango/pango-utils.h
-
-.ELSE
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/pango/pango-1.28.3-non-ascii.patch b/pango/pango-1.28.3-non-ascii.patch
deleted file mode 100644
index 1a0eccec48e2..000000000000
--- a/pango/pango-1.28.3-non-ascii.patch
+++ /dev/null
@@ -1,528 +0,0 @@
---- misc/pango-1.28.3/pango/pango-language-sample-table.h 2011-08-30 03:35:41.996353700 +0900
-+++ misc/build/pango-1.28.3/pango/pango-language-sample-table.h 2011-08-30 03:33:09.885653400 +0900
-@@ -58,13 +58,13 @@
- LANGUAGE(
- ar /* Arabic */,
- WP-PANG,
-- "نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق."
-+ "\xd9""\x86""\xd8""\xb5"" \xd8""\xad""\xd9""\x83""\xd9""\x8a""\xd9""\x85"" \xd9""\x84""\xd9""\x87"" \xd8""\xb3""\xd8""\xb1"" \xd9""\x82""\xd8""\xa7""\xd8""\xb7""\xd8""\xb9"" \xd9""\x88""\xd8""\xb0""\xd9""\x88"" \xd8""\xb4""\xd8""\xa3""\xd9""\x86"" \xd8""\xb9""\xd8""\xb8""\xd9""\x8a""\xd9""\x85"" \xd9""\x85""\xd9""\x83""\xd8""\xaa""\xd9""\x88""\xd8""\xa8"" \xd8""\xb9""\xd9""\x84""\xd9""\x89"" \xd8""\xab""\xd9""\x88""\xd8""\xa8"" \xd8""\xa3""\xd8""\xae""\xd8""\xb6""\xd8""\xb1"" \xd9""\x88""\xd9""\x85""\xd8""\xba""\xd9""\x84""\xd9""\x81"" \xd8""\xa8""\xd8""\xac""\xd9""\x84""\xd8""\xaf"" \xd8""\xa3""\xd8""\xb2""\xd8""\xb1""\xd9""\x82""."
- /* A wise text which has an absolute secret and great importance, written on a green tissue and covered with blue leather. */
- )
- LANGUAGE(
- arn /* Mapudungun */,
- WP-PANG,
-- "Gvxam mincetu apocikvyeh: ñizol ce mamvj ka raq kuse bafkeh mew."
-+ "Gvxam mincetu apocikvyeh: \xc3""\xb1""izol ce mamvj ka raq kuse bafkeh mew."
- /* Tale under the full moon: the chief chemamull and the clay old woman at the lake/sea. */
- )
- LANGUAGE(
-@@ -76,7 +76,7 @@
- LANGUAGE(
- bg /* Bulgarian */,
- WP-SFD,
-- "Под южно дърво, цъфтящо в синьо, бягаше малко пухкаво зайче."
-+ "\xd0""\x9f""\xd0""\xbe""\xd0""\xb4"" \xd1""\x8e""\xd0""\xb6""\xd0""\xbd""\xd0""\xbe"" \xd0""\xb4""\xd1""\x8a""\xd1""\x80""\xd0""\xb2""\xd0""\xbe"", \xd1""\x86""\xd1""\x8a""\xd1""\x84""\xd1""\x82""\xd1""\x8f""\xd1""\x89""\xd0""\xbe"" \xd0""\xb2"" \xd1""\x81""\xd0""\xb8""\xd0""\xbd""\xd1""\x8c""\xd0""\xbe"", \xd0""\xb1""\xd1""\x8f""\xd0""\xb3""\xd0""\xb0""\xd1""\x88""\xd0""\xb5"" \xd0""\xbc""\xd0""\xb0""\xd0""\xbb""\xd0""\xba""\xd0""\xbe"" \xd0""\xbf""\xd1""\x83""\xd1""\x85""\xd0""\xba""\xd0""\xb0""\xd0""\xb2""\xd0""\xbe"" \xd0""\xb7""\xd0""\xb0""\xd0""\xb9""\xd1""\x87""\xd0""\xb5""."
- /* A little fluffy young rabbit ran under a southern tree blooming in blue */
- )
- LANGUAGE(
-@@ -88,37 +88,37 @@
- LANGUAGE(
- bn /* Bengali */,
- GLASS,
-- "আমি কাঁচ খেতে পারি, তাতে আমার কোনো ক্ষতি হয় না।"
-+ "\xe0""\xa6""\x86""\xe0""\xa6""\xae""\xe0""\xa6""\xbf"" \xe0""\xa6""\x95""\xe0""\xa6""\xbe""\xe0""\xa6""\x81""\xe0""\xa6""\x9a"" \xe0""\xa6""\x96""\xe0""\xa7""\x87""\xe0""\xa6""\xa4""\xe0""\xa7""\x87"" \xe0""\xa6""\xaa""\xe0""\xa6""\xbe""\xe0""\xa6""\xb0""\xe0""\xa6""\xbf"", \xe0""\xa6""\xa4""\xe0""\xa6""\xbe""\xe0""\xa6""\xa4""\xe0""\xa7""\x87"" \xe0""\xa6""\x86""\xe0""\xa6""\xae""\xe0""\xa6""\xbe""\xe0""\xa6""\xb0"" \xe0""\xa6""\x95""\xe0""\xa7""\x8b""\xe0""\xa6""\xa8""\xe0""\xa7""\x8b"" \xe0""\xa6""\x95""\xe0""\xa7""\x8d""\xe0""\xa6""\xb7""\xe0""\xa6""\xa4""\xe0""\xa6""\xbf"" \xe0""\xa6""\xb9""\xe0""\xa7""\x9f"" \xe0""\xa6""\xa8""\xe0""\xa6""\xbe""\xe0""\xa5""\xa4"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- bo /* Tibetan */,
- GLASS,
-- "ཤེལ་སྒོ་ཟ་ནས་ང་ན་གི་མ་རེད།"
-+ "\xe0""\xbd""\xa4""\xe0""\xbd""\xba""\xe0""\xbd""\xa3""\xe0""\xbc""\x8b""\xe0""\xbd""\xa6""\xe0""\xbe""\x92""\xe0""\xbd""\xbc""\xe0""\xbc""\x8b""\xe0""\xbd""\x9f""\xe0""\xbc""\x8b""\xe0""\xbd""\x93""\xe0""\xbd""\xa6""\xe0""\xbc""\x8b""\xe0""\xbd""\x84""\xe0""\xbc""\x8b""\xe0""\xbd""\x93""\xe0""\xbc""\x8b""\xe0""\xbd""\x82""\xe0""\xbd""\xb2""\xe0""\xbc""\x8b""\xe0""\xbd""\x98""\xe0""\xbc""\x8b""\xe0""\xbd""\xa2""\xe0""\xbd""\xba""\xe0""\xbd""\x91""\xe0""\xbc""\x8d"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- bs /* Bosnian */,
- WP-PANG,
-- "Fin džip, gluh jež i čvrst konjić dođoše bez moljca."
-+ "Fin d\xc5""\xbe""ip, gluh je\xc5""\xbe"" i \xc4""\x8d""vrst konji\xc4""\x87"" do\xc4""\x91""o\xc5""\xa1""e bez moljca."
- /* A nice jeep, a deaf hedgehog and a tough horse came without a moth. */
- )
- LANGUAGE(
- ca /* Catalan */,
- WP-PANG,
-- "Jove xef, porti whisky amb quinze glaçons d'hidrogen, coi!"
-+ "Jove xef, porti whisky amb quinze gla\xc3""\xa7""ons d'hidrogen, coi!"
- /* Young chef, bring whisky with fifteen hydrogen ice cubes, damn! */
- )
- LANGUAGE(
- ch /* Chamorro */,
- GLASS,
-- "Siña yo' chumocho krestat, ti ha na'lalamen yo'."
-+ "Si\xc3""\xb1""a yo' chumocho krestat, ti ha na'lalamen yo'."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- cs /* Czech */,
- WP-SFD,
-- "Příliš žluťoučký kůň úpěl ďábelské ódy."
-+ "P\xc5""\x99""\xc3""\xad""li\xc5""\xa1"" \xc5""\xbe""lu\xc5""\xa5""ou\xc4""\x8d""k\xc3""\xbd"" k\xc5""\xaf""\xc5""\x88"" \xc3""\xba""p\xc4""\x9b""l \xc4""\x8f""\xc3""\xa1""belsk\xc3""\xa9"" \xc3""\xb3""dy."
- /* A too yellow horse moaned devil odes. */
- )
- LANGUAGE(
-@@ -130,19 +130,19 @@
- LANGUAGE(
- da /* Danish */,
- WP-SFD,
-- "Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon."
-+ "Quizdeltagerne spiste jordb\xc3""\xa6""r med fl\xc3""\xb8""de, mens cirkusklovnen Walther spillede p\xc3""\xa5"" xylofon."
- /* The quiz contestants ate strawberries with cream while Walther the clown was playing the xylophone. */
- )
- LANGUAGE(
- de /* German */,
- WP-SFD,
-- "Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich."
-+ "Zw\xc3""\xb6""lf Boxk\xc3""\xa4""mpfer jagen Viktor quer \xc3""\xbc""ber den gro\xc3""\x9f""en Sylter Deich."
- /* Twelve boxing fighters drive Viktor over the great. */
- )
- LANGUAGE(
- el /* Greek */,
- WP-SFD,
-- "Θέλει αρετή και τόλμη η ελευθερία. (Ανδρέας Κάλβος)"
-+ "\xce""\x98""\xce""\xad""\xce""\xbb""\xce""\xb5""\xce""\xb9"" \xce""\xb1""\xcf""\x81""\xce""\xb5""\xcf""\x84""\xce""\xae"" \xce""\xba""\xce""\xb1""\xce""\xb9"" \xcf""\x84""\xcf""\x8c""\xce""\xbb""\xce""\xbc""\xce""\xb7"" \xce""\xb7"" \xce""\xb5""\xce""\xbb""\xce""\xb5""\xcf""\x85""\xce""\xb8""\xce""\xb5""\xcf""\x81""\xce""\xaf""\xce""\xb1"". (\xce""\x91""\xce""\xbd""\xce""\xb4""\xcf""\x81""\xce""\xad""\xce""\xb1""\xcf""\x82"" \xce""\x9a""\xce""\xac""\xce""\xbb""\xce""\xb2""\xce""\xbf""\xcf""\x82"")"
- /* Liberty requires virtue and mettle. (Andreas Kalvos) */
- )
- LANGUAGE(
-@@ -153,25 +153,25 @@
- LANGUAGE(
- enm /* Middle English */,
- GLASS,
-- "Ich canne glas eten and hit hirtiþ me nouȝt."
-+ "Ich canne glas eten and hit hirti\xc3""\xbe"" me nou\xc8""\x9d""t."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- eo /* Esperanto */,
- WP-SFD,
-- "Eĥoŝanĝo ĉiuĵaŭde."
-+ "E\xc4""\xa5""o\xc5""\x9d""an\xc4""\x9d""o \xc4""\x89""iu\xc4""\xb5""a\xc5""\xad""de."
- /* Change of echo every Thursday. */
- )
- LANGUAGE(
- es /* Spanish */,
- WP-PANG,
-- "Jovencillo emponzoñado de whisky: ¡qué figurota exhibe!"
-- /* Whisky-intoxicated youngster — what a figure he's showing! */
-+ "Jovencillo emponzo\xc3""\xb1""ado de whisky: \xc2""\xa1""qu\xc3""\xa9"" figurota exhibe!"
-+ /* Whisky-intoxicated youngster \xe2""\x80""\x94"" what a figure he's showing! */
- )
- LANGUAGE(
- et /* Estonian */,
- WP-SFD,
-- "See väike mölder jõuab rongile hüpata."
-+ "See v\xc3""\xa4""ike m\xc3""\xb6""lder j\xc3""\xb5""uab rongile h\xc3""\xbc""pata."
- /* This small miller is able to jump on the train. */
- )
- LANGUAGE(
-@@ -183,7 +183,7 @@
- LANGUAGE(
- fa /* Persian */,
- MISC /* Behdad Esfahbod (#548730) */,
-- "«الا یا اَیُّها السّاقی! اَدِرْ کَأساً وَ ناوِلْها!» که عشق آسان نمود اوّل، ولی افتاد مشکل‌ها!"
-+ "\xc2""\xab""\xd8""\xa7""\xd9""\x84""\xd8""\xa7"" \xdb""\x8c""\xd8""\xa7"" \xd8""\xa7""\xd9""\x8e""\xdb""\x8c""\xd9""\x91""\xd9""\x8f""\xd9""\x87""\xd8""\xa7"" \xd8""\xa7""\xd9""\x84""\xd8""\xb3""\xd9""\x91""\xd8""\xa7""\xd9""\x82""\xdb""\x8c""! \xd8""\xa7""\xd9""\x8e""\xd8""\xaf""\xd9""\x90""\xd8""\xb1""\xd9""\x92"" \xda""\xa9""\xd9""\x8e""\xd8""\xa7""\xd9""\x94""\xd8""\xb3""\xd8""\xa7""\xd9""\x8b"" \xd9""\x88""\xd9""\x8e"" \xd9""\x86""\xd8""\xa7""\xd9""\x88""\xd9""\x90""\xd9""\x84""\xd9""\x92""\xd9""\x87""\xd8""\xa7""!\xc2""\xbb"" \xda""\xa9""\xd9""\x87"" \xd8""\xb9""\xd8""\xb4""\xd9""\x82"" \xd8""\xa2""\xd8""\xb3""\xd8""\xa7""\xd9""\x86"" \xd9""\x86""\xd9""\x85""\xd9""\x88""\xd8""\xaf"" \xd8""\xa7""\xd9""\x88""\xd9""\x91""\xd9""\x84""\xd8""\x8c"" \xd9""\x88""\xd9""\x84""\xdb""\x8c"" \xd8""\xa7""\xd9""\x81""\xd8""\xaa""\xd8""\xa7""\xd8""\xaf"" \xd9""\x85""\xd8""\xb4""\xda""\xa9""\xd9""\x84""\xe2""\x80""\x8c""\xd9""\x87""\xd8""\xa7""!"
- )
- LANGUAGE(
- fi /* Finnish */,
-@@ -194,7 +194,7 @@
- LANGUAGE(
- fr /* French */,
- MISC /* Vincent Untz (#549520) http://fr.wikipedia.org/wiki/Pangramme */,
-- "Voix ambiguë d'un cœur qui, au zéphyr, préfère les jattes de kiwis."
-+ "Voix ambigu\xc3""\xab"" d'un c\xc5""\x93""ur qui, au z\xc3""\xa9""phyr, pr\xc3""\xa9""f\xc3""\xa8""re les jattes de kiwis."
- /* Ambiguous voice of a heart that, in the wind, prefers bowls of kiwis. */
- )
- LANGUAGE(
-@@ -206,7 +206,7 @@
- LANGUAGE(
- ga /* Irish */,
- WP-PANG,
-- "D'ḟuascail Íosa Úrṁac na hÓiġe Beannaiṫe pór Éaḃa agus Áḋaiṁ."
-+ "D'\xe1""\xb8""\x9f""uascail \xc3""\x8d""osa \xc3""\x9a""r\xe1""\xb9""\x81""ac na h\xc3""\x93""i\xc4""\xa1""e Beannai\xe1""\xb9""\xab""e p\xc3""\xb3""r \xc3""\x89""a\xe1""\xb8""\x83""a agus \xc3""\x81""\xe1""\xb8""\x8b""ai\xe1""\xb9""\x81""."
- /* Jesus, Son of the blessed Virgin, redeemed the seed of Eve and Adam. */
- )
- LANGUAGE(
-@@ -224,7 +224,7 @@
- LANGUAGE(
- got /* Gothic */,
- GLASS,
-- "𐌼𐌰𐌲 𐌲𐌻𐌴𐍃 𐌹̈𐍄𐌰𐌽, 𐌽𐌹 𐌼𐌹𐍃 𐍅𐌿 𐌽𐌳𐌰𐌽 𐌱𐍂𐌹𐌲𐌲𐌹𐌸."
-+ "\xf0""\x90""\x8c""\xbc""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xb2"" \xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xbb""\xf0""\x90""\x8c""\xb4""\xf0""\x90""\x8d""\x83"" \xf0""\x90""\x8c""\xb9""\xcc""\x88""\xf0""\x90""\x8d""\x84""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xbd"", \xf0""\x90""\x8c""\xbd""\xf0""\x90""\x8c""\xb9"" \xf0""\x90""\x8c""\xbc""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8d""\x83"" \xf0""\x90""\x8d""\x85""\xf0""\x90""\x8c""\xbf"" \xf0""\x90""\x8c""\xbd""\xf0""\x90""\x8c""\xb3""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xbd"" \xf0""\x90""\x8c""\xb1""\xf0""\x90""\x8d""\x82""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8c""\xb8""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-@@ -236,19 +236,19 @@
- LANGUAGE(
- haw /* Hawaiian */,
- GLASS,
-- "Hiki iaʻu ke ʻai i ke aniani; ʻaʻole nō lā au e ʻeha."
-+ "Hiki ia\xca""\xbb""u ke \xca""\xbb""ai i ke aniani; \xca""\xbb""a\xca""\xbb""ole n\xc5""\x8d"" l\xc4""\x81"" au e \xca""\xbb""eha."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- he /* Hebrew */,
- WP-SFD,
-- "דג סקרן שט לו בים זך אך לפתע פגש חבורה נחמדה שצצה כך."
-+ "\xd7""\x93""\xd7""\x92"" \xd7""\xa1""\xd7""\xa7""\xd7""\xa8""\xd7""\x9f"" \xd7""\xa9""\xd7""\x98"" \xd7""\x9c""\xd7""\x95"" \xd7""\x91""\xd7""\x99""\xd7""\x9d"" \xd7""\x96""\xd7""\x9a"" \xd7""\x90""\xd7""\x9a"" \xd7""\x9c""\xd7""\xa4""\xd7""\xaa""\xd7""\xa2"" \xd7""\xa4""\xd7""\x92""\xd7""\xa9"" \xd7""\x97""\xd7""\x91""\xd7""\x95""\xd7""\xa8""\xd7""\x94"" \xd7""\xa0""\xd7""\x97""\xd7""\x9e""\xd7""\x93""\xd7""\x94"" \xd7""\xa9""\xd7""\xa6""\xd7""\xa6""\xd7""\x94"" \xd7""\x9b""\xd7""\x9a""."
- /* A curious fish sailed a clear sea, and suddenly found nice company that just popped up. */
- )
- LANGUAGE(
- hi /* Hindi */,
- MISC /* G Karunakar (#549532) */,
-- "नहीं नजर किसी की बुरी नहीं किसी का मुँह काला जो करे सो उपर वाला"
-+ "\xe0""\xa4""\xa8""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""\xe0""\xa4""\x82"" \xe0""\xa4""\xa8""\xe0""\xa4""\x9c""\xe0""\xa4""\xb0"" \xe0""\xa4""\x95""\xe0""\xa4""\xbf""\xe0""\xa4""\xb8""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa5""\x80"" \xe0""\xa4""\xac""\xe0""\xa5""\x81""\xe0""\xa4""\xb0""\xe0""\xa5""\x80"" \xe0""\xa4""\xa8""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""\xe0""\xa4""\x82"" \xe0""\xa4""\x95""\xe0""\xa4""\xbf""\xe0""\xa4""\xb8""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe"" \xe0""\xa4""\xae""\xe0""\xa5""\x81""\xe0""\xa4""\x81""\xe0""\xa4""\xb9"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"" \xe0""\xa4""\x9c""\xe0""\xa5""\x8b"" \xe0""\xa4""\x95""\xe0""\xa4""\xb0""\xe0""\xa5""\x87"" \xe0""\xa4""\xb8""\xe0""\xa5""\x8b"" \xe0""\xa4""\x89""\xe0""\xa4""\xaa""\xe0""\xa4""\xb0"" \xe0""\xa4""\xb5""\xe0""\xa4""\xbe""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"""
- /* its not in the sight or the face, but its all in god's grace. */
- )
- LANGUAGE(
-@@ -260,19 +260,19 @@
- LANGUAGE(
- hu /* Hungarian */,
- WP-SFD,
-- "Egy hűtlen vejét fülöncsípő, dühös mexikói úr Wesselényinél mázol Quitóban."
-- /* An angry Mexican man, who caught his faithless son-in-law, is painting Wesselényi's house in Quito. */
-+ "Egy h\xc5""\xb1""tlen vej\xc3""\xa9""t f\xc3""\xbc""l\xc3""\xb6""ncs\xc3""\xad""p\xc5""\x91"", d\xc3""\xbc""h\xc3""\xb6""s mexik\xc3""\xb3""i \xc3""\xba""r Wessel\xc3""\xa9""nyin\xc3""\xa9""l m\xc3""\xa1""zol Quit\xc3""\xb3""ban."
-+ /* An angry Mexican man, who caught his faithless son-in-law, is painting Wessel\xc3""\xa9""nyi's house in Quito. */
- )
- LANGUAGE(
- hy /* Armenian */,
- GLASS,
-- "Կրնամ ապակի ուտել և ինծի անհանգիստ չըներ։"
-+ "\xd4""\xbf""\xd6""\x80""\xd5""\xb6""\xd5""\xa1""\xd5""\xb4"" \xd5""\xa1""\xd5""\xba""\xd5""\xa1""\xd5""\xaf""\xd5""\xab"" \xd5""\xb8""\xd6""\x82""\xd5""\xbf""\xd5""\xa5""\xd5""\xac"" \xd6""\x87"" \xd5""\xab""\xd5""\xb6""\xd5""\xae""\xd5""\xab"" \xd5""\xa1""\xd5""\xb6""\xd5""\xb0""\xd5""\xa1""\xd5""\xb6""\xd5""\xa3""\xd5""\xab""\xd5""\xbd""\xd5""\xbf"" \xd5""\xb9""\xd5""\xa8""\xd5""\xb6""\xd5""\xa5""\xd6""\x80""\xd6""\x89"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- is /* Icelandic */,
- WP-PANG,
-- "Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa"
-+ "K\xc3""\xa6""mi n\xc3""\xbd"" \xc3""\xb6""xi h\xc3""\xa9""r ykist \xc3""\xbe""j\xc3""\xb3""fum n\xc3""\xba"" b\xc3""\xa6""\xc3""\xb0""i v\xc3""\xad""l og \xc3""\xa1""drepa"
- /* If a new axe were here, thieves would feel increasing deterrence and punishment. */
- )
- LANGUAGE(
-@@ -284,7 +284,7 @@
- LANGUAGE(
- ja /* Japanese */,
- KERMIT,
-- "いろはにほへと ちりぬるを 色は匂へど 散りぬるを"
-+ "\xe3""\x81""\x84""\xe3""\x82""\x8d""\xe3""\x81""\xaf""\xe3""\x81""\xab""\xe3""\x81""\xbb""\xe3""\x81""\xb8""\xe3""\x81""\xa8"" \xe3""\x81""\xa1""\xe3""\x82""\x8a""\xe3""\x81""\xac""\xe3""\x82""\x8b""\xe3""\x82""\x92"" \xe8""\x89""\xb2""\xe3""\x81""\xaf""\xe5""\x8c""\x82""\xe3""\x81""\xb8""\xe3""\x81""\xa9"" \xe6""\x95""\xa3""\xe3""\x82""\x8a""\xe3""\x81""\xac""\xe3""\x82""\x8b""\xe3""\x82""\x92"""
- )
- LANGUAGE(
- jam /* Jamaican Creole English */,
-@@ -306,19 +306,19 @@
- LANGUAGE(
- ka /* Georgian */,
- GLASS,
-- "მინას ვჭამ და არა მტკივა."
-+ "\xe1""\x83""\x9b""\xe1""\x83""\x98""\xe1""\x83""\x9c""\xe1""\x83""\x90""\xe1""\x83""\xa1"" \xe1""\x83""\x95""\xe1""\x83""\xad""\xe1""\x83""\x90""\xe1""\x83""\x9b"" \xe1""\x83""\x93""\xe1""\x83""\x90"" \xe1""\x83""\x90""\xe1""\x83""\xa0""\xe1""\x83""\x90"" \xe1""\x83""\x9b""\xe1""\x83""\xa2""\xe1""\x83""\x99""\xe1""\x83""\x98""\xe1""\x83""\x95""\xe1""\x83""\x90""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- ko /* Korean */,
- WP-SFD,
-- "다람쥐 헌 쳇바퀴에 타고파"
-+ "\xeb""\x8b""\xa4""\xeb""\x9e""\x8c""\xec""\xa5""\x90"" \xed""\x97""\x8c"" \xec""\xb3""\x87""\xeb""\xb0""\x94""\xed""\x80""\xb4""\xec""\x97""\x90"" \xed""\x83""\x80""\xea""\xb3""\xa0""\xed""\x8c""\x8c"""
- /* I Wanna ride on the chipmunk's old hamster wheel. */
- )
- LANGUAGE(
- kw /* Cornish */,
- GLASS,
-- "Mý a yl dybry gwéder hag éf ny wra ow ankenya."
-+ "M\xc3""\xbd"" a yl dybry gw\xc3""\xa9""der hag \xc3""\xa9""f ny wra ow ankenya."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-@@ -329,37 +329,37 @@
- LANGUAGE(
- lt /* Lithuanian */,
- WP-PANG,
-- "Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą."
-+ "\xc4""\xae""linkdama fechtuotojo \xc5""\xa1""paga sublyk\xc4""\x8d""iojusi pragr\xc4""\x99""\xc5""\xbe""\xc4""\x97"" apval\xc5""\xb3"" arb\xc5""\xab""z\xc4""\x85""."
- /* Incurving fencer sword sparkled and perforated a round watermelon. */
- )
- LANGUAGE(
- lv /* Latvian */,
- WP-SFD,
-- "Sarkanās jūrascūciņas peld pa jūru."
-+ "Sarkan\xc4""\x81""s j\xc5""\xab""rasc\xc5""\xab""ci\xc5""\x86""as peld pa j\xc5""\xab""ru."
- /* Red seapigs swim in the sea. */
- )
- LANGUAGE(
- map /* Marquesan */,
- GLASS,
-- "E koʻana e kai i te karahi, mea ʻā, ʻaʻe hauhau."
-+ "E ko\xca""\xbb""ana e kai i te karahi, mea \xca""\xbb""\xc4""\x81"", \xca""\xbb""a\xca""\xbb""e hauhau."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- mk /* Macedonian */,
- GLASS,
-- "Можам да јадам стакло, а не ме штета."
-+ "\xd0""\x9c""\xd0""\xbe""\xd0""\xb6""\xd0""\xb0""\xd0""\xbc"" \xd0""\xb4""\xd0""\xb0"" \xd1""\x98""\xd0""\xb0""\xd0""\xb4""\xd0""\xb0""\xd0""\xbc"" \xd1""\x81""\xd1""\x82""\xd0""\xb0""\xd0""\xba""\xd0""\xbb""\xd0""\xbe"", \xd0""\xb0"" \xd0""\xbd""\xd0""\xb5"" \xd0""\xbc""\xd0""\xb5"" \xd1""\x88""\xd1""\x82""\xd0""\xb5""\xd1""\x82""\xd0""\xb0""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- mn /* Mongolian */,
- GLASS,
-- "ᠪᠢ ᠰᠢᠯᠢ ᠢᠳᠡᠶᠦ ᠴᠢᠳᠠᠨᠠ ᠂ ᠨᠠᠳᠤᠷ ᠬᠣᠤᠷᠠᠳᠠᠢ ᠪᠢᠰᠢ"
-+ "\xe1""\xa0""\xaa""\xe1""\xa0""\xa2"" \xe1""\xa0""\xb0""\xe1""\xa0""\xa2""\xe1""\xa0""\xaf""\xe1""\xa0""\xa2"" \xe1""\xa0""\xa2""\xe1""\xa0""\xb3""\xe1""\xa0""\xa1""\xe1""\xa0""\xb6""\xe1""\xa0""\xa6"" \xe1""\xa0""\xb4""\xe1""\xa0""\xa2""\xe1""\xa0""\xb3""\xe1""\xa0""\xa0""\xe1""\xa0""\xa8""\xe1""\xa0""\xa0"" \xe1""\xa0""\x82"" \xe1""\xa0""\xa8""\xe1""\xa0""\xa0""\xe1""\xa0""\xb3""\xe1""\xa0""\xa4""\xe1""\xa0""\xb7"" \xe1""\xa0""\xac""\xe1""\xa0""\xa3""\xe1""\xa0""\xa4""\xe1""\xa0""\xb7""\xe1""\xa0""\xa0""\xe1""\xa0""\xb3""\xe1""\xa0""\xa0""\xe1""\xa0""\xa2"" \xe1""\xa0""\xaa""\xe1""\xa0""\xa2""\xe1""\xa0""\xb0""\xe1""\xa0""\xa2"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- mr /* Marathi */,
- GLASS,
-- "मी काच खाऊ शकतो, मला ते दुखत नाही."
-+ "\xe0""\xa4""\xae""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\x9a"" \xe0""\xa4""\x96""\xe0""\xa4""\xbe""\xe0""\xa4""\x8a"" \xe0""\xa4""\xb6""\xe0""\xa4""\x95""\xe0""\xa4""\xa4""\xe0""\xa5""\x8b"", \xe0""\xa4""\xae""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"" \xe0""\xa4""\xa4""\xe0""\xa5""\x87"" \xe0""\xa4""\xa6""\xe0""\xa5""\x81""\xe0""\xa4""\x96""\xe0""\xa4""\xa4"" \xe0""\xa4""\xa8""\xe0""\xa4""\xbe""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-@@ -375,9 +375,9 @@
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-- nb /* Norwegian Bokmål */,
-+ nb /* Norwegian Bokm\xc3""\xa5""l */,
- GSPECI,
-- "Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi."
-+ "V\xc3""\xa5""r s\xc3""\xa6""re Zulu fra bade\xc3""\xb8""ya spilte jo whist og quickstep i min taxi."
- )
- LANGUAGE(
- nl /* Dutch */,
-@@ -388,66 +388,66 @@
- LANGUAGE(
- nn /* Norwegian Nynorsk */,
- GLASS,
-- "Eg kan eta glas utan å skada meg."
-+ "Eg kan eta glas utan \xc3""\xa5"" skada meg."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-- no /* Norwegian Bokmål */,
-+ no /* Norwegian Bokm\xc3""\xa5""l */,
- GSPECI,
-- "Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi."
-+ "V\xc3""\xa5""r s\xc3""\xa6""re Zulu fra bade\xc3""\xb8""ya spilte jo whist og quickstep i min taxi."
- )
- LANGUAGE(
- nv /* Navajo */,
- GLASS,
-- "Tsésǫʼ yishą́ągo bííníshghah dóó doo shił neezgai da."
-+ "Ts\xc3""\xa9""s\xc7""\xab""\xca""\xbc"" yish\xc4""\x85""\xcc""\x81""\xc4""\x85""go b\xc3""\xad""\xc3""\xad""n\xc3""\xad""shghah d\xc3""\xb3""\xc3""\xb3"" doo shi\xc5""\x82"" neezgai da."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- oc /* Occitan */,
- GLASS,
-- "Pòdi manjar de veire, me nafrariá pas."
-+ "P\xc3""\xb2""di manjar de veire, me nafrari\xc3""\xa1"" pas."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- pcd /* Picard */,
- GLASS,
-- "Ch'peux mingi du verre, cha m'foé mie n'ma."
-+ "Ch'peux mingi du verre, cha m'fo\xc3""\xa9"" mie n'ma."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- pl /* Polish */,
- WP-SFD,
-- "Pchnąć w tę łódź jeża lub ośm skrzyń fig."
-+ "Pchn\xc4""\x85""\xc4""\x87"" w t\xc4""\x99"" \xc5""\x82""\xc3""\xb3""d\xc5""\xba"" je\xc5""\xbc""a lub o\xc5""\x9b""m skrzy\xc5""\x84"" fig."
- /* Push into this boat a hedgehog or eight boxes of figs. */
- )
- LANGUAGE(
- pt /* Portuguese */,
- WP-SFD,
-- "Vejam a bruxa da raposa Salta-Pocinhas e o cão feliz que dorme regalado."
-+ "Vejam a bruxa da raposa Salta-Pocinhas e o c\xc3""\xa3""o feliz que dorme regalado."
- /* Watch the witch of the Jump-Puddles fox and the happy dog that sleeps delighted. */
- )
- LANGUAGE(
- pt-br /* Brazilian Portuguese */,
- WP-PANG,
-- "À noite, vovô Kowalsky vê o ímã cair no pé do pingüim queixoso e vovó põe açúcar no chá de tâmaras do jabuti feliz."
-+ "\xc3""\x80"" noite, vov\xc3""\xb4"" Kowalsky v\xc3""\xaa"" o \xc3""\xad""m\xc3""\xa3"" cair no p\xc3""\xa9"" do ping\xc3""\xbc""im queixoso e vov\xc3""\xb3"" p\xc3""\xb5""e a\xc3""\xa7""\xc3""\xba""car no ch\xc3""\xa1"" de t\xc3""\xa2""maras do jabuti feliz."
- /* At night, grandpa Kowalsky sees the magnet falling in the complaining penguin's foot and grandma puts sugar in the happy tortoise's date tea.*/
- )
- LANGUAGE(
- ro /* Romanian */,
- MISC /* Misu Moldovan (#552993) */,
-- "Fumegând hipnotic sașiul azvârle mreje în bălți."
-+ "Fumeg\xc3""\xa2""nd hipnotic sa\xc8""\x99""iul azv\xc3""\xa2""rle mreje \xc3""\xae""n b\xc4""\x83""l\xc8""\x9b""i."
- /* Hypnotically smoking, the cross-eyed man throws fishing nets into ponds. */
- )
- LANGUAGE(
- ru /* Russian */,
- WP-PANG,
-- "В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!"
-+ "\xd0""\x92"" \xd1""\x87""\xd0""\xb0""\xd1""\x89""\xd0""\xb0""\xd1""\x85"" \xd1""\x8e""\xd0""\xb3""\xd0""\xb0"" \xd0""\xb6""\xd0""\xb8""\xd0""\xbb"" \xd0""\xb1""\xd1""\x8b"" \xd1""\x86""\xd0""\xb8""\xd1""\x82""\xd1""\x80""\xd1""\x83""\xd1""\x81""? \xd0""\x94""\xd0""\xb0"", \xd0""\xbd""\xd0""\xbe"" \xd1""\x84""\xd0""\xb0""\xd0""\xbb""\xd1""\x8c""\xd1""\x88""\xd0""\xb8""\xd0""\xb2""\xd1""\x8b""\xd0""\xb9"" \xd1""\x8d""\xd0""\xba""\xd0""\xb7""\xd0""\xb5""\xd0""\xbc""\xd0""\xbf""\xd0""\xbb""\xd1""\x8f""\xd1""\x80""!"
- /* Would a citrus live in the bushes of the south? Yes, but only a fake one! */
- )
- LANGUAGE(
- sa /* Sanskrit */,
- GLASS,
-- "काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥"
-+ "\xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\x9a""\xe0""\xa4""\x82"" \xe0""\xa4""\xb6""\xe0""\xa4""\x95""\xe0""\xa5""\x8d""\xe0""\xa4""\xa8""\xe0""\xa5""\x8b""\xe0""\xa4""\xae""\xe0""\xa5""\x8d""\xe0""\xa4""\xaf""\xe0""\xa4""\xa4""\xe0""\xa5""\x8d""\xe0""\xa4""\xa4""\xe0""\xa5""\x81""\xe0""\xa4""\xae""\xe0""\xa5""\x8d"" \xe0""\xa5""\xa4"" \xe0""\xa4""\xa8""\xe0""\xa5""\x8b""\xe0""\xa4""\xaa""\xe0""\xa4""\xb9""\xe0""\xa4""\xbf""\xe0""\xa4""\xa8""\xe0""\xa4""\xb8""\xe0""\xa5""\x8d""\xe0""\xa4""\xa4""\xe0""\xa4""\xbf"" \xe0""\xa4""\xae""\xe0""\xa4""\xbe""\xe0""\xa4""\xae""\xe0""\xa5""\x8d"" \xe0""\xa5""\xa5"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-@@ -459,56 +459,56 @@
- LANGUAGE(
- sk /* Slovak */,
- KERMIT,
-- "Starý kôň na hŕbe kníh žuje tíško povädnuté ruže, na stĺpe sa ďateľ učí kvákať novú ódu o živote."
-+ "Star\xc3""\xbd"" k\xc3""\xb4""\xc5""\x88"" na h\xc5""\x95""be kn\xc3""\xad""h \xc5""\xbe""uje t\xc3""\xad""\xc5""\xa1""ko pov\xc3""\xa4""dnut\xc3""\xa9"" ru\xc5""\xbe""e, na st\xc4""\xba""pe sa \xc4""\x8f""ate\xc4""\xbe"" u\xc4""\x8d""\xc3""\xad"" kv\xc3""\xa1""ka\xc5""\xa5"" nov\xc3""\xba"" \xc3""\xb3""du o \xc5""\xbe""ivote."
- )
- LANGUAGE(
- sl /* Slovenian */,
- WP-PANG,
-- "Šerif bo za vajo spet kuhal domače žgance."
-+ "\xc5""\xa0""erif bo za vajo spet kuhal doma\xc4""\x8d""e \xc5""\xbe""gance."
- /* For an exercise, sheriff will again make home-made mush. */
- )
- LANGUAGE(
- sq /* Albanian */,
- GLASS,
-- "Unë mund të ha qelq dhe nuk më gjen gjë."
-+ "Un\xc3""\xab"" mund t\xc3""\xab"" ha qelq dhe nuk m\xc3""\xab"" gjen gj\xc3""\xab""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- sr /* Serbian (Cyrillic) */,
- WP-SFD,
-- "Чешће цeђење мрeжастим џаком побољшава фертилизацију генских хибрида."
-+ "\xd0""\xa7""\xd0""\xb5""\xd1""\x88""\xd1""\x9b""\xd0""\xb5"" \xd1""\x86""e\xd1""\x92""\xd0""\xb5""\xd1""\x9a""\xd0""\xb5"" \xd0""\xbc""\xd1""\x80""e\xd0""\xb6""\xd0""\xb0""\xd1""\x81""\xd1""\x82""\xd0""\xb8""\xd0""\xbc"" \xd1""\x9f""\xd0""\xb0""\xd0""\xba""\xd0""\xbe""\xd0""\xbc"" \xd0""\xbf""\xd0""\xbe""\xd0""\xb1""\xd0""\xbe""\xd1""\x99""\xd1""\x88""\xd0""\xb0""\xd0""\xb2""\xd0""\xb0"" \xd1""\x84""\xd0""\xb5""\xd1""\x80""\xd1""\x82""\xd0""\xb8""\xd0""\xbb""\xd0""\xb8""\xd0""\xb7""\xd0""\xb0""\xd1""\x86""\xd0""\xb8""\xd1""\x98""\xd1""\x83"" \xd0""\xb3""\xd0""\xb5""\xd0""\xbd""\xd1""\x81""\xd0""\xba""\xd0""\xb8""\xd1""\x85"" \xd1""\x85""\xd0""\xb8""\xd0""\xb1""\xd1""\x80""\xd0""\xb8""\xd0""\xb4""\xd0""\xb0""."
- /* More frequent filtering through the reticular bag improves fertilization of genetic hybrids. */
- )
- #if 0
- LANGUAGE(
- sr-sr@latin /* Serbian (Latin) */,
- WP-SFD,
-- "Češće ceđenje mrežastim džakom poboljšava fertilizaciju genskih hibrida."
-+ "\xc4""\x8c""e\xc5""\xa1""\xc4""\x87""e ce\xc4""\x91""enje mre\xc5""\xbe""astim d\xc5""\xbe""akom pobolj\xc5""\xa1""ava fertilizaciju genskih hibrida."
- /* More frequent filtering through the reticular bag improves fertilization of genetic hybrids. */
- )
- #endif
- LANGUAGE(
- sv /* Swedish */,
- WP-SFD,
-- "Flygande bäckasiner söka strax hwila på mjuka tuvor."
-+ "Flygande b\xc3""\xa4""ckasiner s\xc3""\xb6""ka strax hwila p\xc3""\xa5"" mjuka tuvor."
- /* Flying snipes soon look to rest on soft grass beds. */
- )
- LANGUAGE(
- swg /* Swabian */,
- GLASS,
-- "I kå Glas frässa, ond des macht mr nix!"
-+ "I k\xc3""\xa5"" Glas fr\xc3""\xa4""ssa, ond des macht mr nix!"
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- ta /* Tamil */,
- GLASS,
-- "நான் கண்ணாடி சாப்பிடுவேன், அதனால் எனக்கு ஒரு கேடும் வராது."
-+ "\xe0""\xae""\xa8""\xe0""\xae""\xbe""\xe0""\xae""\xa9""\xe0""\xaf""\x8d"" \xe0""\xae""\x95""\xe0""\xae""\xa3""\xe0""\xaf""\x8d""\xe0""\xae""\xa3""\xe0""\xae""\xbe""\xe0""\xae""\x9f""\xe0""\xae""\xbf"" \xe0""\xae""\x9a""\xe0""\xae""\xbe""\xe0""\xae""\xaa""\xe0""\xaf""\x8d""\xe0""\xae""\xaa""\xe0""\xae""\xbf""\xe0""\xae""\x9f""\xe0""\xaf""\x81""\xe0""\xae""\xb5""\xe0""\xaf""\x87""\xe0""\xae""\xa9""\xe0""\xaf""\x8d"", \xe0""\xae""\x85""\xe0""\xae""\xa4""\xe0""\xae""\xa9""\xe0""\xae""\xbe""\xe0""\xae""\xb2""\xe0""\xaf""\x8d"" \xe0""\xae""\x8e""\xe0""\xae""\xa9""\xe0""\xae""\x95""\xe0""\xaf""\x8d""\xe0""\xae""\x95""\xe0""\xaf""\x81"" \xe0""\xae""\x92""\xe0""\xae""\xb0""\xe0""\xaf""\x81"" \xe0""\xae""\x95""\xe0""\xaf""\x87""\xe0""\xae""\x9f""\xe0""\xaf""\x81""\xe0""\xae""\xae""\xe0""\xaf""\x8d"" \xe0""\xae""\xb5""\xe0""\xae""\xb0""\xe0""\xae""\xbe""\xe0""\xae""\xa4""\xe0""\xaf""\x81""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- th /* Thai */,
- WP-SFD,
-- "เป็นมนุษย์สุดประเสริฐเลิศคุณค่า - กว่าบรรดาฝูงสัตว์เดรัจฉาน - จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร - ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า - หัดอภัยเหมือนกีฬาอัชฌาสัย - ปฏิบัติประพฤติกฎกำหนดใจ - พูดจาให้จ๊ะ ๆ จ๋า ๆ น่าฟังเอยฯ"
-+ "\xe0""\xb9""\x80""\xe0""\xb8""\x9b""\xe0""\xb9""\x87""\xe0""\xb8""\x99""\xe0""\xb8""\xa1""\xe0""\xb8""\x99""\xe0""\xb8""\xb8""\xe0""\xb8""\xa9""\xe0""\xb8""\xa2""\xe0""\xb9""\x8c""\xe0""\xb8""\xaa""\xe0""\xb8""\xb8""\xe0""\xb8""\x94""\xe0""\xb8""\x9b""\xe0""\xb8""\xa3""\xe0""\xb8""\xb0""\xe0""\xb9""\x80""\xe0""\xb8""\xaa""\xe0""\xb8""\xa3""\xe0""\xb8""\xb4""\xe0""\xb8""\x90""\xe0""\xb9""\x80""\xe0""\xb8""\xa5""\xe0""\xb8""\xb4""\xe0""\xb8""\xa8""\xe0""\xb8""\x84""\xe0""\xb8""\xb8""\xe0""\xb8""\x93""\xe0""\xb8""\x84""\xe0""\xb9""\x88""\xe0""\xb8""\xb2"" - \xe0""\xb8""\x81""\xe0""\xb8""\xa7""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9a""\xe0""\xb8""\xa3""\xe0""\xb8""\xa3""\xe0""\xb8""\x94""\xe0""\xb8""\xb2""\xe0""\xb8""\x9d""\xe0""\xb8""\xb9""\xe0""\xb8""\x87""\xe0""\xb8""\xaa""\xe0""\xb8""\xb1""\xe0""\xb8""\x95""\xe0""\xb8""\xa7""\xe0""\xb9""\x8c""\xe0""\xb9""\x80""\xe0""\xb8""\x94""\xe0""\xb8""\xa3""\xe0""\xb8""\xb1""\xe0""\xb8""\x88""\xe0""\xb8""\x89""\xe0""\xb8""\xb2""\xe0""\xb8""\x99"" - \xe0""\xb8""\x88""\xe0""\xb8""\x87""\xe0""\xb8""\x9d""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9f""\xe0""\xb8""\xb1""\xe0""\xb8""\x99""\xe0""\xb8""\x9e""\xe0""\xb8""\xb1""\xe0""\xb8""\x92""\xe0""\xb8""\x99""\xe0""\xb8""\xb2""\xe0""\xb8""\xa7""\xe0""\xb8""\xb4""\xe0""\xb8""\x8a""\xe0""\xb8""\xb2""\xe0""\xb8""\x81""\xe0""\xb8""\xb2""\xe0""\xb8""\xa3"" \xe0""\xb8""\xad""\xe0""\xb8""\xa2""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\xa5""\xe0""\xb9""\x89""\xe0""\xb8""\xb2""\xe0""\xb8""\x87""\xe0""\xb8""\x9c""\xe0""\xb8""\xa5""\xe0""\xb8""\xb2""\xe0""\xb8""\x8d""\xe0""\xb8""\xa4""\xe0""\xb9""\x85""\xe0""\xb9""\x80""\xe0""\xb8""\x82""\xe0""\xb9""\x88""\xe0""\xb8""\x99""\xe0""\xb8""\x86""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9a""\xe0""\xb8""\xb5""\xe0""\xb8""\x91""\xe0""\xb8""\xb2""\xe0""\xb9""\x83""\xe0""\xb8""\x84""\xe0""\xb8""\xa3"" - \xe0""\xb9""\x84""\xe0""\xb8""\xa1""\xe0""\xb9""\x88""\xe0""\xb8""\x96""\xe0""\xb8""\xb7""\xe0""\xb8""\xad""\xe0""\xb9""\x82""\xe0""\xb8""\x97""\xe0""\xb8""\xa9""\xe0""\xb9""\x82""\xe0""\xb8""\x81""\xe0""\xb8""\xa3""\xe0""\xb8""\x98""\xe0""\xb9""\x81""\xe0""\xb8""\x8a""\xe0""\xb9""\x88""\xe0""\xb8""\x87""\xe0""\xb8""\x8b""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\xae""\xe0""\xb8""\xb6""\xe0""\xb8""\x94""\xe0""\xb8""\xae""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\x94""\xe0""\xb9""\x88""\xe0""\xb8""\xb2"" - \xe0""\xb8""\xab""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\xad""\xe0""\xb8""\xa0""\xe0""\xb8""\xb1""\xe0""\xb8""\xa2""\xe0""\xb9""\x80""\xe0""\xb8""\xab""\xe0""\xb8""\xa1""\xe0""\xb8""\xb7""\xe0""\xb8""\xad""\xe0""\xb8""\x99""\xe0""\xb8""\x81""\xe0""\xb8""\xb5""\xe0""\xb8""\xac""\xe0""\xb8""\xb2""\xe0""\xb8""\xad""\xe0""\xb8""\xb1""\xe0""\xb8""\x8a""\xe0""\xb8""\x8c""\xe0""\xb8""\xb2""\xe0""\xb8""\xaa""\xe0""\xb8""\xb1""\xe0""\xb8""\xa2"" - \xe0""\xb8""\x9b""\xe0""\xb8""\x8f""\xe0""\xb8""\xb4""\xe0""\xb8""\x9a""\xe0""\xb8""\xb1""\xe0""\xb8""\x95""\xe0""\xb8""\xb4""\xe0""\xb8""\x9b""\xe0""\xb8""\xa3""\xe0""\xb8""\xb0""\xe0""\xb8""\x9e""\xe0""\xb8""\xa4""\xe0""\xb8""\x95""\xe0""\xb8""\xb4""\xe0""\xb8""\x81""\xe0""\xb8""\x8e""\xe0""\xb8""\x81""\xe0""\xb8""\xb3""\xe0""\xb8""\xab""\xe0""\xb8""\x99""\xe0""\xb8""\x94""\xe0""\xb9""\x83""\xe0""\xb8""\x88"" - \xe0""\xb8""\x9e""\xe0""\xb8""\xb9""\xe0""\xb8""\x94""\xe0""\xb8""\x88""\xe0""\xb8""\xb2""\xe0""\xb9""\x83""\xe0""\xb8""\xab""\xe0""\xb9""\x89""\xe0""\xb8""\x88""\xe0""\xb9""\x8a""\xe0""\xb8""\xb0"" \xe0""\xb9""\x86"" \xe0""\xb8""\x88""\xe0""\xb9""\x8b""\xe0""\xb8""\xb2"" \xe0""\xb9""\x86"" \xe0""\xb8""\x99""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9f""\xe0""\xb8""\xb1""\xe0""\xb8""\x87""\xe0""\xb9""\x80""\xe0""\xb8""\xad""\xe0""\xb8""\xa2""\xe0""\xb8""\xaf"""
- /* Being a man is worthy - Beyond senseless animal - Begin educate thyself - Begone from killing and trouble - Bear not thy grudge, damn and, curse - Bestow forgiving and sporting - Befit with rules - Benign speech speak thou */
- )
- LANGUAGE(
-@@ -520,25 +520,25 @@
- LANGUAGE(
- tr /* Turkish */,
- WP-PANG,
-- "Pijamalı hasta yağız şoföre çabucak güvendi."
-+ "Pijamal\xc4""\xb1"" hasta ya\xc4""\x9f""\xc4""\xb1""z \xc5""\x9f""of\xc3""\xb6""re \xc3""\xa7""abucak g\xc3""\xbc""vendi."
- /* The patient in pajamas trusted the swarthy driver quickly. */
- )
- LANGUAGE(
- tw /* Twi */,
- GLASS,
-- "Metumi awe tumpan, ɜnyɜ me hwee."
-+ "Metumi awe tumpan, \xc9""\x9c""ny\xc9""\x9c"" me hwee."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- uk /* Ukrainian */,
- WP-PANG,
-- "Чуєш їх, доцю, га? Кумедна ж ти, прощайся без ґольфів!"
-+ "\xd0""\xa7""\xd1""\x83""\xd1""\x94""\xd1""\x88"" \xd1""\x97""\xd1""\x85"", \xd0""\xb4""\xd0""\xbe""\xd1""\x86""\xd1""\x8e"", \xd0""\xb3""\xd0""\xb0""? \xd0""\x9a""\xd1""\x83""\xd0""\xbc""\xd0""\xb5""\xd0""\xb4""\xd0""\xbd""\xd0""\xb0"" \xd0""\xb6"" \xd1""\x82""\xd0""\xb8"", \xd0""\xbf""\xd1""\x80""\xd0""\xbe""\xd1""\x89""\xd0""\xb0""\xd0""\xb9""\xd1""\x81""\xd1""\x8f"" \xd0""\xb1""\xd0""\xb5""\xd0""\xb7"" \xd2""\x91""\xd0""\xbe""\xd0""\xbb""\xd1""\x8c""\xd1""\x84""\xd1""\x96""\xd0""\xb2""!"
- /* Daughter, do you hear them, eh? Oh, you are funny! Say good-bye without knee-length socks. */
- )
- LANGUAGE(
- ur /* Urdu */,
- GLASS,
-- "میں کانچ کھا سکتا ہوں اور مجھے تکلیف نہیں ہوتی ۔"
-+ "\xd9""\x85""\xdb""\x8c""\xda""\xba"" \xda""\xa9""\xd8""\xa7""\xd9""\x86""\xda""\x86"" \xda""\xa9""\xda""\xbe""\xd8""\xa7"" \xd8""\xb3""\xda""\xa9""\xd8""\xaa""\xd8""\xa7"" \xdb""\x81""\xd9""\x88""\xda""\xba"" \xd8""\xa7""\xd9""\x88""\xd8""\xb1"" \xd9""\x85""\xd8""\xac""\xda""\xbe""\xdb""\x92"" \xd8""\xaa""\xda""\xa9""\xd9""\x84""\xdb""\x8c""\xd9""\x81"" \xd9""\x86""\xdb""\x81""\xdb""\x8c""\xda""\xba"" \xdb""\x81""\xd9""\x88""\xd8""\xaa""\xdb""\x8c"" \xdb""\x94"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
-@@ -550,48 +550,48 @@
- LANGUAGE(
- vi /* Vietnamese */,
- GSPECI,
-- "Con sói nâu nhảy qua con chó lười."
-+ "Con s\xc3""\xb3""i n\xc3""\xa2""u nh\xe1""\xba""\xa3""y qua con ch\xc3""\xb3"" l\xc6""\xb0""\xe1""\xbb""\x9d""i."
- )
- LANGUAGE(
- wa /* Walloon */,
- GLASS,
-- "Dji pou magnî do vêre, çoula m' freut nén må."
-+ "Dji pou magn\xc3""\xae"" do v\xc3""\xaa""re, \xc3""\xa7""oula m' freut n\xc3""\xa9""n m\xc3""\xa5""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- yi /* Yiddish */,
- GLASS,
-- "איך קען עסן גלאָז און עס טוט מיר נישט װײ."
-+ "\xd7""\x90""\xd7""\x99""\xd7""\x9a"" \xd7""\xa7""\xd7""\xa2""\xd7""\x9f"" \xd7""\xa2""\xd7""\xa1""\xd7""\x9f"" \xd7""\x92""\xd7""\x9c""\xd7""\x90""\xd6""\xb8""\xd7""\x96"" \xd7""\x90""\xd7""\x95""\xd7""\x9f"" \xd7""\xa2""\xd7""\xa1"" \xd7""\x98""\xd7""\x95""\xd7""\x98"" \xd7""\x9e""\xd7""\x99""\xd7""\xa8"" \xd7""\xa0""\xd7""\x99""\xd7""\xa9""\xd7""\x98"" \xd7""\xb0""\xd7""\xb2""."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- yo /* Yoruba */,
- GLASS,
-- "Mo lè je̩ dígí, kò ní pa mí lára."
-+ "Mo l\xc3""\xa8"" je\xcc""\xa9"" d\xc3""\xad""g\xc3""\xad"", k\xc3""\xb2"" n\xc3""\xad"" pa m\xc3""\xad"" l\xc3""\xa1""ra."
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- zh-cn /* Chinese Simplified */,
- GLASS,
-- "我能吞下玻璃而不伤身体。"
-+ "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe4""\xbc""\xa4""\xe8""\xba""\xab""\xe4""\xbd""\x93""\xe3""\x80""\x82"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- zh-mo /* Chinese Traditional */,
- GLASS,
-- "我能吞下玻璃而不傷身體。"
-+ "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe5""\x82""\xb7""\xe8""\xba""\xab""\xe9""\xab""\x94""\xe3""\x80""\x82"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- zh-sg /* Chinese Simplified */,
- GLASS,
-- "我能吞下玻璃而不伤身体。"
-+ "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe4""\xbc""\xa4""\xe8""\xba""\xab""\xe4""\xbd""\x93""\xe3""\x80""\x82"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
- zh-tw /* Chinese Traditional */,
- GLASS,
-- "我能吞下玻璃而不傷身體。"
-+ "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe5""\x82""\xb7""\xe8""\xba""\xab""\xe9""\xab""\x94""\xe3""\x80""\x82"""
- /* I can eat glass and it doesn't hurt me. */
- )
- LANGUAGE(
diff --git a/pango/pango-1.28.3-win32.patch b/pango/pango-1.28.3-win32.patch
deleted file mode 100644
index b938accb2899..000000000000
--- a/pango/pango-1.28.3-win32.patch
+++ /dev/null
@@ -1,649 +0,0 @@
---- misc/pango-1.28.3/configure 2010-09-29 13:02:33.000000000 +0200
-+++ misc/build/pango-1.28.3/configure 2011-03-26 06:09:01.021181200 +0100
-@@ -18596,16 +18596,16 @@
- fi
-
- if $have_atsui; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-+# if test -n "$PKG_CONFIG" && \
-+# { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-+# ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-+# ac_status=$?
-+# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+# test $ac_status = 0; }; then
- have_cairo_atsui=true
--else
-- :
--fi
-+#else
-+# :
-+#fi
- fi
- if $have_cairo_atsui; then
-
-@@ -18859,7 +18859,7 @@
-
- # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--
-+GLIB_MKENUMS=glib-mkenums
-
-
- # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
---- misc/pango-1.28.3/pango/makefile.msc 2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/makefile.msc 2011-03-26 15:41:45.375966400 +0100
-@@ -1,5 +1,15 @@
--TOP = ../..
--!INCLUDE $(TOP)/glib/build/win32/make.msc
-+PRJ_TOP = ..
-+GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
-+CAIRO_INC = -I$(OUTDIR)\inc\external\cairo
-+
-+INTL_LIB = $(OUTDIR)\lib\intl.lib
-+GLIB_LIB = $(OUTDIR)\lib\glib-2.0.lib \
-+ $(OUTDIR)\lib\gobject-2.0.lib \
-+ $(OUTDIR)\lib\gmodule-2.0.lib
-+CAIRO_LIB = $(OUTDIR)\lib\cairo.lib
-+USP10_LIB = USP10.lib
-+
-+!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc
-
- !IFNDEF PERL
- PERL = perl
-@@ -16,7 +26,7 @@
-
- !IFNDEF PACKAGE
-
--DLLS = pango pangowin32 pangoft2 pangocairo # pangox
-+DLLS = pango pangowin32 pangocairo # pangox pangoft2
- EXES = querymodules testfonts
- #? test1 test2 test3 test4 test5
-
-@@ -30,7 +30,7 @@
- nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER)s.lib PACKAGE=$(THIS) OBJS_$(THIS)=1
-
- sub-one-dll:
-- nmake -nologo -f makefile.msc lib$(THIS)-$(PANGO_VER)-0.dll PACKAGE=$(THIS) OBJS_$(THIS)=1
-+ nmake -nologo -f makefile.msc $(THIS)lo.dll PACKAGE=$(THIS) OBJS_$(THIS)=1
-
- sub-one-exe:
- nmake -nologo -f makefile.msc $(THIS).exe PACKAGE=$(THIS) OBJS_$(THIS)=1
-@@ -40,28 +50,28 @@
-
- !ELSE
-
--PRJ_TOP = ..
-+CFLAGS = -I. -I$(PRJ_TOP) $(SOLARINC) $(GLIB_INC) $(CAIRO_INC)
-+
- PKG_VER = $(PANGO_VER)
- PKG_DEF = $(PACKAGE).def
--
--PKG_CFLAGS = -FImsvc_recommended_pragmas.h -I.. -I. -I$(PRJ_TOP) \
-+PKG_CFLAGS = -FI$(PRJ_TOP)\msvc_recommended_pragmas.h $(CFLAGS) \
- -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \
- -DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \
- -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
- $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
- $(X11_CFLAGS) -DSYSCONFDIR=\"/etc\" \
-- -DPANGO_BINARY_AGE=0
-+ -DPANGO_BINARY_AGE=0 \
-+ -DLIBDIR=\".\\\\\"
-
- #-DHAVE_USP10_H
--
-
- !IFDEF OBJS_pango
- # don't link with itself
--PKG_LINK = $(GLIB_LIBS) $(FONTCONFIG_LIBS)
-+PKG_LINK = $(GLIB_LIB)
- !ENDIF
-
- !IFDEF OBJS_pangowin32
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) $(USP10_LIB) \
- pango-$(PANGO_VER).lib
- !ENDIF
-
-@@ -69,23 +79,24 @@
- PKG_CFLAGS = $(PKG_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) \
- -DPANGO_MODULE_PREFIX=_pango_basic_ft2
-
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
- pango-$(PANGO_VER).lib opentype\pango-ot.lib
- !ENDIF
-
- !IFDEF OBJS_pangox
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
- pango-$(PANGO_VER).lib $(X11_LIBS)
- !ENDIF
-
- !IFDEF OBJS_pangocairo
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-- pango-$(PANGO_VER).lib $(CAIRO_LIBS) \
-- pangowin32-$(PANGO_VER).lib $(FONTCONFIG_LIBS)
-+PKG_CFLAGS = $(PKG_CFLAGS)
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
-+ pango-$(PANGO_VER).lib $(CAIRO_LIB) \
-+ pangowin32-$(PANGO_VER).lib
- !ENDIF
-
- !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts)
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
- pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib
- !ENDIF
-
-@@ -99,9 +110,10 @@
- ellipsize.obj \
- fonts.obj \
- glyphstring.obj \
-- mapping.obj \
-+# mapping.obj \
- modules.obj \
- pango-attributes.obj \
-+ pango-bidi-type.obj \
- pango-engine.obj \
- pango-color.obj \
- pango-context.obj \
-@@ -121,7 +133,6 @@
- pango-utils.obj \
- reorder-items.obj \
- shape.obj \
-- \
- fribidi.obj \
- fribidi_types.obj \
- fribidi_char_type.obj
-@@ -215,15 +226,6 @@
- OBJECTS = $(PACKAGE).obj
- !ENDIF
-
--module-defs-win32.c : module-defs-win32.c.win32
-- copy module-defs-win32.c.win32 module-defs-win32.c
--
--module-defs-fc.c : module-defs-fc.c.win32
-- copy module-defs-fc.c.win32 module-defs-fc.c
--
--module-defs-lang.c : module-defs-lang.c.win32
-- copy module-defs-lang.c.win32 module-defs-lang.c
--
- pango_headers= \
- pango.h \
- pango-attributes.h \
-@@ -249,7 +251,7 @@
- pangofc-fontmap.h
-
- pango-enum-types.h: $(pango_headers) makefile.msc
-- $(PERL) $(GLIB)\gobject\glib-mkenums \
-+ perl $(OUTDIR)\bin\glib-mkenums \
- --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-@@ -257,7 +259,7 @@
- $(pango_headers) > pango-enum-types.h
-
- pango-enum-types.c: $(pango_headers) pango-enum-types.h makefile.msc
-- $(PERL) $(GLIB)\gobject\glib-mkenums \
-+ perl $(OUTDIR)\bin\glib-mkenums \
- --fhead "#include <pango.h>" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
-@@ -275,22 +277,13 @@
- $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h
- lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS)
-
--lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h
-+$(PACKAGE)lo.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h
- $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) \
- user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PKG_DEF)
-
- $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS)
- $(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) gdi32.lib user32.lib
-
--$(PRJ_TOP)\config.h.win32 : makefile.msc
-- echo /*almostempty*/ > $(PRJ_TOP)\config.h.win32
-- echo #define PANGO_BINARY_AGE 0 >> $(PRJ_TOP)\config.h.win32
-- echo #define DHAVE_USP10_H 1 >> $(PRJ_TOP)\config.h.win32
--
--$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
-- copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
--
--
- .c.obj :
- $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
-
---- misc/pango-1.28.3/pango/module-defs-win32.c 2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/module-defs-win32.c 2011-03-26 08:57:53.088370000 +0100
-@@ -1,7 +1,25 @@
--/* Autogenerated by configure. Do not edit */
-+/* Hand-written, for builds using Microsoft's compiler and makefile.msc,
-+ * where the configure mechanism isn't used.
-+ */
-
--#include "module-defs.h"
-+#include "modules.h"
-+
-+#ifdef PANGO_MODULE_PREFIX
-+void _pango_basic_win32_script_engine_list (PangoEngineInfo **engines,
-+ gint *n_engines);
-+void _pango_basic_win32_script_engine_init (GTypeModule *module);
-+void _pango_basic_win32_script_engine_exit (void);
-+PangoEngine *_pango_basic_win32_script_engine_create (const char *id);
-+#endif
-
- PangoIncludedModule _pango_included_win32_modules[] = {
-- { NULL, NULL, NULL, NULL },
-+#ifdef PANGO_MODULE_PREFIX
-+ {
-+ _pango_basic_win32_script_engine_list,
-+ _pango_basic_win32_script_engine_init,
-+ _pango_basic_win32_script_engine_exit,
-+ _pango_basic_win32_script_engine_create
-+ },
-+#endif
-+ { NULL, NULL, NULL },
- };
---- misc/pango-1.28.3/pango/pango-enum-types.c 2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-enum-types.c 2011-03-26 15:41:51.313542400 +0100
-@@ -35,7 +35,7 @@
- { PANGO_ATTR_GRAVITY_HINT, "PANGO_ATTR_GRAVITY_HINT", "gravity-hint" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoAttrType"), values);
-+ etype = g_enum_register_static ("PangoAttrType", values);
- }
- return etype;
- }
-@@ -52,59 +52,7 @@
- { PANGO_UNDERLINE_ERROR, "PANGO_UNDERLINE_ERROR", "error" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoUnderline"), values);
-- }
-- return etype;
--}
--
--/* enumerations from "pango-bidi-type.h" */
--GType
--pango_bidi_type_get_type (void)
--{
-- static GType etype = 0;
-- if (etype == 0) {
-- static const GEnumValue values[] = {
-- { PANGO_BIDI_TYPE_L, "PANGO_BIDI_TYPE_L", "l" },
-- { PANGO_BIDI_TYPE_LRE, "PANGO_BIDI_TYPE_LRE", "lre" },
-- { PANGO_BIDI_TYPE_LRO, "PANGO_BIDI_TYPE_LRO", "lro" },
-- { PANGO_BIDI_TYPE_R, "PANGO_BIDI_TYPE_R", "r" },
-- { PANGO_BIDI_TYPE_AL, "PANGO_BIDI_TYPE_AL", "al" },
-- { PANGO_BIDI_TYPE_RLE, "PANGO_BIDI_TYPE_RLE", "rle" },
-- { PANGO_BIDI_TYPE_RLO, "PANGO_BIDI_TYPE_RLO", "rlo" },
-- { PANGO_BIDI_TYPE_PDF, "PANGO_BIDI_TYPE_PDF", "pdf" },
-- { PANGO_BIDI_TYPE_EN, "PANGO_BIDI_TYPE_EN", "en" },
-- { PANGO_BIDI_TYPE_ES, "PANGO_BIDI_TYPE_ES", "es" },
-- { PANGO_BIDI_TYPE_ET, "PANGO_BIDI_TYPE_ET", "et" },
-- { PANGO_BIDI_TYPE_AN, "PANGO_BIDI_TYPE_AN", "an" },
-- { PANGO_BIDI_TYPE_CS, "PANGO_BIDI_TYPE_CS", "cs" },
-- { PANGO_BIDI_TYPE_NSM, "PANGO_BIDI_TYPE_NSM", "nsm" },
-- { PANGO_BIDI_TYPE_BN, "PANGO_BIDI_TYPE_BN", "bn" },
-- { PANGO_BIDI_TYPE_B, "PANGO_BIDI_TYPE_B", "b" },
-- { PANGO_BIDI_TYPE_S, "PANGO_BIDI_TYPE_S", "s" },
-- { PANGO_BIDI_TYPE_WS, "PANGO_BIDI_TYPE_WS", "ws" },
-- { PANGO_BIDI_TYPE_ON, "PANGO_BIDI_TYPE_ON", "on" },
-- { 0, NULL, NULL }
-- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoBidiType"), values);
-- }
-- return etype;
--}
--GType
--pango_direction_get_type (void)
--{
-- static GType etype = 0;
-- if (etype == 0) {
-- static const GEnumValue values[] = {
-- { PANGO_DIRECTION_LTR, "PANGO_DIRECTION_LTR", "ltr" },
-- { PANGO_DIRECTION_RTL, "PANGO_DIRECTION_RTL", "rtl" },
-- { PANGO_DIRECTION_TTB_LTR, "PANGO_DIRECTION_TTB_LTR", "ttb-ltr" },
-- { PANGO_DIRECTION_TTB_RTL, "PANGO_DIRECTION_TTB_RTL", "ttb-rtl" },
-- { PANGO_DIRECTION_WEAK_LTR, "PANGO_DIRECTION_WEAK_LTR", "weak-ltr" },
-- { PANGO_DIRECTION_WEAK_RTL, "PANGO_DIRECTION_WEAK_RTL", "weak-rtl" },
-- { PANGO_DIRECTION_NEUTRAL, "PANGO_DIRECTION_NEUTRAL", "neutral" },
-- { 0, NULL, NULL }
-- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoDirection"), values);
-+ etype = g_enum_register_static ("PangoUnderline", values);
- }
- return etype;
- }
-@@ -122,7 +70,7 @@
- { PANGO_COVERAGE_EXACT, "PANGO_COVERAGE_EXACT", "exact" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoCoverageLevel"), values);
-+ etype = g_enum_register_static ("PangoCoverageLevel", values);
- }
- return etype;
- }
-@@ -139,7 +87,7 @@
- { PANGO_STYLE_ITALIC, "PANGO_STYLE_ITALIC", "italic" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoStyle"), values);
-+ etype = g_enum_register_static ("PangoStyle", values);
- }
- return etype;
- }
-@@ -153,7 +101,7 @@
- { PANGO_VARIANT_SMALL_CAPS, "PANGO_VARIANT_SMALL_CAPS", "small-caps" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoVariant"), values);
-+ etype = g_enum_register_static ("PangoVariant", values);
- }
- return etype;
- }
-@@ -176,7 +124,7 @@
- { PANGO_WEIGHT_ULTRAHEAVY, "PANGO_WEIGHT_ULTRAHEAVY", "ultraheavy" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoWeight"), values);
-+ etype = g_enum_register_static ("PangoWeight", values);
- }
- return etype;
- }
-@@ -197,7 +145,7 @@
- { PANGO_STRETCH_ULTRA_EXPANDED, "PANGO_STRETCH_ULTRA_EXPANDED", "ultra-expanded" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoStretch"), values);
-+ etype = g_enum_register_static ("PangoStretch", values);
- }
- return etype;
- }
-@@ -216,7 +164,7 @@
- { PANGO_FONT_MASK_GRAVITY, "PANGO_FONT_MASK_GRAVITY", "gravity" },
- { 0, NULL, NULL }
- };
-- etype = g_flags_register_static (g_intern_static_string ("PangoFontMask"), values);
-+ etype = g_flags_register_static ("PangoFontMask", values);
- }
- return etype;
- }
-@@ -235,7 +183,7 @@
- { PANGO_GRAVITY_AUTO, "PANGO_GRAVITY_AUTO", "auto" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoGravity"), values);
-+ etype = g_enum_register_static ("PangoGravity", values);
- }
- return etype;
- }
-@@ -250,7 +198,7 @@
- { PANGO_GRAVITY_HINT_LINE, "PANGO_GRAVITY_HINT_LINE", "line" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoGravityHint"), values);
-+ etype = g_enum_register_static ("PangoGravityHint", values);
- }
- return etype;
- }
-@@ -267,7 +215,7 @@
- { PANGO_ALIGN_RIGHT, "PANGO_ALIGN_RIGHT", "right" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoAlignment"), values);
-+ etype = g_enum_register_static ("PangoAlignment", values);
- }
- return etype;
- }
-@@ -282,7 +230,7 @@
- { PANGO_WRAP_WORD_CHAR, "PANGO_WRAP_WORD_CHAR", "word-char" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoWrapMode"), values);
-+ etype = g_enum_register_static ("PangoWrapMode", values);
- }
- return etype;
- }
-@@ -298,7 +246,7 @@
- { PANGO_ELLIPSIZE_END, "PANGO_ELLIPSIZE_END", "end" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoEllipsizeMode"), values);
-+ etype = g_enum_register_static ("PangoEllipsizeMode", values);
- }
- return etype;
- }
-@@ -316,7 +264,7 @@
- { PANGO_RENDER_PART_STRIKETHROUGH, "PANGO_RENDER_PART_STRIKETHROUGH", "strikethrough" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoRenderPart"), values);
-+ etype = g_enum_register_static ("PangoRenderPart", values);
- }
- return etype;
- }
-@@ -409,7 +357,7 @@
- { PANGO_SCRIPT_LYDIAN, "PANGO_SCRIPT_LYDIAN", "lydian" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoScript"), values);
-+ etype = g_enum_register_static ("PangoScript", values);
- }
- return etype;
- }
-@@ -424,7 +372,7 @@
- { PANGO_TAB_LEFT, "PANGO_TAB_LEFT", "left" },
- { 0, NULL, NULL }
- };
-- etype = g_enum_register_static (g_intern_static_string ("PangoTabAlign"), values);
-+ etype = g_enum_register_static ("PangoTabAlign", values);
- }
- return etype;
- }
---- misc/pango-1.28.3/pango/pango-enum-types.h 2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-enum-types.h 2011-03-26 15:41:50.922912400 +0100
-@@ -12,11 +12,6 @@
- #define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
- GType pango_underline_get_type (void);
- #define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
--/* enumerations from "pango-bidi-type.h" */
--GType pango_bidi_type_get_type (void);
--#define PANGO_TYPE_BIDI_TYPE (pango_bidi_type_get_type())
--GType pango_direction_get_type (void);
--#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
- /* enumerations from "pango-coverage.h" */
- GType pango_coverage_level_get_type (void);
- #define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
-@@ -53,7 +48,6 @@
- GType pango_tab_align_get_type (void);
- #define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
- G_END_DECLS
--
- #endif /* __PANGO_ENUM_TYPES_H__ */
-
-
---- misc/pango-1.28.3/pango/pango-language.c 2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/pango-language.c 2011-03-26 10:25:32.858819200 +0100
-@@ -169,7 +169,6 @@
- static gchar *
- _pango_get_lc_ctype (void)
- {
--#ifdef G_OS_WIN32
- /* Somebody might try to set the locale for this process using the
- * LANG or LC_ environment variables. The Microsoft C library
- * doesn't know anything about them. You set the locale in the
-@@ -196,9 +195,6 @@
- return g_strdup (p);
-
- return g_win32_getlocale ();
--#else
-- return g_strdup (setlocale (LC_CTYPE, NULL));
--#endif
- }
-
- /**
---- misc/pango-1.28.3/pango/pango-utils.c 2010-09-29 12:39:16.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-utils.c 2011-03-26 11:07:49.125658000 +0100
-@@ -38,15 +38,11 @@
- # define getc_unlocked(f) getc(f)
- #endif /* !HAVE_FLOCKFILE */
-
--#ifdef G_OS_WIN32
--
- #include <sys/types.h>
-
- #define STRICT
- #include <windows.h>
-
--#endif
--
- struct PangoAlias
- {
- char *alias;
-@@ -204,25 +200,6 @@
-
- continue;
- }
--#ifndef G_OS_WIN32
-- /* '~' is a quite normal and common character in file names on
-- * Windows, especially in the 8.3 versions of long file names, which
-- * still occur now and then. Also, few Windows user are aware of the
-- * Unix shell convention that '~' stands for the home directory,
-- * even if they happen to have a home directory.
-- */
-- if (file[0] == '~' && file[1] == G_DIR_SEPARATOR)
-- {
-- char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL);
-- g_free (file);
-- file = tmp;
-- }
-- else if (file[0] == '~' && file[1] == '\0')
-- {
-- g_free (file);
-- file = g_strdup (g_get_home_dir());
-- }
--#endif
- g_free (files[i]);
- files[i] = file;
-
-@@ -655,8 +632,6 @@
- return g_strdup (g_hash_table_lookup (config_hash, key));
- }
-
--#ifdef G_OS_WIN32
--
- /* DllMain function needed to tuck away the DLL handle */
-
- static HMODULE pango_dll;
-@@ -676,8 +651,6 @@
- return TRUE;
- }
-
--#endif
--
- /**
- * pango_get_sysconf_subdirectory:
- *
-@@ -692,7 +665,6 @@
- G_CONST_RETURN char *
- pango_get_sysconf_subdirectory (void)
- {
--#ifdef G_OS_WIN32
- static gchar *result = NULL;
-
- if (result == NULL)
-@@ -702,9 +674,6 @@
- g_free (root);
- }
- return result;
--#else
-- return SYSCONFDIR "/pango";
--#endif
- }
-
- /**
-@@ -721,7 +690,6 @@
- G_CONST_RETURN char *
- pango_get_lib_subdirectory (void)
- {
--#ifdef G_OS_WIN32
- static gchar *result = NULL;
-
- if (result == NULL)
-@@ -737,9 +705,6 @@
- g_free (root);
- }
- return result;
--#else
-- return LIBDIR "/pango";
--#endif
- }
-
-
---- misc/pango-1.28.3/pango/pango.def 2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/pango.def 2011-03-26 11:10:51.284239600 +0100
-@@ -49,7 +49,6 @@
- pango_attribute_destroy
- pango_attribute_equal
- pango_bidi_type_for_unichar
-- pango_bidi_type_get_type
- pango_break
- pango_color_copy
- pango_color_free
-@@ -89,7 +88,6 @@
- pango_coverage_to_bytes
- pango_coverage_unref
- pango_default_break
-- pango_direction_get_type
- pango_ellipsize_mode_get_type
- pango_engine_get_type
- pango_engine_lang_get_type
---- misc/pango-1.28.3/config.h 2011-03-26 08:43:30.577330000 +0100
-+++ misc/build/pango-1.28.3/config.h 2011-03-26 08:42:01.216811200 +0100
-@@ -1 +1,3 @@
--dummy
-+/*almostempty*/
-+#define PANGO_BINARY_AGE 0
-+#define DHAVE_USP10_H 1
---- misc/pango-1.28.3/msvc_recommended_pragmas.h 2011-03-26 07:30:07.692848800 +0100
-+++ misc/build/pango-1.28.3/msvc_recommended_pragmas.h 2011-03-26 07:34:43.524504400 +0100
-@@ -1 +1,31 @@
--dummy
-+#ifndef _MSC_VER
-+#pragma error "This header is for Microsoft VC only."
-+#endif /* _MSC_VER */
-+
-+/* Make MSVC more pedantic, this is a recommended pragma list
-+ * from _Win32_Programming_ by Rector and Newcomer.
-+ */
-+#pragma warning(error:4002) /* too many actual parameters for macro */
-+#pragma warning(error:4003) /* not enough actual parameters for macro */
-+#pragma warning(1:4010) /* single-line comment contains line-continuation character */
-+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-+#pragma warning(1:4016) /* no function return type; using int as default */
-+#pragma warning(error:4020) /* too many actual parameters */
-+#pragma warning(error:4021) /* too few actual parameters */
-+#pragma warning(error:4027) /* function declared without formal parameter list */
-+#pragma warning(error:4029) /* declared formal parameter list different from definition */
-+#pragma warning(error:4033) /* 'function' must return a value */
-+#pragma warning(error:4035) /* 'function' : no return value */
-+#pragma warning(error:4045) /* array bounds overflow */
-+#pragma warning(error:4047) /* different levels of indirection */
-+#pragma warning(error:4049) /* terminating line number emission */
-+#pragma warning(error:4053) /* An expression of type void was used as an operand */
-+#pragma warning(error:4071) /* no function prototype given */
-+#pragma warning(disable:4101) /* unreferenced local variable */
-+#pragma warning(error:4150)
-+
-+#pragma warning(disable:4244) /* No possible loss of data warnings */
-+#pragma warning(disable:4305) /* No truncation from int to char warnings */
-+
-+/* work around Microsoft's premature attempt to deprecate the C-Library */
-+#pragma warning(disable:4996) /* This function or variable may be unsafe. */
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
deleted file mode 100644
index 539bef79a035..000000000000
--- a/pango/pango-1.28.3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- misc/pango-1.28.3/configure 2010-09-29 13:02:33.000000000 +0200
-+++ misc/build/pango-1.28.3/configure 2011-03-01 17:56:26.000000000 +0100
-@@ -17980,8 +17980,6 @@
-
-
- if test x$no_x = xyes ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5
--$as_echo "$as_me: WARNING: X development libraries not found" >&2;}
- have_x=false
- else
- X_LIBS="$X_LIBS -lX11"
-@@ -18596,16 +18594,16 @@
- fi
-
- if $have_atsui; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-+# if test -n "$PKG_CONFIG" && \
-+# { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-+# ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-+# ac_status=$?
-+# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+# test $ac_status = 0; }; then
- have_cairo_atsui=true
--else
-- :
--fi
-+#else
-+# :
-+#fi
- fi
- if $have_cairo_atsui; then
-
-@@ -18858,20 +18856,20 @@
- fi
-
- # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
--GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--
-+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+GLIB_MKENUMS=glib-mkenums
-
-
- # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
- # necesary defines for thread-safety.
--GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
-+#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
-
- # See if it's safe to turn G_DISABLE_DEPRECATED on.
--GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
--GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
--if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-+#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-+#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
-+#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
- GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
--fi
-+#fi
-
- #
- # Checks for LibThai
---- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
-+++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
-@@ -27,6 +27,12 @@
- #include "pango-impl-utils.h"
- #include "modules.h"
-
-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+@class CALayer;
-+@class NSViewController;
-+typedef int NSColorRenderingIntent;
-+#endif
-+
- #import <Cocoa/Cocoa.h>
-
- typedef struct _FontHashKey FontHashKey;
---- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
-+++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
-@@ -22,6 +22,12 @@
-
- #include "config.h"
-
-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+@class CALayer;
-+@class NSViewController;
-+typedef int NSColorRenderingIntent;
-+#endif
-+
- #import <Cocoa/Cocoa.h>
-
- #include "pango-impl-utils.h"
diff --git a/pango/prj/build.lst b/pango/prj/build.lst
deleted file mode 100644
index 52aac94dbd20..000000000000
--- a/pango/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-pg pango : GETTEXT:gettext GLIB:glib soltools CAIRO:cairo NULL
-pg pango usr1 - all pg_mkout NULL
-pg pango nmake - all pg_pango NULL
diff --git a/pango/prj/d.lst b/pango/prj/d.lst
deleted file mode 100644
index 2597aa37e623..000000000000
--- a/pango/prj/d.lst
+++ /dev/null
@@ -1,44 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\pango-1.0
-mkdir: %_DEST%\inc\external\pango-1.0\pango
-
-..\%__SRC%\inc\pango.h %_DEST%\inc\external\pango-1.0\pango\pango.h
-..\%__SRC%\inc\pangocairo.h %_DEST%\inc\external\pango-1.0\pango\pangocairo.h
-..\%__SRC%\inc\pangoatsui.h %_DEST%\inc\external\pango-1.0\pango\pangoatsui.h
-..\%__SRC%\inc\pango-attributes.h %_DEST%\inc\external\pango-1.0\pango\pango-attributes.h
-..\%__SRC%\inc\pango-bidi-type.h %_DEST%\inc\external\pango-1.0\pango\pango-bidi-type.h
-..\%__SRC%\inc\pango-break.h %_DEST%\inc\external\pango-1.0\pango\pango-break.h
-..\%__SRC%\inc\pango-context.h %_DEST%\inc\external\pango-1.0\pango\pango-context.h
-..\%__SRC%\inc\pango-coverage.h %_DEST%\inc\external\pango-1.0\pango\pango-coverage.h
-..\%__SRC%\inc\pango-engine.h %_DEST%\inc\external\pango-1.0\pango\pango-engine.h
-..\%__SRC%\inc\pango-enum-types.h %_DEST%\inc\external\pango-1.0\pango\pango-enum-types.h
-..\%__SRC%\inc\pango-features.h %_DEST%\inc\external\pango-1.0\pango\pango-features.h
-..\%__SRC%\inc\pango-font.h %_DEST%\inc\external\pango-1.0\pango\pango-font.h
-..\%__SRC%\inc\pango-fontmap.h %_DEST%\inc\external\pango-1.0\pango\pango-fontmap.h
-..\%__SRC%\inc\pango-fontset.h %_DEST%\inc\external\pango-1.0\pango\pango-fontset.h
-..\%__SRC%\inc\pango-glyph.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph.h
-..\%__SRC%\inc\pango-glyph-item.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph-item.h
-..\%__SRC%\inc\pango-gravity.h %_DEST%\inc\external\pango-1.0\pango\pango-gravity.h
-..\%__SRC%\inc\pango-item.h %_DEST%\inc\external\pango-1.0\pango\pango-item.h
-..\%__SRC%\inc\pango-language.h %_DEST%\inc\external\pango-1.0\pango\pango-language.h
-..\%__SRC%\inc\pango-layout.h %_DEST%\inc\external\pango-1.0\pango\pango-layout.h
-..\%__SRC%\inc\pango-matrix.h %_DEST%\inc\external\pango-1.0\pango\pango-matrix.h
-..\%__SRC%\inc\pango-modules.h %_DEST%\inc\external\pango-1.0\pango\pango-modules.h
-..\%__SRC%\inc\pango-renderer.h %_DEST%\inc\external\pango-1.0\pango\pango-renderer.h
-..\%__SRC%\inc\pango-script.h %_DEST%\inc\external\pango-1.0\pango\pango-script.h
-..\%__SRC%\inc\pango-tabs.h %_DEST%\inc\external\pango-1.0\pango\pango-tabs.h
-..\%__SRC%\inc\pango-types.h %_DEST%\inc\external\pango-1.0\pango\pango-types.h
-..\%__SRC%\inc\pango-utils.h %_DEST%\inc\external\pango-1.0\pango\pango-utils.h
-
-..\%__SRC%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.0.dylib
-symlink: %_DEST%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.dylib
-..\%__SRC%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.0.dylib
-symlink: %_DEST%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.dylib
-
-..\%__SRC%\lib\pango-1.0.lib %_DEST%\lib\pango-1.0.lib
-..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib\pangocairo-1.0.lib
-..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib\pangowin32-1.0.lib
-
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\bin\pango-querymodules %_DEST%\bin\pango-querymodules
-..\%__SRC%\bin\querymodules.exe %_DEST%\bin\pango-querymodules.exe
diff --git a/pango/prj/dmake b/pango/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/pango/prj/dmake
+++ /dev/null
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 04:47:47 +0000