You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2017/10/21 06:15:07 UTC
svn commit: r1812807 - in
/openoffice/trunk/main/shell/source/backends/gconfbe: gconfbackend.cxx
makefile.mk
Author: damjan
Date: Sat Oct 21 06:15:07 2017
New Revision: 1812807
URL: http://svn.apache.org/viewvc?rev=1812807&view=rev
Log:
Don't require ORbit to compile. We never really needed it:
GConf makes its own CORBA connection if it needs to, and
the only reason we included orbit.h is to check whether
the problematic version < 2.8 was present, as it deadlocks
the GTK VCL plugin.
But ORbit 2.8 was released in 2003, and GConf doesn't
even use CORBA connections any more. So drop the check
and stop needing ORBit altogether.
Patch by: me
Modified:
openoffice/trunk/main/shell/source/backends/gconfbe/gconfbackend.cxx
openoffice/trunk/main/shell/source/backends/gconfbe/makefile.mk
Modified: openoffice/trunk/main/shell/source/backends/gconfbe/gconfbackend.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/backends/gconfbe/gconfbackend.cxx?rev=1812807&r1=1812806&r2=1812807&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/backends/gconfbe/gconfbackend.cxx (original)
+++ openoffice/trunk/main/shell/source/backends/gconfbe/gconfbackend.cxx Sat Oct 21 06:15:07 2017
@@ -57,7 +57,6 @@
#include "uno/lbnames.h"
#include "gconfaccess.hxx"
-#include "orbit.h"
namespace {
@@ -161,10 +160,13 @@ Service::Service(): enabled_(false) {
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
desktop;
- enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) &&
- ((orbit_major_version == 2 && orbit_minor_version >= 8) ||
- orbit_major_version > 2);
+ enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME"))
// ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
+ // But ORBit-2 version 2.8 was released in 2003 and ORBit is almost obsolete now.
+ /* &&
+ ((orbit_major_version == 2 && orbit_minor_version >= 8) ||
+ orbit_major_version > 2)*/;
+
}
}
Modified: openoffice/trunk/main/shell/source/backends/gconfbe/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/backends/gconfbe/makefile.mk?rev=1812807&r1=1812806&r2=1812807&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/backends/gconfbe/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/backends/gconfbe/makefile.mk Sat Oct 21 06:15:07 2017
@@ -42,7 +42,7 @@ CFLAGS+=-DENABLE_LOCKDOWN
.IF "$(ENABLE_GCONF)"!=""
COMPILER_WARN_ALL=TRUE
-PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
+PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0
.INCLUDE: pkg_config.mk
.IF "$(OS)" == "SOLARIS"