From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/fontconfig/files/local.conf | 12 -------- .../packages/fontconfig/files/stop-fc-cache.patch | 8 ----- .../fontconfig-2.2.95/fc-glyphname.patch | 19 ------------ .../fontconfig/fontconfig-2.2.95/fc-lang.patch | 18 ----------- .../fontconfig/fontconfig-native_2.2.95.bb | 15 --------- .../packages/fontconfig/fontconfig_2.2.95.bb | 36 ---------------------- 6 files changed, 108 deletions(-) delete mode 100644 openembedded/packages/fontconfig/files/local.conf delete mode 100644 openembedded/packages/fontconfig/files/stop-fc-cache.patch delete mode 100644 openembedded/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch delete mode 100644 openembedded/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch delete mode 100644 openembedded/packages/fontconfig/fontconfig-native_2.2.95.bb delete mode 100644 openembedded/packages/fontconfig/fontconfig_2.2.95.bb (limited to 'openembedded/packages/fontconfig') diff --git a/openembedded/packages/fontconfig/files/local.conf b/openembedded/packages/fontconfig/files/local.conf deleted file mode 100644 index ddd7cf9d0..000000000 --- a/openembedded/packages/fontconfig/files/local.conf +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - unknown - - rgb - - diff --git a/openembedded/packages/fontconfig/files/stop-fc-cache.patch b/openembedded/packages/fontconfig/files/stop-fc-cache.patch deleted file mode 100644 index 7b549118f..000000000 --- a/openembedded/packages/fontconfig/files/stop-fc-cache.patch +++ /dev/null @@ -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 diff --git a/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch b/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch deleted file mode 100644 index 1afd9324f..000000000 --- a/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch +++ /dev/null @@ -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) - diff --git a/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch b/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch deleted file mode 100644 index d08242a37..000000000 --- a/openembedded/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch +++ /dev/null @@ -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) diff --git a/openembedded/packages/fontconfig/fontconfig-native_2.2.95.bb b/openembedded/packages/fontconfig/fontconfig-native_2.2.95.bb deleted file mode 100644 index 6872db92f..000000000 --- a/openembedded/packages/fontconfig/fontconfig-native_2.2.95.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "base" -LICENSE = "BSD" -include 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 = "" - -do_stage () { - oe_runmake install - install fc-lang/fc-lang ${STAGING_BINDIR} - install fc-glyphname/fc-glyphname ${STAGING_BINDIR} -} diff --git a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb b/openembedded/packages/fontconfig/fontconfig_2.2.95.bb deleted file mode 100644 index 78b35b179..000000000 --- a/openembedded/packages/fontconfig/fontconfig_2.2.95.bb +++ /dev/null @@ -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://pdx.freedesktop.org/fontconfig/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 -} - -- cgit v1.2.3