[Libreoffice-commits] core.git: 2 commits - config_host/config_features.h.in config_host.mk.in configure.ac desktop/source solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in                |    1 -
 config_host/config_features.h.in |   18 ++++++++++++++++++
 configure.ac                     |    4 ++--
 desktop/source/app/app.cxx       |    4 ++--
 solenv/gbuild/gbuild.mk          |    2 --
 5 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 8f315d9ece9dc8bfc093e4707d761e7120092618
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 26 14:06:23 2013 +0300

    Move the (unimplemented) READONLY_INSTALLSET flag into config_features.h
    
    Change-Id: Icce89cc2a3c8089aa248a176ab92b545c36b1091

diff --git a/config_host.mk.in b/config_host.mk.in
index a96bfba..88f3e34 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -149,7 +149,6 @@ export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_RANDR=@ENABLE_RANDR@
-export ENABLE_READONLY_INSTALLSET=@ENABLE_READONLY_INSTALLSET@
 export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
 export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
 export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 29da64c..3b92e87 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -88,4 +88,14 @@
 
 #define HAVE_FEATURE_MACOSX_SANDBOX 0
 
+/* READONLY_INSTALLSET - whether to treat the installation as read-only
+ *
+ * Prevents attempts by LibreOffice to write into its installation. That means
+ * at least that no "system-wide" extensions can be added, if the location for
+ * them is the traditional one. Experimental work in progress, not actually implemented.
+ */
+
+#define HAVE_FEATURE_READONLY_INSTALLSET 0
+
+
 #endif
diff --git a/configure.ac b/configure.ac
index ade9c26..ee8a35d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2819,11 +2819,10 @@ if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = YES \)
 fi
 if test "$enable_readonly_installset" = yes; then
     AC_MSG_RESULT([yes])
-    ENABLE_READONLY_INSTALLSET=YES
+    AC_DEFINE(HAVE_FEATURE_READONLY_INSTALLSET)
 else
     AC_MSG_RESULT([no])
 fi
-AC_SUBST(ENABLE_READONLY_INSTALLSET)
 
 dnl ===================================================================
 dnl Windows specific tests and stuff
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c489ee4..9681dd2 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -261,7 +261,6 @@ gb_GLOBALDEFS += \
 		DISABLE_DYNLOADING \
 		DISABLE_EXPORT \
 		DISABLE_SCRIPTING \
-		ENABLE_READONLY_INSTALLSET \
 	)
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
commit cca02d9e984d1937f6d8597de0267ebf22ae6916
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 26 13:41:10 2013 +0300

    Move OS X sandbox flag to config_features.h
    
    Change-Id: I189fa06d13a78bcaa8e17b32756076473ced3641

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3437e13..29da64c 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -80,4 +80,12 @@
 
 #define HAVE_FEATURE_AVAHI 0
 
+/* MACOSX_SANDBOX - whether LibreOffice runs in an OS X sandbox
+ *
+ * When building LibreOffice for distribution through the Mac App Store,
+ * it must be sandboxed.
+ */
+
+#define HAVE_FEATURE_MACOSX_SANDBOX 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 9eb04ea..ade9c26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2742,6 +2742,7 @@ if test $_os = Darwin; then
         AC_MSG_ERROR([OS X sandboxing requires code signing])
     elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
         ENABLE_MACOSX_SANDBOX=YES
+        AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX)
         AC_MSG_RESULT([yes])
     else
         AC_MSG_RESULT([no])
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a6888b5..137dbac 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -598,7 +598,7 @@ void Desktop::Init()
         OfficeIPCThread::Status aStatus = OfficeIPCThread::EnableOfficeIPCThread();
         if ( aStatus == OfficeIPCThread::IPC_STATUS_PIPE_ERROR )
         {
-#ifdef MACOSX
+#if HAVE_FEATURE_MACOSX_SANDBOX
             // In a sandboxed LO, on 10.8.2 at least, creating the
             // Unix domain socket fails. Ignore that as hopefully
             // people running a sandboxed LO won't attempt starting it
@@ -1159,7 +1159,7 @@ namespace {
 void restartOnMac(bool passArguments) {
 #if defined MACOSX
     OfficeIPCThread::DisableOfficeIPCThread();
-#ifdef ENABLE_MACOSX_SANDBOX
+#if HAVE_FEATURE_MACOSX_SANDBOX
     (void) passArguments; // avoid warnings
     ResMgr *resMgr = Desktop::GetDesktopResManager();
     OUString aMessage = OUString( String( ResId( STR_LO_MUST_BE_RESTARTED, *resMgr )));
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 47d6e6e..c489ee4 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -261,7 +261,6 @@ gb_GLOBALDEFS += \
 		DISABLE_DYNLOADING \
 		DISABLE_EXPORT \
 		DISABLE_SCRIPTING \
-		ENABLE_MACOSX_SANDBOX \
 		ENABLE_READONLY_INSTALLSET \
 	)