Fix glade build on newer GTK+ by disabling the deprecation guards

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2307 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 6 insertions, 5 deletions

diff --git a/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch b/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch
index 9ef8f0738e..514c761b01 100644
--- a/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch
+++ b/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch
@@ -1,10 +1,11 @@
 --- libglade-2.5.1/glade/Makefile.am.old        2006-04-25 21:03:25.000000000 +0100
 +++ libglade-2.5.1/glade/Makefile.am    2006-04-25 21:03:45.000000000 +0100
-@@ -30,7 +30,6 @@
+@@ -30,10 +30,6 @@
    -I$(top_srcdir) \
    $(LIBGLADE_CFLAGS) \
    -DGLADE_LIBDIR=\""$(libdir)"\" \
 -  -DG_DISABLE_DEPRECATED \
-   -DGDK_DISABLE_DEPRECATED \
-   -DGDK_PIXBUF_DISABLE_DEPRECATED \
-   -DGTK_DISABLE_DEPRECATED \
+-  -DGDK_DISABLE_DEPRECATED \
+-  -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-  -DGTK_DISABLE_DEPRECATED \
+   -DGNOME_DISABLE_DEPRECATED
diff --git a/meta/packages/libglade/libglade_2.5.1.bb b/meta/packages/libglade/libglade_2.5.1.bb
index 4dcbe69828..3aa16c4ef7 100644
--- a/meta/packages/libglade/libglade_2.5.1.bb
+++ b/meta/packages/libglade/libglade_2.5.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "gtk+ gtk-doc"
 
 inherit autotools pkgconfig gnome
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1 \
             file://no-deprecation.patch;patch=1"