r29990 - in /desktop/unstable/libgnome/debian: changelog patches/03_multiarch.patch patches/series rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Oct 5 08:38:22 UTC 2011
Author: biebl
Date: Wed Oct 5 08:38:22 2011
New Revision: 29990
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29990
Log:
- Create a header file containing DEB_HOST_MULTIARCH.
* debian/patches/03_multiarch.patch
- Look for accessibility modules in multiarch directories. Closes: #636197
Added:
desktop/unstable/libgnome/debian/patches/03_multiarch.patch
Modified:
desktop/unstable/libgnome/debian/changelog
desktop/unstable/libgnome/debian/patches/series
desktop/unstable/libgnome/debian/rules
Modified: desktop/unstable/libgnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/changelog?rev=29990&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnome/debian/changelog [utf-8] Wed Oct 5 08:38:22 2011
@@ -8,6 +8,9 @@
- Remove libtool .la file.
* debian/rules
- Remove clean-la.mk include.
+ - Create a header file containing DEB_HOST_MULTIARCH.
+ * debian/patches/03_multiarch.patch
+ - Look for accessibility modules in multiarch directories. Closes: #636197
-- Michael Biebl <biebl at debian.org> Wed, 05 Oct 2011 10:23:38 +0200
Added: desktop/unstable/libgnome/debian/patches/03_multiarch.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/patches/03_multiarch.patch?rev=29990&op=file
==============================================================================
--- desktop/unstable/libgnome/debian/patches/03_multiarch.patch (added)
+++ desktop/unstable/libgnome/debian/patches/03_multiarch.patch [utf-8] Wed Oct 5 08:38:22 2011
@@ -1,0 +1,52 @@
+diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c
+index fa8e62d..3f32d39 100644
+--- a/libgnome/gnome-program.c
++++ b/libgnome/gnome-program.c
+@@ -1669,27 +1669,38 @@ gnome_program_parse_args (GnomeProgram *program)
+ static char *
+ find_accessibility_module (GnomeProgram *program, const char *libname)
+ {
+- char *sub;
++ char *sub0, *sub1;
+ char *path;
+ char *fname;
+ char *retval;
+
+ fname = g_strconcat (libname, "." G_MODULE_SUFFIX, NULL);
+- sub = g_strconcat ("gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
++ sub0 = g_strconcat (MULTIARCH, G_DIR_SEPARATOR_S, "gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
++ sub1 = g_strconcat ("gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
+
+ path = gnome_program_locate_file (
+- program, GNOME_FILE_DOMAIN_LIBDIR, sub, TRUE, NULL);
++ program, GNOME_FILE_DOMAIN_LIBDIR, sub0, TRUE, NULL);
+
+- g_free (sub);
++ if (path) {
++ retval = path;
++ goto out;
++ }
++
++ path = gnome_program_locate_file (
++ program, GNOME_FILE_DOMAIN_LIBDIR, sub1, TRUE, NULL);
+
+- if (path)
++ if (path) {
+ retval = path;
+- else
+- retval = gnome_program_locate_file (
+- program, GNOME_FILE_DOMAIN_LIBDIR,
+- fname, TRUE, NULL);
++ goto out;
++ }
++
++ retval = gnome_program_locate_file (
++ program, GNOME_FILE_DOMAIN_LIBDIR, fname, TRUE, NULL);
+
++out:
+ g_free (fname);
++ g_free (sub0);
++ g_free (sub1);
+
+ return retval;
+ }
Modified: desktop/unstable/libgnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/patches/series?rev=29990&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnome/debian/patches/series [utf-8] Wed Oct 5 08:38:22 2011
@@ -1,2 +1,3 @@
00_as-needed.patch
02_path_max.patch
+03_multiarch.patch
Modified: desktop/unstable/libgnome/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/rules?rev=29990&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnome/debian/rules [utf-8] Wed Oct 5 08:38:22 2011
@@ -9,8 +9,14 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+CFLAGS += -include debian.h
+
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+
+makebuilddir::
+ echo '#define MULTIARCH "${DEB_HOST_MULTIARCH}"' >debian.h
clean::
dh_clean intltool-extract intltool-merge intltool-update \
po/.intltool-merge-cache
+ rm -f debian.h
More information about the pkg-gnome-commits
mailing list