Revert "gtk+: add 2.20"

[openembedded.git] / recipes / gtk+ / gtk+.inc

diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index d47ace0..6c8f0de 100644 (file)
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -5,14 +5,27 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \
-           libxrandr libxdamage libxrender libxcomposite"
+          libxrandr libxdamage libxrender libxcomposite cairo jasper gtk+-native"
 PROVIDES = "gdk-pixbuf"
 
-INC_PR = "r6"
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2 \
+       file://hardcoded_libtool.patch;patch=1 \
+       file://run-iconcache.patch;patch=1 \
+       file://toggle-font.diff;patch=1;pnum=0 \
+       file://xsettings.patch;patch=1 \
+       "
+
+INC_PR = "r8"
 
 inherit autotools pkgconfig
 
 LEAD_SONAME = "libgtk-x11-2.0.so"
+LIBV = "2.10.0"
+
+PACKAGES =+ "${PN}-demo ${PN}-demo-source"
+FILES_${PN}-demo = "${bindir}/gtk-demo"
+FILES_${PN}-demo-source = "${datadir}/gtk-2.0/demo"
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
        ${bindir}/gtk-update-icon-cache \
@@ -23,7 +36,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 RDEPENDS_${PN} = "hicolor-icon-theme"
 
 FILES_${PN}-dev += " \
-        ${datadir}/gtk-2.0/include \
+       ${datadir}/gtk-2.0/include \
        ${libdir}/gtk-2.0/include \
        ${bindir}/gdk-pixbuf-csource \
        ${bindir}/gtk-builder-convert"
@@ -41,30 +54,33 @@ RRECOMMENDS_${PN} = " ${NEATSTUFF} "
 RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
 RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
 
+do_install_append () {
+       mkdir -p ${D}${libdir}/gtk-2.0/include
+       install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
+       # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+       cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/
 
+       install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
 
-do_stage () {
-       oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
-       if test -d modules/other/gail/libgail-util ; then
-               oe_libinstall -so -C modules/other/gail/libgail-util libgailutil ${STAGING_LIBDIR}
-       fi
+       install -d ${D}${sysconfdir}/gtk-2.0
+       rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
+}
 
-       autotools_stage_includes
+do_install_virtclass-native () {
+        autotools_do_install
 
-       mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
-       install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-        # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
-       cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
+       mkdir -p ${D}${libdir}/gtk-2.0/include
+       install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
+       # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+       cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/
 
        install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
 
-do_install_append () {
        install -d ${D}${sysconfdir}/gtk-2.0
        rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
+
+       mkdir -p "${D}${sysconfdir}/gtk-2.0"
+       ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders ${B}/gdk-pixbuf/.libs/*.so | sed 's:${B}/gdk-pixbuf/.libs:${STAGING_LIBDIR}/gtk-2.0/${LIBV}/loaders:' > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"
 }
 
 postinst_prologue() {