Attachment 60304 Details for Bug 48872 – Final patch

[patch] Final patch

0001-Don-t-check-for-ORBit-2.8.patch (text/plain), 4.17 KB, created by Ross Burton on 2012-04-19 04:11:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Burton

Created: 2012-04-19 04:11:17 UTC

Size: 4.17 KB

patch

obsolete

>From 5a659d79b121306a504eea35d50e87ed25a1b94d Mon Sep 17 00:00:00 2001
>From: Ross Burton <ross.burton@intel.com>
>Date: Wed, 18 Apr 2012 13:49:39 +0100
>Subject: [PATCH] Don't check for ORBit < 2.8
>
>ORBit 2.8 was released in 2003 so let's assume that this isn't being used.  Also
>the assumption is that it's coming in through GConf, which isn't true with GConf
>3 onwards, released July 2011.
>---
> configure.in                                   |    2 +-
> shell/source/backends/gconfbe/gconfbackend.cxx |    4 +--
> shell/source/backends/gconfbe/makefile.mk      |    2 +-
> shell/source/backends/gconfbe/orbit.h          |   42 ------------------------
> 4 files changed, 3 insertions(+), 47 deletions(-)
> delete mode 100644 shell/source/backends/gconfbe/orbit.h
>
>diff --git a/configure.in b/configure.in
>index 499cbf0..742e1e4 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -8470,7 +8470,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
>diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
>index 57a1a4e..82ea9fe 100644
>--- a/shell/source/backends/gconfbe/gconfbackend.cxx
>+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
>@@ -61,7 +61,6 @@
> #include "uno/lbnames.h"
> 
> #include "gconfaccess.hxx"
>-#include "orbit.h"
> 
> namespace {
> 
>@@ -165,8 +164,7 @@ Service::Service(): enabled_(false) {
>             rtl::OUString(
>                 RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
>             desktop;
>-        enabled_ = desktop == "GNOME" && ((orbit_major_version == 2 && orbit_minor_version >= 8) || orbit_major_version > 2);
>-            // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
>+        enabled_ = desktop == "GNOME";
>     }
> }
> 
>diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk
>index 9e77a08..84ec3db 100644
>--- a/shell/source/backends/gconfbe/makefile.mk
>+++ b/shell/source/backends/gconfbe/makefile.mk
>@@ -46,7 +46,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"
>diff --git a/shell/source/backends/gconfbe/orbit.h b/shell/source/backends/gconfbe/orbit.h
>deleted file mode 100644
>index 82673a3..0000000
>--- a/shell/source/backends/gconfbe/orbit.h
>+++ /dev/null
>@@ -1,42 +0,0 @@
>-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- *
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H
>-#define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_ORBIT_H
>-
>-#include "sal/config.h"
>-
>-#if defined __GNUC__
>-#pragma GCC system_header
>-#endif
>-
>-#include <orbit/orbit.h>
>-
>-#endif
>-
>-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>-- 
>1.7.10
>

Actions: View

Attachments on bug 48872: 60248 | 60274 | 60275 | 60304