Bug 48872 - Don't check for ORBit when checking for GConf
Summary: Don't check for ORBit when checking for GConf
Status: RESOLVED FIXED
Alias: None
Product: LibreOffice
Classification: Unclassified
Component: LibreOffice (show other bugs)
Version:
(earliest affected)
Master old -3.6
Hardware: Other All
: medium normal
Assignee: Not Assigned
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-04-18 05:55 UTC by Ross Burton
Modified: 2012-05-09 06:42 UTC (History)
1 user (show)

See Also:
Crash report or crash signature:


Attachments
Patch (747 bytes, patch)
2012-04-18 05:57 UTC, Ross Burton
Details
More removal (3.67 KB, patch)
2012-04-18 13:30 UTC, Ross Burton
Details
Revised patch (3.67 KB, patch)
2012-04-18 13:37 UTC, Ross Burton
Details
Final patch (4.17 KB, patch)
2012-04-19 04:11 UTC, Ross Burton
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ross Burton 2012-04-18 05:55:17 UTC
When checking for GConf in configure.ac, it's wrong to check for ORBit.  In the old days when GConf used ORBit this would have been pulled in anyway, and GCOnf doesn't use ORBit anymore.
Comment 1 Ross Burton 2012-04-18 05:57:03 UTC
Created attachment 60248 [details]
Patch

Attachd a patch.  This is untested, I don't know if this spurious ORBit dependency is actually required by some unrelated code.
Comment 2 Ross Burton 2012-04-18 13:30:39 UTC
Created attachment 60274 [details]
More removal

Also don't check for an ancient version of ORBit (released 2003) when loading GConf (which since 2011 doesn't use ORBit).
Comment 3 Damien Lespiau 2012-04-18 13:36:00 UTC
Comment on attachment 60274 [details]
More removal

Review of attachment 60274 [details]:
-----------------------------------------------------------------

::: shell/source/backends/gconfbe/gconfbackend.cxx
@@ +164,4 @@
>              rtl::OUString(
>                  RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
>              desktop;
> +        enabled_ = desktop == "GNOME"

missing ';' :)
Comment 4 Ross Burton 2012-04-18 13:37:55 UTC
Created attachment 60275 [details]
Revised patch

Dude, are you reviewing in the pub?
Comment 5 Michael Meeks 2012-04-19 03:55:09 UTC
I'd remove the check from configure too:

--- a/configure.in
+++ b/configure.in
@@ -8472,7 +8472,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


Otherwise it compiles nicely in shell/ and looks much better - thanks ! :-)

Please can you post the patch to the list with a Subject: beginning [PATCH] - and we also need an explicit: MPL/LGPLv3+ license statement - preferably for all your contributions cf.

https://wiki.documentfoundation.org/Development/Developers#Companies

Thanks ! :-)
Comment 6 Ross Burton 2012-04-19 04:11:17 UTC
Created attachment 60304 [details]
Final patch

Revised patch, just the previous ones squashed.
Comment 7 Michael Meeks 2012-05-09 06:42:16 UTC
this got pushed already I believe :-) thanks !