diff options
author | Michael Lauer <mickey@vanille-media.de> | 2005-07-03 22:12:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-03 22:12:10 +0000 |
commit | 99eeb3804015569a16a18f22120a43e7d674489c (patch) | |
tree | be42f2f83f6a1d56a871d92901407a8f64ce198d /packages | |
parent | 5ec5a385140a7a38500dbc6d34408163f8e02294 (diff) | |
parent | 18138734de516f15e0a9f9ea164762cfd8b8023d (diff) |
merge of 1e28595fffe28b835e1b38f536e5b2cc693f5564
and d801ae9bc332586d6508633ec862c1cbc13409ec
Diffstat (limited to 'packages')
-rw-r--r-- | packages/jpeg/jpeg-6b/debian.patch | 3 | ||||
-rw-r--r-- | packages/meta/meta-maemo.bb | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/jpeg/jpeg-6b/debian.patch b/packages/jpeg/jpeg-6b/debian.patch index 54e7a2e5d5..823c8e08dc 100644 --- a/packages/jpeg/jpeg-6b/debian.patch +++ b/packages/jpeg/jpeg-6b/debian.patch @@ -6995,7 +6995,7 @@ +end --- /dev/null +++ jpeg-6b/ltconfig.new -@@ -0,0 +1,3017 @@ +@@ -0,0 +1,3016 @@ +#! /bin/sh + +# ltconfig - Create a system-specific libtool. @@ -8931,7 +8931,6 @@ + else + # Only the GNU ld.so supports shared libraries on MkLinux. + case "$host_cpu" in -+ powerpc*) dynamic_linker=no ;; + *) dynamic_linker='Linux ld.so' ;; + esac + fi diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 9b6ee6e073..6f8e886a22 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,5 +1,5 @@ -PR = "r7" +PR = "r6" PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" @@ -43,7 +43,8 @@ maemo-task-base = "\ osso-core-config \ osso-gnome-vfs2 \ osso-thumbnail \ - xauth" + xauth \ + esd" RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \ gdk-pixbuf-loader-xpm \ |