diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2010-01-07 23:11:20 +0100 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2010-01-07 23:56:21 +0100 |
| commit | db5e6144271564e5440339492d2ba148cdada8bc (patch) | |
| tree | c3e1c6a2f2f75846187a8a9ecf6d23d566af554b /recipes/gtk+/gtk+.inc | |
| parent | 6962a060a7daded4dd26ecb5a5aeb24e6f85bf3d (diff) | |
gtk+: unify
Diffstat (limited to 'recipes/gtk+/gtk+.inc')
| -rw-r--r-- | recipes/gtk+/gtk+.inc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index d47ace0c06..610428821f 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -5,14 +5,24 @@ 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" 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://no-demos.patch;patch=1 \ + file://run-iconcache.patch;patch=1 \ + file://toggle-font.diff;patch=1;pnum=0 \ + file://xsettings.patch;patch=1 \ + " + +INC_PR = "r7" inherit autotools pkgconfig LEAD_SONAME = "libgtk-x11-2.0.so" +LIBV = "2.10.0" FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${bindir}/gtk-update-icon-cache \ @@ -23,7 +33,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,8 +51,6 @@ RRECOMMENDS_${PN} = " ${NEATSTUFF} " RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 " RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1" - - do_stage () { oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} @@ -56,7 +64,7 @@ do_stage () { 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* + # Copy over all headers, since the maemo stuff needs access to the private api. *sigh* cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/ install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ |