configure.ac | 3 +++
ucb/source/ucp/gio/gio_mount.cxx | 7 +++++++
vcl/unx/gtk/window/gloactiongroup.cxx | 14 ++++++++++++++
vcl/unx/gtk/window/glomenu.cxx | 7 +++++++
4 files changed, 31 insertions(+)
New commits:
commit 8313f68355a7f1f51e930c74f215d823ff086457
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jan 13 18:13:58 2014 +0100
Work around G_DEFINE_TYPE -Werror,-Wunused-function
At least G_DEFINE_TYPE from glib2-devel-2.38.2-2.fc20.x86_64
/usr/include/glib-2.0/gobject/gtype.h defines unsed *_get_instance_private
functions.
Change-Id: I47211b6451d9699c7b8741555f3ad11a09e411bf
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index 30c97e2..6d7bc63 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -22,7 +22,14 @@
#include <stdio.h>
#include <string.h>
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
static void ooo_mount_operation_ask_password (GMountOperation *op,
const char *message, const char *default_user, const char *default_domain,
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx
b/vcl/unx/gtk/window/gloactiongroup.cxx
index 19187a6..00ce933 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -40,7 +40,14 @@ struct _GLOAction
typedef GObjectClass GLOActionClass;
typedef struct _GLOAction GLOAction;
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
GLOAction*
g_lo_action_new (void)
@@ -100,10 +107,17 @@ struct _GLOActionGroupPrivate
static void g_lo_action_group_iface_init (GActionGroupInterface *);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
g_lo_action_group, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
g_lo_action_group_iface_init));
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
static gchar **
g_lo_action_group_list_actions (GActionGroup *group)
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index 8227fb1..e012aa0 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -25,7 +25,14 @@ struct _GLOMenu
typedef GMenuModelClass GLOMenuClass;
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
struct item
{
commit 21470348109ab7b91d2147535d72728736c5b43d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jan 13 18:05:27 2014 +0100
Filter out GCC-ism for Clang
At least mariadb-5.5.34-2.fc20.x86_64 "mysql_config --cflags" somewhat
unhelpfully includes GCC-specific -fstack-protector-strong which at least
Clang
trunk towards 3.5 does not understand.
Change-Id: Ic38104323b6d9275384effdf21d1885c0720edb0
diff --git a/configure.ac b/configure.ac
index 65fb0e8..5491132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8257,6 +8257,9 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
fi
AC_MSG_CHECKING([for MariaDB Client library])
MARIADB_CFLAGS=`$MARIADBCONFIG --cflags`
+ if test "$COM_GCC_IS_CLANG" = TRUE; then
+ MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e
s/-fstack-protector-strong//)
+ fi
MARIADB_LIBS=`$MARIADBCONFIG --libs_r`
AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'])
AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
