On Thu, 2012-05-31 at 11:03 +0100, Michael Meeks wrote:
> Gosh; we shouldn't need liborbit2 in master, prolly we should back-port
> that to libreoffice-3-5 as well. We have a nice patch from Intel for
> this:
The patch to not link against ORBit is in 3.5, but we never removed the
configure check from master or 3-5. Removed from master as
http://cgit.freedesktop.org/libreoffice/core/commit/?id=631c25c2ea32e6a61f6dda519bab0fa985885ee2
backport patch for review attached.
C.
>From 7628d3205e27ffd3d03b83b858e8459ceb2890e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
Date: Thu, 31 May 2012 14:46:22 +0100
Subject: [PATCH] remove ORBit configure check
Change-Id: I2be7decd8ee54a1199cbbc205bceb782b748f042
---
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index 6b330ea..5830bdf 100644
--- a/configure.in
+++ b/configure.in
@@ -7027,7 +7027,7 @@ AC_MSG_CHECKING([whether to enable GConf support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then
ENABLE_GCONF="TRUE"
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GCONF, gconf-2.0 ORBit-2.0 )
+ PKG_CHECK_MODULES( GCONF, gconf-2.0 )
else
AC_MSG_RESULT([no])
fi
--
1.7.10.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
