diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-08-21 00:05:50 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-21 00:05:50 +0000 |
| commit | f79b582974b16f88e31f32e55de23807c26fcf99 (patch) | |
| tree | 2d2c3562e502b8afd3f5ec3a9e1da962a5e62870 | |
| parent | 50fb1ac493e9961c0113bfcb826ed5bb756daddc (diff) | |
| parent | 8bb35d79a72d5f01933394552594cb3b857277a9 (diff) | |
merge of 47c741e249fa9fd872ab3d835c3c5b28a6897aae
and fbc9813ed42c80708764b24a8a84d5a0b58fe88d
| -rw-r--r-- | packages/efl++/efl++-fb_0.0.2.bb | 3 | ||||
| -rw-r--r-- | packages/efl++/efl++-x11_0.0.2.bb | 3 | ||||
| -rw-r--r-- | packages/efl++/efl++.inc (renamed from packages/efl++/efl++_0.0.2.bb) | 4 | ||||
| -rw-r--r-- | packages/evince/evince_0.3.2.bb | 3 | ||||
| -rw-r--r-- | packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb | 4 |
5 files changed, 12 insertions, 5 deletions
diff --git a/packages/efl++/efl++-fb_0.0.2.bb b/packages/efl++/efl++-fb_0.0.2.bb new file mode 100644 index 0000000000..b6a23d832d --- /dev/null +++ b/packages/efl++/efl++-fb_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES-=EFL_HAVE_X11" diff --git a/packages/efl++/efl++-x11_0.0.2.bb b/packages/efl++/efl++-x11_0.0.2.bb new file mode 100644 index 0000000000..d3f37911ee --- /dev/null +++ b/packages/efl++/efl++-x11_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES+=EFL_HAVE_X11" diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++.inc index 5803f5db7a..3a0aa9f691 100644 --- a/packages/efl++/efl++_0.0.2.bb +++ b/packages/efl++/efl++.inc @@ -5,6 +5,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" MAINTAINER = "${AUTHOR}" HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" DEPENDS = "virtual/evas virtual/ecore edje" +PROVIDES = "virtual/efl++" SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" S = "${WORKDIR}/efl++-${PV}" @@ -14,7 +15,7 @@ inherit qmake PARALLEL_MAKE = "" QMAKE_PROFILES = "efl++.pro" EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ - LIBS+=-L${S} DESTDIR=${S}" + LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}" export OE_QMAKE_LINK="${CXX}" export EDIR="${S}" @@ -23,7 +24,6 @@ do_configure_prepend() { cat <<EOF >include.pro include ( common.pro ) DEFINES += DATADIR=\"${datadir}/efl++/\" -DEFINES += EFL_HAVE_X11 EOF } diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 86ca664655..18ad005092 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Evince is simply a document viewer" LICENSE = "GPL" DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs" +RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \ file://no-doc.patch;patch=1" diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index bf4fae08bc..eb461a860c 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,7 +1,7 @@ +DESCRIPTION = "The Gnome Virtual File System - OSSO Version" LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" +PR = "r2" RPROVIDES = "gnome-vfs" inherit gnome pkgconfig |