summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2005-01-24 22:00:47 +0000
committerChris Lord <chris@openedhand.com>2005-01-24 22:00:47 +0000
commitc0855920b6d630a46d04a8dc5c647389aa237540 (patch)
tree313c19cf2491a2721146cea12fa7851ced0e6a2c /packages
parent14fc91b86313af4db328c65027493328823c611b (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded 2005/01/24 22:31:51+01:00 handhelds.org!zecke OpenSSL: Remove bashism from the last cset 2005/01/24 16:19:23-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/24 16:19:13-05:00 handhelds.org!kergoth Kill the now unnecessary status patch to cairo cvs. Make sure you're on current cvs, or old enough that it's before the status breakage. 2005/01/24 21:51:01+01:00 (none)!koen mb-wm-0.9.1 lower DEFAULT_PREFERENCE 2005/01/24 21:35:40+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/24 21:35:25+01:00 (none)!koen change mb-desktop SRC_URI to fetch from o-hand.com instead of hh.org BKrev: 41f5700fLpiIJ-8XAdZGLUYm5OEWyw
Diffstat (limited to 'packages')
-rw-r--r--packages/cairo/cairo/status.patch0
-rw-r--r--packages/cairo/cairo_cvs.bb5
-rw-r--r--packages/matchbox-desktop/matchbox-desktop_0.9.1.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.1.bb3
-rw-r--r--packages/openssl/openssl_0.9.7e.bb4
5 files changed, 8 insertions, 6 deletions
diff --git a/packages/cairo/cairo/status.patch b/packages/cairo/cairo/status.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/cairo/cairo/status.patch
+++ /dev/null
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
index 1a083d0b8c..bda6c885c5 100644
--- a/packages/cairo/cairo_cvs.bb
+++ b/packages/cairo/cairo_cvs.bb
@@ -6,10 +6,9 @@ MAINTAINER = "Phil Blundell <pb@debian.org>"
DEPENDS = "x11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo \
- file://status.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
S = "${WORKDIR}/cairo"
inherit autotools pkgconfig
diff --git a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
index 72bf1ba351..b36b424775 100644
--- a/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ b/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
DEPENDS = "libmatchbox startup-notification"
SECTION = "x11/wm"
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.1.bb b/packages/matchbox-wm/matchbox-wm_0.9.1.bb
index 55988fbbf4..052b98e4cd 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.1.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.1.bb
@@ -4,6 +4,9 @@ LICENSE = "GPL"
DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
+
+DEFAULT_PREFERENCE=-1
+
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
S = "${WORKDIR}/matchbox-window-manager-${PV}"
diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb
index 2edb672d67..8faca57f00 100644
--- a/packages/openssl/openssl_0.9.7e.bb
+++ b/packages/openssl/openssl_0.9.7e.bb
@@ -22,9 +22,9 @@ FILES_libcrypto = "${libdir}/libcrypto.so*"
FILES_libssl = "${libdir}/libssl.so*"
do_compile () {
- pushd util
+ cd util
perl perlpath.pl ${bindir}
- popd
+ cd ..
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
#