summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2005-01-31 11:58:55 +0000
committerGraeme Gregory <dp@xora.org.uk>2005-01-31 11:58:55 +0000
commit652528947d7b958e3819c32e6dcabe0c916c032f (patch)
tree78c9e5025c964c67542284c901cf999a72e128da /packages
parenta5623b15121069e53691078e7b43d23641673b84 (diff)
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
Diffstat (limited to 'packages')
-rw-r--r--packages/qpdf2/files/fix_qtversion_check.patch0
-rw-r--r--packages/qpdf2/qpdf2_2.2.1.bb5
-rw-r--r--packages/t1lib/t1lib.bb.patch0
-rw-r--r--packages/t1lib/t1lib_5.0.2.bb4
4 files changed, 5 insertions, 4 deletions
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
--- /dev/null
+++ b/packages/qpdf2/files/fix_qtversion_check.patch
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
--- /dev/null
+++ b/packages/t1lib/t1lib.bb.patch
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 <mickey@Vanille.de>"
-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"