From ad1a2216f7b1bcccfdf6844c32a5e2e0b50cc572 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Oct 2006 07:42:11 +0000 Subject: gtk+: add ttf-dejavu-sans to RRECOMMENDS, otherwise applications requiring fonts will crash --- packages/gtk+/gtk+_2.10.0.bb | 8 ++++---- packages/gtk+/gtk+_2.10.1.bb | 8 ++++---- packages/gtk+/gtk+_2.10.3.bb | 8 ++++---- packages/gtk+/gtk+_2.4.13.bb | 4 ++-- packages/gtk+/gtk+_2.4.4.bb | 3 ++- packages/gtk+/gtk+_2.6.10.bb | 4 ++-- packages/gtk+/gtk+_2.6.3.bb | 4 ++-- packages/gtk+/gtk+_2.6.4-1.osso7.bb | 4 ++-- packages/gtk+/gtk+_2.6.7.bb | 4 ++-- packages/gtk+/gtk+_2.8.16.bb | 6 ++++-- packages/gtk+/gtk+_2.8.9.bb | 8 ++++---- 11 files changed, 32 insertions(+), 29 deletions(-) (limited to 'packages/gtk+') diff --git a/packages/gtk+/gtk+_2.10.0.bb b/packages/gtk+/gtk+_2.10.0.bb index ef1f4f1d60..1f8087cd64 100644 --- a/packages/gtk+/gtk+_2.10.0.bb +++ b/packages/gtk+/gtk+_2.10.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r3" +PR = "r4" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +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" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb index f4441e598c..462c0d725e 100644 --- a/packages/gtk+/gtk+_2.10.1.bb +++ b/packages/gtk+/gtk+_2.10.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r0" +PR = "r1" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +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" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb index f4441e598c..462c0d725e 100644 --- a/packages/gtk+/gtk+_2.10.3.bb +++ b/packages/gtk+/gtk+_2.10.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" -PR = "r0" +PR = "r1" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" @@ -37,9 +37,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +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" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb index 9fdef71c1f..83f6be1982 100644 --- a/packages/gtk+/gtk+_2.4.13.bb +++ b/packages/gtk+/gtk+_2.4.13.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -36,7 +36,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${datadir}/themes ${sysconfdir}" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb index 1d33101b3f..7849e91b92 100644 --- a/packages/gtk+/gtk+_2.4.4.bb +++ b/packages/gtk+/gtk+_2.4.4.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor" -PR = "r7" +RRECOMMENDS = "ttf-dejavu-sans" +PR = "r8" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index b8b65d3351..583dd6466e 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -33,7 +33,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb index 4643eb557d..2805724e09 100644 --- a/packages/gtk+/gtk+_2.6.3.bb +++ b/packages/gtk+/gtk+_2.6.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -32,7 +32,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb index 6a6d560a50..9a625d4686 100644 --- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb +++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/" @@ -124,7 +124,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.6.7.bb b/packages/gtk+/gtk+_2.6.7.bb index 4f43fdfecf..264e2c6cca 100644 --- a/packages/gtk+/gtk+_2.6.7.bb +++ b/packages/gtk+/gtk+_2.6.7.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -32,7 +32,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index e4ac0617a0..5c21b8f587 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" @@ -28,6 +28,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ inherit autotools pkgconfig +CFLAGS += " -lz " + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-query-immodules-2.0 \ ${bindir}/gtk-update-icon-cache \ @@ -36,7 +38,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" +RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index d2c3cd52e7..f1e9208e40 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -34,9 +34,9 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +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" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft -- cgit v1.2.3