[arch-commits] Commit in libglade/repos (3 files)

[Jan de Groot]

    Date: Sunday, March 8, 2009 @ 09:27:55
  Author: jgc
Revision: 29381

Merged revisions 29376 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libglade/trunk

........
  r29376 | jgc | 2009-03-08 13:26:38 +0000 (Sun, 08 Mar 2009) | 2 lines
  
  upgpkg: libglade 2.6.3-2
      Fix FS#12773 (upstream bug 555149)
........

Added:
  libglade/repos/extra-i686/bgo555149.patch
    (from rev 29376, libglade/trunk/bgo555149.patch)
Modified:
  libglade/repos/extra-i686/	(properties)
  libglade/repos/extra-i686/PKGBUILD

-----------------+
 PKGBUILD        |   21 +++++++++++++--------
 bgo555149.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 8 deletions(-)


Property changes on: libglade/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libglade/trunk:1-13455
   + /libglade/trunk:1-29380

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-08 13:27:31 UTC (rev 29380)
+++ extra-i686/PKGBUILD	2009-03-08 13:27:55 UTC (rev 29381)
@@ -3,24 +3,29 @@
 
 pkgname=libglade
 pkgver=2.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Allows you to load glade interface files in a program at runtime"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('gtk2>=2.14.1' 'libxml2>=2.6.32')
+depends=('gtk2>=2.14.7' 'libxml2>=2.7.3')
 makedepends=('python' 'pkgconfig')
+optdepends=('python: libglade-convert script')
 options=('!libtool')
 install=glade.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2
-	libglade-2.0.1-nowarning.patch)
+	libglade-2.0.1-nowarning.patch
+	bgo555149.patch)
 url="http://www.gnome.org"
-md5sums=('1c359860b1a0f369f0b6e3f96fd985c2' '4f879c0ce550004905aa0fb24f25c353')
+md5sums=('1c359860b1a0f369f0b6e3f96fd985c2'
+         '4f879c0ce550004905aa0fb24f25c353'
+         '02e1e7f3538b9d8f0c0c64eb01e535c6')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/libglade-2.0.1-nowarning.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" || return 1
+  patch -Np0 -i "${srcdir}/bgo555149.patch" || return 1
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m755 libglade-convert ${pkgdir}/usr/bin/libglade-convert || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 libglade-convert "${pkgdir}/usr/bin/" || return 1
 }

Copied: libglade/repos/extra-i686/bgo555149.patch (from rev 29376, libglade/trunk/bgo555149.patch)
===================================================================
--- extra-i686/bgo555149.patch	                        (rev 0)
+++ extra-i686/bgo555149.patch	2009-03-08 13:27:55 UTC (rev 29381)
@@ -0,0 +1,47 @@
+Index: glade/glade-build.h
+===================================================================
+--- glade/glade-build.h	(revision 546)
++++ glade/glade-build.h	(working copy)
+@@ -26,10 +26,7 @@
+ #include <glib-object.h>
+ #include <gmodule.h>
+ #include <glade/glade-xml.h>
+-#include <gtk/gtkwidget.h>
+-#include <gtk/gtkwindow.h>
+-#include <gtk/gtkaccelgroup.h>
+-#include <gtk/gtkadjustment.h>
++#include <gtk/gtk.h>
+ 
+ #include <glade/glade-parser.h>
+ 
+Index: glade/glade-xml.h
+===================================================================
+--- glade/glade-xml.h	(revision 546)
++++ glade/glade-xml.h	(working copy)
+@@ -23,8 +23,7 @@
+ #define GLADE_XML_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkwidget.h>
+-#include <gtk/gtktooltips.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: glade/glade-xml.c
+===================================================================
+--- glade/glade-xml.c	(revision 546)
++++ glade/glade-xml.c	(working copy)
+@@ -30,11 +30,7 @@
+ #include <glade/glade-build.h>
+ #include <glade/glade-private.h>
+ #include <gmodule.h>
+-#include <gtk/gtkobject.h>
+-#include <gtk/gtksignal.h>
+-#include <gtk/gtkwidget.h>
+-#include <gtk/gtkcontainer.h>
+-#include <gtk/gtklabel.h>
++#include <gtk/gtk.h>
+ #include <atk/atk.h>
+ 
+ #ifdef ENABLE_NLS