diff options
Diffstat (limited to 'meta-demoapps/recipes-gnome')
6 files changed, 9 insertions, 7 deletions
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc index dcd3b85534..e3f6a9d2b9 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.abiword.org" | |||
3 | SECTION = "x11/office" | 3 | SECTION = "x11/office" |
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" | 5 | DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2" |
6 | RDEPENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ | 6 | RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ |
7 | glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" | 7 | glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" |
8 | 8 | ||
9 | SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" | 9 | SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" |
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb index 47cf9e03c0..7ee0f866a0 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | require abiword-2.5.inc | 1 | require abiword-2.5.inc |
2 | 2 | ||
3 | PR = "r1" | ||
4 | |||
3 | EXTRA_OECONF += "--enable-embedded" | 5 | EXTRA_OECONF += "--enable-embedded" |
4 | 6 | ||
5 | S = "${WORKDIR}/abiword-${PV}" | 7 | S = "${WORKDIR}/abiword-${PV}" |
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc index d2fabf931c..5d7e3ce600 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword.inc +++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.abiword.org"" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | 5 | ||
6 | DEPENDS = "libgsf libglade libfribidi libxml2 wv" | 6 | DEPENDS = "libgsf libglade libfribidi libxml2 wv" |
7 | RRECOMMENDS = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ | 7 | RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ |
8 | glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" | 8 | glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" |
9 | 9 | ||
10 | # Share this file between recipes that use cvs and that pull tarballs | 10 | # Share this file between recipes that use cvs and that pull tarballs |
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb index 566d0fa203..c10d761b06 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require abiword-2.5.inc | 1 | require abiword-2.5.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | RCONFLICTS = "abiword-embedded" | 5 | RCONFLICTS_${PN} = "abiword-embedded" |
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb index e0e3bd7d60..4dffbd0710 100644 --- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb +++ b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require abiword.inc | 1 | require abiword.inc |
2 | 2 | ||
3 | PV="2.5.0+cvs${SRCDATE}" | 3 | PV="2.5.0+cvs${SRCDATE}" |
4 | PR = "r3" | 4 | PR = "r4" |
5 | 5 | ||
6 | SRC_URI = "${CVSURI}" | 6 | SRC_URI = "${CVSURI}" |
7 | 7 | ||
diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb index 760c5c10af..3ac7d6e2eb 100644 --- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | DESCRIPTION = "GNOME Structured File Library" | 1 | DESCRIPTION = "GNOME Structured File Library" |
2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
6 | DEPENDS= "libxml2 bzip2 glib-2.0 zlib" | 6 | DEPENDS= "libxml2 bzip2 glib-2.0 zlib" |
7 | RDEPENDS = "gconf gnome-vfs" | 7 | RDEPENDS_${PN} = "gconf gnome-vfs" |
8 | 8 | ||
9 | 9 | ||
10 | PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " | 10 | PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " |