From 220163102a13e0ce741b40863e0063c91373ecba Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 23 Jun 2004 18:40:47 +0000 Subject: fix fontconfig and fontconfig-native also upgrade to 2.2.95 based on a patch courtesy Michael Opdenacker - thanks. BKrev: 40d9ceafK-zibWeFvz-H1WcjwAdVMw --- .../fontconfig-2.2.92/freetype-includes.patch | 0 fontconfig/fontconfig-2.2.92/makefile1.patch | 0 fontconfig/fontconfig-2.2.92/makefile2.patch | 0 fontconfig/fontconfig-2.2.94/fc-glyphname.patch | 0 fontconfig/fontconfig-2.2.94/fc-lang.patch | 0 fontconfig/fontconfig-2.2.94/fc-min.patch | 0 fontconfig/fontconfig-2.2.95/fc-glyphname.patch | 0 fontconfig/fontconfig-2.2.95/fc-lang.patch | 0 fontconfig/fontconfig-native_2.2.94.oe | 10 ------ fontconfig/fontconfig-native_2.2.95.oe | 0 fontconfig/fontconfig_2.2.92.oe | 37 ---------------------- fontconfig/fontconfig_2.2.94.oe | 28 ---------------- fontconfig/fontconfig_2.2.95.oe | 0 initscripts/initscripts-1.0/h3600/devices | 1 + 14 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 fontconfig/fontconfig-2.2.92/freetype-includes.patch delete mode 100644 fontconfig/fontconfig-2.2.92/makefile1.patch delete mode 100644 fontconfig/fontconfig-2.2.92/makefile2.patch delete mode 100644 fontconfig/fontconfig-2.2.94/fc-glyphname.patch delete mode 100644 fontconfig/fontconfig-2.2.94/fc-lang.patch delete mode 100644 fontconfig/fontconfig-2.2.94/fc-min.patch create mode 100644 fontconfig/fontconfig-2.2.95/fc-glyphname.patch create mode 100644 fontconfig/fontconfig-2.2.95/fc-lang.patch delete mode 100644 fontconfig/fontconfig-native_2.2.94.oe create mode 100644 fontconfig/fontconfig-native_2.2.95.oe delete mode 100644 fontconfig/fontconfig_2.2.92.oe delete mode 100644 fontconfig/fontconfig_2.2.94.oe create mode 100644 fontconfig/fontconfig_2.2.95.oe diff --git a/fontconfig/fontconfig-2.2.92/freetype-includes.patch b/fontconfig/fontconfig-2.2.92/freetype-includes.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.92/makefile1.patch b/fontconfig/fontconfig-2.2.92/makefile1.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.92/makefile2.patch b/fontconfig/fontconfig-2.2.92/makefile2.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.94/fc-glyphname.patch b/fontconfig/fontconfig-2.2.94/fc-glyphname.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.94/fc-lang.patch b/fontconfig/fontconfig-2.2.94/fc-lang.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.94/fc-min.patch b/fontconfig/fontconfig-2.2.94/fc-min.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fontconfig/fontconfig-2.2.95/fc-glyphname.patch b/fontconfig/fontconfig-2.2.95/fc-glyphname.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/fontconfig/fontconfig-2.2.95/fc-lang.patch b/fontconfig/fontconfig-2.2.95/fc-lang.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/fontconfig/fontconfig-native_2.2.94.oe b/fontconfig/fontconfig-native_2.2.94.oe deleted file mode 100644 index 941f573622..0000000000 --- a/fontconfig/fontconfig-native_2.2.94.oe +++ /dev/null @@ -1,10 +0,0 @@ -include fontconfig_${PV}.oe -inherit native -DEPENDS = "freetype-native expat-native" -FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/fontconfig-${PV}" - -do_stage () { - oe_runmake install - install fc-lang/fc-lang ${STAGING_BINDIR} - install fc-glyphname/fc-glyphname ${STAGING_BINDIR} -} diff --git a/fontconfig/fontconfig-native_2.2.95.oe b/fontconfig/fontconfig-native_2.2.95.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/fontconfig/fontconfig_2.2.92.oe b/fontconfig/fontconfig_2.2.92.oe deleted file mode 100644 index 17dc9004f8..0000000000 --- a/fontconfig/fontconfig_2.2.92.oe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype freetype-native zlib" - -FC_SONAME = "1.0.4" - -SRC_URI = "http://pdx.freedesktop.org/~fontconfig/release/fontconfig-${PV}.tar.gz \ - file://freetype-includes.patch;patch=1;pnum=0 \ - file://makefile1.patch;patch=1;pnum=0 \ - file://makefile2.patch;patch=1;pnum=0" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --disable-docs " - -do_compile () { -# XXX ${PV} dist missing some files ! - touch fc-list/fc-list.1 - touch fc-cache/fc-cache.1 - oe_runmake -C fc-lang "CC=${BUILD_CC}" \ - "CFLAGS=${BUILD_CFLAGS}" "LDFLAGS=${BUILD_LDFLAGS}" \ - "CPPFLAGS=${BUILD_CPPFLAGS}" "CXXFLAGS=${BUILD_CXXFLAGS}" \ - "FREETYPE_CFLAGS=-I${STAGING_INCDIR}/freetype2" "FREETYPE_LIBS=-lfreetype -lz" - oe_runmake -C fc-glyphname "CC=${BUILD_CC}" \ - "CFLAGS=${BUILD_CFLAGS}" "LDFLAGS=${BUILD_LDFLAGS}" \ - "CPPFLAGS=${BUILD_CPPFLAGS}" "CXXFLAGS=${BUILD_CXXFLAGS}" \ - "FREETYPE_CFLAGS=-I${STAGING_INCDIR}/freetype2" "FREETYPE_LIBS=-lfreetype -lz" - oe_runmake -} - - -do_stage () { - oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/fontconfig - cp -a ${S}/fontconfig/*.h ${STAGING_INCDIR}/fontconfig/ -} diff --git a/fontconfig/fontconfig_2.2.94.oe b/fontconfig/fontconfig_2.2.94.oe deleted file mode 100644 index 6a35855e17..0000000000 --- a/fontconfig/fontconfig_2.2.94.oe +++ /dev/null @@ -1,28 +0,0 @@ -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://fc-min.patch;patch=1" - -PACKAGES =+ "fontconfig-utils " -FILES_fontconfig-utils = "${bindir}/*" - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs " - -do_compile () { - oe_runmake 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 -} diff --git a/fontconfig/fontconfig_2.2.95.oe b/fontconfig/fontconfig_2.2.95.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/initscripts/initscripts-1.0/h3600/devices b/initscripts/initscripts-1.0/h3600/devices index a9350b507f..e62266ffcf 100644 --- a/initscripts/initscripts-1.0/h3600/devices +++ b/initscripts/initscripts-1.0/h3600/devices @@ -3,6 +3,7 @@ # Devfs handling script. Since we arent running devfsd due to various reasons # which I will not lay out here, we need to create some links for compatibility. + mount /proc depmod -ae modprobe ipaq_hal model=`cat /proc/hal/model` -- cgit v1.2.3