r34801 - in /desktop/unstable/glade/debian: changelog patches/01_load_catalog_libraries_from_multiarch_path.patch patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun May 13 15:04:08 2012
New Revision: 34801

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34801
Log:
Try loading glade catalog libraries from multiarch paths. Closes: #666241

Added:
    desktop/unstable/glade/debian/patches/01_load_catalog_libraries_from_multiarch_path.patch
Modified:
    desktop/unstable/glade/debian/changelog
    desktop/unstable/glade/debian/patches/series
    desktop/unstable/glade/debian/rules

Modified: desktop/unstable/glade/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/changelog?rev=34801&op=diff
==============================================================================
--- desktop/unstable/glade/debian/changelog [utf-8] (original)
+++ desktop/unstable/glade/debian/changelog [utf-8] Sun May 13 15:04:08 2012
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Bump Standards-Version to 3.9.3.
+  * Try loading glade catalog libraries from multiarch paths. Closes: #666241
 
  -- Michael Biebl <biebl at debian.org>  Thu, 19 Apr 2012 13:55:28 +0200
 

Added: desktop/unstable/glade/debian/patches/01_load_catalog_libraries_from_multiarch_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/patches/01_load_catalog_libraries_from_multiarch_path.patch?rev=34801&op=file
==============================================================================
--- desktop/unstable/glade/debian/patches/01_load_catalog_libraries_from_multiarch_path.patch (added)
+++ desktop/unstable/glade/debian/patches/01_load_catalog_libraries_from_multiarch_path.patch [utf-8] Sun May 13 15:04:08 2012
@@ -1,0 +1,30 @@
+Description: Try to load catalog libraries from multiarch paths
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666241
+diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
+index bf9542e..3aef8b7 100644
+--- a/gladeui/glade-utils.c
++++ b/gladeui/glade-utils.c
+@@ -55,6 +55,14 @@
+ 
+ #define GLADE_UTIL_COPY_BUFFSIZE       1024
+ 
++/*
++ * If MULTIARCH is not defined, fall back to load the glade catalog
++ * library from /usr/lib
++ */
++#ifndef LIBDIR_MULTIARCH
++#define LIBDIR_MULTIARCH "/usr/lib"
++#endif
++
+ 
+ /**
+  * glade_util_compose_get_type_func:
+@@ -884,6 +892,7 @@ glade_util_load_library (const gchar *library_name)
+     NULL,                       /* <-- dynamically allocated */
+     "/lib",
+     "/usr/lib",
++    LIBDIR_MULTIARCH,
+     "/usr/local/lib",
+     NULL
+   };

Modified: desktop/unstable/glade/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/patches/series?rev=34801&op=diff
==============================================================================
--- desktop/unstable/glade/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glade/debian/patches/series [utf-8] Sun May 13 15:04:08 2012
@@ -1,1 +1,2 @@
+01_load_catalog_libraries_from_multiarch_path.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/glade/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glade/debian/rules?rev=34801&op=diff
==============================================================================
--- desktop/unstable/glade/debian/rules [utf-8] (original)
+++ desktop/unstable/glade/debian/rules [utf-8] Sun May 13 15:04:08 2012
@@ -6,6 +6,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+CPPFLAGS += -DLIBDIR_MULTIARCH=\\\"/usr/lib/$(DEB_HOST_MULTIARCH)\\\"
+
 DEB_CONFIGURE_EXTRA_FLAGS += \
 			--enable-gtk-doc \
 			--disable-scrollkeeper