diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-05-25 17:55:01 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-05-25 17:55:01 +0000 |
| commit | 2569f5e60e38d164b7b11e08bf979548b319a4af (patch) | |
| tree | 2755ce48a0be8b519c055f5cc196f146761553f1 | |
| parent | 70a1e0671ea5e6e4a59e568c76cc073c512b30c3 (diff) | |
| parent | 9dae835ef374adaae20d75eba1109bb307c249bd (diff) | |
merge of '29a8a8c7605ad9df4a27011f49bc1935e05c4b72'
and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'
| -rw-r--r-- | packages/abiword/abiword.inc | 5 | ||||
| -rw-r--r-- | packages/gtk+/gtk-2.10.inc | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index 8569845394..58f712aca9 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -3,8 +3,9 @@ HOMEPAGE = "http://www.abiword.org"" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" -RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +RDEPENDS = "enchant " +RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" PR = "r2" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 6f9035055b..7f610294d1 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -27,9 +27,11 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = " ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_linux += " glibc-gconv-iso8859-1" + EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" |