pango: revert merge from 3.0

This commit is contained in:
Thomas Penteker 2013-01-25 23:03:51 +01:00
parent 997af03a45
commit 4df037c00a
4 changed files with 81 additions and 39 deletions

View File

@ -5,6 +5,7 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/etc/
drwxr-xr-x root/root usr/etc/pango/
-rw-r--r-- root/root usr/etc/pango/pango.modules
-rw-r--r-- root/root usr/etc/pango/pangox.aliases
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/pango-1.0/
drwxr-xr-x root/root usr/include/pango-1.0/pango/
@ -39,38 +40,62 @@ drwxr-xr-x root/root usr/include/pango-1.0/pango/
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangofc-font.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangofc-fontmap.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoft2.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangox.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft-render.h
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libpango-1.0.la
lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.3200.5
-rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.3000.1
lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.la
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.3200.5
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.3000.1
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.3000.1
-rw-r--r-- root/root usr/lib/libpangoft2-1.0.la
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.3200.5
-rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.3000.1
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.3000.1
-rw-r--r-- root/root usr/lib/libpangox-1.0.la
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.3000.1
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpangox-1.0.so.0.3000.1
-rw-r--r-- root/root usr/lib/libpangoxft-1.0.la
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.3200.5
-rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.3200.5
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.3000.1
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.3000.1
-rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.3000.1
drwxr-xr-x root/root usr/lib/pango/
drwxr-xr-x root/root usr/lib/pango/1.8.0/
drwxr-xr-x root/root usr/lib/pango/1.8.0/modules/
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-arabic-lang.la
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-arabic-lang.so
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-basic-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-basic-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-indic-lang.la
-rwxr-xr-x root/root usr/lib/pango/1.8.0/modules/pango-indic-lang.so
drwxr-xr-x root/root usr/lib/pango/1.6.0/
drwxr-xr-x root/root usr/lib/pango/1.6.0/modules/
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-arabic-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-arabic-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-arabic-lang.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-arabic-lang.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-basic-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-basic-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-basic-x.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-basic-x.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-hangul-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-hangul-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-hebrew-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-indic-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-indic-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-indic-lang.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-indic-lang.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-khmer-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-khmer-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-syriac-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-syriac-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-thai-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-thai-fc.so
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-tibetan-fc.la
-rwxr-xr-x root/root usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/pango.pc
-rw-r--r-- root/root usr/lib/pkgconfig/pangocairo.pc
-rw-r--r-- root/root usr/lib/pkgconfig/pangoft2.pc
-rw-r--r-- root/root usr/lib/pkgconfig/pangox.pc
-rw-r--r-- root/root usr/lib/pkgconfig/pangoxft.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/

View File

@ -1,2 +1,2 @@
8e846804d6e219bc795a26a4a39b5bfd pango-1.32.5.tar.xz
f01f90e6b2e1155fef038d492c6c412a pango.modules
ec3c1f236ee9bd4a982a5f46fcaff7b9 pango-1.30.1.tar.xz
4b00848e60b7eb1dfb2274e59666c1ba pango.modules

View File

@ -1,12 +1,12 @@
# Description: A library for layout and rendering of text
# URL: http://www.gtk.org/
# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: harfbuzz, glib, xorg-libsm, xorg-libxext, xorg-libxft
# Depends on: cairo, glib, xorg-libsm, xorg-libxext, xorg-libxft
name=pango
version=1.32.5
version=1.30.1
release=1
source=(http://download.gnome.org/sources/$name/1.32/$name-$version.tar.xz \
source=(http://download.gnome.org/sources/$name/1.30/$name-$version.tar.xz \
pango.modules)
build () {

View File

@ -1,18 +1,35 @@
# Pango Modules file
# Automatically generated file, do not edit
#
# ModulesPath = /usr/lib/pango/1.8.0/modules
# ModulesPath = /usr/lib/pango/1.6.0/modules
#
/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
/usr/lib/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
/usr/lib/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
/usr/lib/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
/usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
/usr/lib/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
/usr/lib/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
/usr/lib/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
/usr/lib/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
/usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
/usr/lib/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
/usr/lib/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*