summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-10 21:25:05 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-10 21:25:05 +0000
commit0c34af91b2c60fc226e51f970a5e06b4095bd936 (patch)
tree02fb2d1a1e42d0578da7a2e389cc076ac7706446 /dev-libs/glib/files
parentMarking libatasmart-0.18 ppc for bug 392313 (diff)
downloadgentoo-2-0c34af91b2c60fc226e51f970a5e06b4095bd936.tar.gz
gentoo-2-0c34af91b2c60fc226e51f970a5e06b4095bd936.tar.bz2
gentoo-2-0c34af91b2c60fc226e51f970a5e06b4095bd936.zip
Add fix from upstream for building with C++ compilers.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/glib/files')
-rw-r--r--dev-libs/glib/files/glib-2.30.2-missing-decls.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-libs/glib/files/glib-2.30.2-missing-decls.patch b/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
new file mode 100644
index 000000000000..3641f8850408
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.30.2-missing-decls.patch
@@ -0,0 +1,36 @@
+Fix from upstream for building with C++ compilers:
+https://bugzilla.gnome.org/show_bug.cgi?id=663880
+
+From 5d9f05eef147f17d71e38c9fba2e3f622c9ed21b Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 12 Nov 2011 10:26:31 -0500
+Subject: [PATCH] glib-unix.h: Add G_BEGIN/END_DECLS
+
+The omission was pointed out in bug 663880.
+---
+ glib/glib-unix.h | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/glib/glib-unix.h b/glib/glib-unix.h
+index 9642b5c..7be37f0 100644
+--- a/glib/glib-unix.h
++++ b/glib/glib-unix.h
+@@ -38,6 +38,8 @@
+ #error "This header may only be used on UNIX"
+ #endif
+
++G_BEGIN_DECLS
++
+ /**
+ * G_UNIX_ERROR:
+ *
+@@ -77,4 +79,6 @@ guint g_unix_signal_add (gint signum,
+ GSourceFunc handler,
+ gpointer user_data);
+
+-#endif
++G_END_DECLS
++
++#endif /* __G_UNIX_H__ */
+--
+1.7.7.1