Kaydet (Commit) 3cf557c1 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

drop gconf integration as per ESC decision

Conflicts:
	shell/source/backends/gconfbe/gconfbackend.cxx

Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@canonical.com>
üst e00697d9
......@@ -32,7 +32,7 @@ pkg install pkg:/developer/documentation-tool/doxygen@1.5.7.1-0.175.0.0.0.2.537
Compiling
---------
CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
gmake
......
......@@ -250,7 +250,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
$(if $(ENABLE_EVOAB2),evoab) \
$(if $(ENABLE_GTK),vclplug_gtk) \
$(if $(ENABLE_GTK3),vclplug_gtk3) \
$(if $(ENABLE_GCONF),gconfbe1) \
$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
$(if $(ENABLE_GIO),losessioninstall) \
$(if $(ENABLE_GIO),ucpgio1) \
......
......@@ -3066,33 +3066,6 @@ endef
endif # ENABLE_TDE
ifeq ($(ENABLE_GCONF),TRUE)
define gb_LinkTarget__use_gconf
$(call gb_LinkTarget_set_include,$(1),\
$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS)))) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_defs,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS))) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(GCONF_LIBS) \
)
endef
else # !ENABLE_GCONF
define gb_LinkTarget__use_gconf
endef
endif # ENABLE_GCONF
# PYTHON
# extra python_headers external because pyuno wrapper must not link python
ifneq ($(SYSTEM_PYTHON),)
......
......@@ -17,7 +17,6 @@ echo "--without-doxygen
--enable-extension-integration
--enable-graphite
--enable-evolution2
--enable-lockdown
--enable-online-update
--enable-dbgutil
--enable-werror
......
......@@ -128,7 +128,6 @@ export ENABLE_DIRECTX=@ENABLE_DIRECTX@
export ENABLE_EOT=@ENABLE_EOT@
export ENABLE_EVOAB2=@ENABLE_EVOAB2@
export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
export ENABLE_GCONF=@ENABLE_GCONF@
export ENABLE_GIO=@ENABLE_GIO@
export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_ORCUS=@ENABLE_ORCUS@
......@@ -146,7 +145,6 @@ export ENABLE_HEADLESS=@ENABLE_HEADLESS@
export ENABLE_JAVA=@ENABLE_JAVA@
export ENABLE_KDE4=@ENABLE_KDE4@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_LWP=@ENABLE_LWP@
......@@ -199,8 +197,6 @@ export FREEHAND_LIBS=$(gb_SPACE)@FREEHAND_LIBS@
export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@
export GCC_VERSION=@GCC_VERSION@
export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
......
......@@ -1000,11 +1000,6 @@ AC_ARG_ENABLE(fetch-external,
[Disables fetching external tarballs from web sources.])
)
AC_ARG_ENABLE(lockdown,
AS_HELP_STRING([--disable-lockdown],
[Disables the gconf integration work in LibreOffice.]),
)
AC_ARG_ENABLE(pch,
AS_HELP_STRING([--enable-pch],
[Enables precompiled header support for C++. Forced default on Windows/VC build])
......@@ -1198,11 +1193,6 @@ AC_ARG_ENABLE(sdremote-bluetooth,
[Determines whether to build sdremote with bluetooth support.
Requires dbus on Linux.]))
AC_ARG_ENABLE(gconf,
AS_HELP_STRING([--disable-gconf],
[Determines whether to use the GConf support.]),
,enable_gconf=yes)
AC_ARG_ENABLE(gio,
AS_HELP_STRING([--disable-gio],
[Determines whether to use the GIO support.]),
......@@ -10003,24 +9993,6 @@ if test -z "$build_vcl_plugins"; then
fi
AC_MSG_NOTICE([VCLplugs to be built: $build_vcl_plugins])
dnl ===================================================================
dnl GCONF check
dnl ===================================================================
ENABLE_GCONF=
AC_MSG_CHECKING([whether to enable GConf support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "iOS" -a "$enable_gconf" = "yes"; then
ENABLE_GCONF="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GCONF, gconf-2.0 gobject-2.0 )
GCONF_CFLAGS=$(printf '%s' "$GCONF_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([no])
fi
AC_SUBST(GCONF_LIBS)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(ENABLE_GCONF)
dnl ===================================================================
dnl check for dbus support
dnl ===================================================================
......@@ -11228,19 +11200,6 @@ AC_SUBST(KDE_GLIB_CFLAGS)
AC_SUBST(KDE_GLIB_LIBS)
AC_SUBST(KDE_HAVE_GLIB)
dnl ===================================================================
dnl Test for the enabling the lockdown pieces
dnl ===================================================================
AC_MSG_CHECKING([whether to enable the lockdown pieces])
ENABLE_LOCKDOWN=
if test -n "$enable_lockdown" -a "$enable_lockdown" != "no"; then
ENABLE_LOCKDOWN=TRUE
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_LOCKDOWN)
dnl ===================================================================
dnl Test whether to include Evolution 2 support
dnl ===================================================================
......
......@@ -62,7 +62,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
avmedia \
helplinker \
sax \
gconfbe1 \
fsstorage \
desktopbe1 \
localebe1 \
......
--host=arm-linux-androideabi
--disable-cairo-canvas
--disable-cups
--disable-gconf
--disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-liblangtag
--disable-lockdown
--disable-odk
--disable-postgresql-sdbc
--disable-python
......
--host=aarch64-linux-android
--disable-cairo-canvas
--disable-cups
--disable-gconf
--disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-liblangtag
--disable-lockdown
--disable-odk
--disable-postgresql-sdbc
--disable-python
......
--host=i686-linux-androideabi
--disable-cairo-canvas
--disable-cups
--disable-gconf
--disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-liblangtag
--disable-lockdown
--disable-odk
--disable-postgresql-sdbc
--disable-python
......
......@@ -14,7 +14,6 @@
--without-system-libmwaw
--enable-dbus
--enable-extension-integration
--enable-lockdown
--enable-kde4
--enable-evolution2
--enable-scripting-beanshell
......
......@@ -5,7 +5,6 @@
# Disable unnecessary stuff
--disable-cups
--disable-gconf
--disable-dconf
--disable-gio
--disable-dbus
......@@ -13,7 +12,6 @@
--disable-gstreamer-0-10
--disable-gstreamer-1-0
--disable-liblangtag
--disable-lockdown
--disable-odk
--disable-postgresql-sdbc
--disable-firebird-sdbc
......
......@@ -20,7 +20,6 @@
--enable-dbus
--enable-extension-integration
--enable-odk
--enable-lockdown
--enable-kde4
--disable-gtk3
--enable-gstreamer-0-10
......
......@@ -6,7 +6,6 @@
--disable-odk
--disable-randr-link
--enable-gstreamer-0-10
--enable-lockdown
--enable-ext-wiki-publisher
--enable-python=system
--with-alloc=system
......
#!/bin/sh
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed
# with this work for additional information regarding copyright
# ownership. The ASF licenses this file to you under the Apache
# License, Version 2.0 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
cat > /dev/null
[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
if [[ "${OS}" == "AIX" ]]; then
echo "libgconf-2.a(libgconf-2.so.4${mark64})"
else
echo "libgconf-2.so.4${mark64}"
fi
......@@ -69,7 +69,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Setup-reportbuilder.xcu \
org/openoffice/Setup-start.xcu \
org/openoffice/UserProfile-unixdesktop.xcu \
org/openoffice/VCL-gconflockdown.xcu \
org/openoffice/VCL-unixdesktop.xcu \
org/openoffice/Office/Accelerators-macosx.xcu \
org/openoffice/Office/Accelerators-reportbuilder.xcu \
......@@ -83,7 +82,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-math.xcu \
org/openoffice/Office/Common-unx.xcu \
org/openoffice/Office/Common-unixdesktop.xcu \
org/openoffice/Office/Common-gconflockdown.xcu \
org/openoffice/Office/Common-macosx.xcu \
org/openoffice/Office/Common-wnt.xcu \
org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
......@@ -111,7 +109,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Embedding-base.xcu \
org/openoffice/Office/Embedding-reportbuilder.xcu \
org/openoffice/Office/Embedding-writer.xcu \
org/openoffice/Office/Recovery-gconflockdown.xcu \
org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
org/openoffice/Office/UI/Controller-reportbuilder.xcu \
org/openoffice/TypeDetection/UISort-writer.xcu \
......
......@@ -96,22 +96,6 @@
<value xml:lang="zh-TW">13</value>
</prop>
</node>
<node oor:name="FontAntiAliasing" install:module="gconflockdown">
<prop oor:name="Enabled">
<value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingEnabled"/>
</prop>
<prop oor:name="MinPixelHeight">
<value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingMinPixelHeight"/>
</prop>
</node>
<node oor:name="Menu" install:module="gconflockdown">
<prop oor:name="DontHideDisabledEntry">
<value oor:external="com.sun.star.configuration.backend.GconfBackend DontHideDisabledEntry"/>
</prop>
<prop oor:name="ShowIconsInMenues">
<value oor:external="com.sun.star.configuration.backend.GconfBackend ShowIconsInMenues"/>
</prop>
</node>