Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/30 15:38:06+01:00 hrw.one.pl!hrw
qt/e 2.3.9: extra visibility patch to get opie-freetype working

2004/12/30 15:08:09+01:00 hrw.one.pl!hrw
qpdf2: fixed "SIGSEGV on start"

2004/12/30 15:03:06+01:00 hrw.one.pl!hrw
t1lib: package doc separately

BKrev: 41d41347CDQOS3CttoCFE8uD_aaBHQ

5 files changed, 65 insertions, 0 deletions

diff --git a/packages/qpdf2/files/fix-sigsegv.patch b/packages/qpdf2/files/fix-sigsegv.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpdf2/files/fix-sigsegv.patch
diff --git a/packages/qpdf2/qpdf2_2.2.1.bb b/packages/qpdf2/qpdf2_2.2.1.bb
index e69de29bb2..997c866ab5 100644
--- a/packages/qpdf2/qpdf2_2.2.1.bb
+++ b/packages/qpdf2/qpdf2_2.2.1.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "QPDF2 is a Viewer for PDF documents. An unnecessary fork based on opie-qpdf."
+PRIORITY = "optional"
+SECTION = "opie/applications"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+NOTE = "This is so hacky you won't believe it until you look at the source..."
+DEPENDS = "t1lib freetype"
+APPNAME = "qpdf"
+APPTYPE = "binary"
+APPDESKTOP = "${S}/ipkg-render-freetype/opt/QtPalmtop/apps/Applications"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf2/qpdf2_2.2.1_20040217b.tgz \
+           file://hack-the-hack.patch;patch=1 \
+           file://fix-sigsegv.patch;patch=1"
+S = "${WORKDIR}/qpdf2_${PV}"
+
+inherit opie
+
+QMAKE_PROFILES = "qpdf_render-freetype.pro"
+EXTRA_QMAKEVARS_POST = "TARGET=qpdf"
+
+do_configure_prepend() {
+	find . -name "Makefile"|xargs rm -f
+	find . -name "*.o"|xargs rm -f
+	find . -name "*.a"|xargs rm -f
+	find . -name "*.la"|xargs rm -f
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/qpdf
+	install -m 0644 ipkg-render-freetype/opt/QtPalmtop/pics/qpdf/*.* ${D}${palmtopdir}/pics/qpdf/
+}
+
diff --git a/packages/qte/qte-2.3.9-snapshot/opie-freetype.patch b/packages/qte/qte-2.3.9-snapshot/opie-freetype.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-2.3.9-snapshot/opie-freetype.patch
diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb
index 8eeb417013..e023a9fdb6 100644
--- a/packages/qte/qte_2.3.9-snapshot.bb
+++ b/packages/qte/qte_2.3.9-snapshot.bb
@@ -4,6 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
    	   file://qpe.patch;patch=1 \
@@ -16,6 +17,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \
 	   file://encoding.patch;patch=1 \
 	   file://fix-qgfxraster.patch;patch=1 \
 	   file://qt-visibility.patch;patch=1 \
+	   file://opie-freetype.patch;patch=1 \
 	   file://update-qtfontdir \
 	   file://sharp_char.h \
 	   file://switches.h "
diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb
index e69de29bb2..44291f82c5 100644
--- a/packages/t1lib/t1lib_5.0.2.bb
+++ b/packages/t1lib/t1lib_5.0.2.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "A Type1 Font Rastering Library"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r1"
+
+SRC_URI = "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://install.patch;patch=1 \
+	   file://libtool.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x --without-athena"
+EXTRA_OEMAKE = "without_doc"
+
+do_configure() {
+	rm -f ${S}/ac-tools/aclocal.m4
+	autotools_do_configure
+}
+
+do_stage() {
+	oe_libinstall -so -C lib libt1 ${STAGING_LIBDIR}
+	install lib/t1lib/t1lib.h ${STAGING_INCDIR}/
+	install lib/t1lib/t1libx.h ${STAGING_INCDIR}/
+}
+
+FILES_${PN} = "${bindir}/* {$libdir}* ${datadir}/t1lib/t1lib.config"
+FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"