From 652528947d7b958e3819c32e6dcabe0c916c032f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 31 Jan 2005 11:58:55 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into cimmeria.hyboria:/home/dp/zaurus/openembedded 2005/01/31 11:49:46+00:00 hyboria!xora Fixed qpdf2 to correct QT_VERSIOn check and fixed packaging in t1lib BKrev: 41fe1d7fyWCKf11I3y-3TiqtmCiYAw --- BitKeeper/etc/logging_ok | 1 + packages/qpdf2/files/fix_qtversion_check.patch | 0 packages/qpdf2/qpdf2_2.2.1.bb | 5 +++-- packages/t1lib/t1lib.bb.patch | 0 packages/t1lib/t1lib_5.0.2.bb | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 packages/qpdf2/files/fix_qtversion_check.patch create mode 100644 packages/t1lib/t1lib.bb.patch diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 3e271ad3b8..2c3ce94ab8 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -101,4 +101,5 @@ timh@smallshiny.kano.org.uk wind@spiritship.(none) xf005570@cn014xf005570l1.(none) xf005570@cn014xf005570w1. +xora@cimmeria.hyboria zecke@handhelds.org diff --git a/packages/qpdf2/files/fix_qtversion_check.patch b/packages/qpdf2/files/fix_qtversion_check.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qpdf2/qpdf2_2.2.1.bb b/packages/qpdf2/qpdf2_2.2.1.bb index 730529801b..6f853339e6 100644 --- a/packages/qpdf2/qpdf2_2.2.1.bb +++ b/packages/qpdf2/qpdf2_2.2.1.bb @@ -8,11 +8,12 @@ DEPENDS = "t1lib freetype" APPNAME = "qpdf" APPTYPE = "binary" APPDESKTOP = "${S}/ipkg-render-freetype/opt/QtPalmtop/apps/Applications" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/qpdf2/qpdf2_2.2.1_20040217b.tgz \ file://hack-the-hack.patch;patch=1 \ - file://fix-sigsegv.patch;patch=1" + file://fix-sigsegv.patch;patch=1 \ + file://fix_qtversion_check.patch;patch=1" S = "${WORKDIR}/qpdf2_${PV}" inherit opie diff --git a/packages/t1lib/t1lib.bb.patch b/packages/t1lib/t1lib.bb.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb index 4e08d079c7..98b82a3a6b 100644 --- a/packages/t1lib/t1lib_5.0.2.bb +++ b/packages/t1lib/t1lib_5.0.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A Type1 Font Rastering Library" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" +PR = "r2" LICENSE = "LGPL GPL" SRC_URI = "ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -25,5 +25,5 @@ do_stage() { install lib/t1lib/t1libx.h ${STAGING_INCDIR}/ } -FILES_${PN} = "${bindir}/* {$libdir}* ${datadir}/t1lib/t1lib.config" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}/t1lib/t1lib.config" FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" -- cgit v1.2.3