mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade fontconfig to 2.4.2

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1790 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-05-27 21:21:56 +00:00
parent ccbf0edf45
commit c2d22f0f36
7 changed files with 76 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/packages/fontconfig/files/local.conf
View File

@@ -1,12 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/local.conf file for local customizations -->
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
<test qual="all" name="rgba">
<const>unknown</const>
</test>
<edit name="rgba" mode="assign"><const>rgb</const></edit>
</match>
</fontconfig>

8
meta/packages/fontconfig/files/stop-fc-cache.patch
View File

@@ -1,8 +0,0 @@
--- fontconfig-2.2.95/Makefile.am.old 2006-02-07 01:01:01.000000000 +0000
+++ fontconfig-2.2.95/Makefile.am 2006-02-07 01:01:15.000000000 +0000
@@ -50,4 +50,4 @@
echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
$(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
fi; fi; fi
- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+# if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi

19
meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch vendored
View File

@@ -1,19 +0,0 @@
--- fontconfig/fc-glyphname/Makefile.am~ 2004-04-14 17:06:35.000000000 +0100
+++ fontconfig/fc-glyphname/Makefile.am 2004-05-15 11:41:35.000000000 +0100
@@ -27,6 +27,7 @@
TMPL=fcglyphname.tmpl.h
STMPL=${top_srcdir}/fc-glyphname/${TMPL}
TARG=fcglyphname.h
+FC_GLYPHNAME=./fc-glyphname
noinst_PROGRAMS=fc-glyphname
@@ -41,7 +42,7 @@
$(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME)
rm -f $(TARG)
- ./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG)
+ $(FC_GLYPHNAME) $(SGLYPHNAME) < $(STMPL) > $(TARG)
CLEANFILES=$(TARG)

18
meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch vendored
View File

@@ -1,18 +0,0 @@
--- fontconfig/fc-lang/Makefile.am~ 2004-04-14 17:06:36.000000000 +0100
+++ fontconfig/fc-lang/Makefile.am 2004-05-15 11:22:44.000000000 +0100
@@ -27,6 +27,7 @@
TMPL=fclang.tmpl.h
STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
TARG=fclang.h
+FC_LANG=./fc-lang
noinst_PROGRAMS=fc-lang
@@ -40,6 +41,6 @@
$(TARG):$(ORTH) fc-lang $(STMPL)
rm -f $(TARG)
- ./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
+ $(FC_LANG) -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
CLEANFILES=$(TARG)

3
meta/packages/fontconfig/fontconfig-native_2.2.95.bb → meta/packages/fontconfig/fontconfig-native_2.4.2.bb
View File

@@ -4,10 +4,9 @@ require fontconfig_${PV}.bb
inherit native
DEPENDS = "freetype-native expat-native zlib-native"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
SRC_URI += " file://stop-fc-cache.patch;patch=1"
EXTRA_OEMAKE = ""
EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config"
EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
do_stage () {
oe_runmake install

36
meta/packages/fontconfig/fontconfig_2.2.95.bb
View File

@@ -1,36 +0,0 @@
SECTION = "libs"
LICENSE = "BSD"
DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fc-glyphname.patch;patch=1 \
file://fc-lang.patch;patch=1 \
file://local.conf"
PR = "r2"
PACKAGES =+ "fontconfig-utils "
FILES_fontconfig-utils = "${bindir}/*"
PKG_fontconfig-utils=fontconfig-utils
S = "${WORKDIR}/fontconfig-${PV}"
inherit autotools pkgconfig
export HASDOCBOOK="no"
EXTRA_OECONF = " --disable-docs "
EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
}
do_install () {
autotools_do_install
install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf
}

75
meta/packages/fontconfig/fontconfig_2.4.2.bb Normal file
View File

@@ -0,0 +1,75 @@
SECTION = "libs"
LICENSE = "BSD"
DESCRIPTION = "A library for configuring and customizing font access."
DEPENDS = "expat freetype freetype-native zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
PR = "r0"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
FILES_fontconfig-utils = "${bindir}/*"
# Work around past breakage in debian.bbclass
RPROVIDES_fontconfig-utils = "libfontconfig-utils"
RREPLACES_fontconfig-utils = "libfontconfig-utils"
RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
DEBIAN_NOAUTONAME_fontconfig-utils = "1"
S = "${WORKDIR}/fontconfig-${PV}"
inherit autotools pkgconfig
export HASDOCBOOK="no"
EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
# The tarball has some of the patched files as read only, which
# patch doesn't like at all
fontconfig_do_unpack() {
chmod -R u+rw ${S}
}
python do_unpack () {
bb.build.exec_func('base_do_unpack', d)
bb.build.exec_func('fontconfig_do_unpack', d)
}
do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
}
BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2"
do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
}
do_install () {
autotools_do_install
}