4 files changed, 7 insertions, 32 deletions

diff --git a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h
index 1329e7f21c..1329e7f21c 100644
--- a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h
+++ b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
deleted file mode 100644
index 661ad360c6..0000000000
--- a/meta/packages/glib-2.0/glib-2.0-native_2.22.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "GLib is a general-purpose utility library, \
-which provides many useful data types, macros, \
-type conversions, string utilities, file utilities, a main \
-loop abstraction, and so on. It works on many \
-UNIX-like platforms, Windows, OS/2 and BeOS."
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS += "gtk-doc-native"
-PR = "r1"
-
-SRC_URI = "http://download.gnome.org/sources/glib/2.22/glib-${PV}.tar.bz2 \
-           file://glib-gettextize-dir.patch;patch=1 \
-           file://configure-libtool.patch;patch=1 \
-           file://glibconfig-sysdefs.h"
-
-S = "${WORKDIR}/glib-${PV}"
-
-inherit autotools_stage pkgconfig native gettext
-
-acpaths = ""
-do_configure_prepend () {
-        install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
-}
-
-do_install_append () {
-        install -d ${D}${includedir}/glib-2.0/glib
-        install -m 0755 ${S}/glibconfig.h ${D}${includedir}/glib-2.0/glibconfig.h
-}
diff --git a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
index eae43de0ed..26d91a9cfa 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.22.3.bb
@@ -1,7 +1,11 @@
 require glib.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch;patch=1"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc
index c513df09d3..00f113f530 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -6,8 +6,8 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS += "glib-2.0-native gtk-doc-native gettext"
-DEPENDS += "virtual/libiconv virtual/libintl"
+DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl"
+DEPENDS_virtclass-native = "gtk-doc-native"
 PACKAGES =+ "glib-2.0-utils "
 
 LEAD_SONAME = "libglib-2.0.*"