[oe-commits] org.oe.dev merge of '28ab3123a8190bef2f6e6f762a33e7d920fe42e0'

[pfalcon commit]

merge of '28ab3123a8190bef2f6e6f762a33e7d920fe42e0'
     and '360125bf8e4b1686562c238aa2d44e786b332919'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 7247d50baa3969c4328d37f4c560e6b56963636c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7247d50baa3969c4328d37f4c560e6b56963636c
Files:
1
packages/gtkmm/gtkmm.inc
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
Diffs:

#
# mt diff -r28ab3123a8190bef2f6e6f762a33e7d920fe42e0 -r7247d50baa3969c4328d37f4c560e6b56963636c
#
# 
# 
# patch "packages/gtkmm/gtkmm.inc"
#  from [5daa50929bf91d353c37e24808bdcf6ffe37866c]
#    to [c99e2e2f13acddd410f35d4c40468e00186e71fb]
# 
============================================================
--- packages/gtkmm/gtkmm.inc	5daa50929bf91d353c37e24808bdcf6ffe37866c
+++ packages/gtkmm/gtkmm.inc	c99e2e2f13acddd410f35d4c40468e00186e71fb
@@ -1,10 +1,9 @@ LICENSE = "LGPL"
 DESCRIPTION = "C++ bindings for the GTK+ toolkit."
 HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "atk glibmm gtk+"
-PR = "r0"
+DEPENDS = "atk glibmm gtk+ cairomm"
 
 inherit gnome autotools pkgconfig flow-lossage
 


#
# mt diff -r360125bf8e4b1686562c238aa2d44e786b332919 -r7247d50baa3969c4328d37f4c560e6b56963636c
#
# 
# 
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
#  from [2816061c0061c8373ee760be7e88620e243cbc2a]
#    to [030996100e8c5110ee7690dae2a49a7cef321ecf]
# 
# patch "packages/glib-2.0/glib.inc"
#  from [07cceb9af55dc0d2d4fe2a1e1889a66327fdc4c8]
#    to [09c2d1615f7c249f8ab1c68778bafbc98293ff6b]
# 
============================================================
--- packages/glib-2.0/glib-2.0_2.12.12.bb	2816061c0061c8373ee760be7e88620e243cbc2a
+++ packages/glib-2.0/glib-2.0_2.12.12.bb	030996100e8c5110ee7690dae2a49a7cef321ecf
@@ -1,6 +1,6 @@ require glib.inc
 require glib.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
============================================================
--- packages/glib-2.0/glib.inc	07cceb9af55dc0d2d4fe2a1e1889a66327fdc4c8
+++ packages/glib-2.0/glib.inc	09c2d1615f7c249f8ab1c68778bafbc98293ff6b
@@ -8,12 +8,13 @@ DEPENDS += "virtual/libiconv virtual/lib
 PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ "glib-2.0-utils "
+PACKAGES =+ "${PN}-dev glib-2.0-utils "
 
 PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0"
 
 EXTRA_OECONF = "--disable-debug "