mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPLv2 subset improvements.

Browse Source
This commit is contained in:
Michael Meeks 2013-06-04 14:02:48 +01:00
parent ea9b4a6946
commit c32c11fbd4
23 changed files with 115 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@ -128,6 +128,7 @@ export ENABLE_KDE4=@ENABLE_KDE4@
export ENABLE_KDE=@ENABLE_KDE@
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@
export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@

2
config_host/config_lgpl.h.in
View File

@ -5,7 +5,7 @@
#ifndef CONFIG_LGPL_H
#define CONFIG_LGPL_H
#define MPL_HAVE_SUBSET 0
#include <config_mpl.h>
#if MPL_HAVE_SUBSET
# error "Attempting to compile LGPL code into MPL subset"

9
config_host/config_mpl.h.in Normal file
View File

@ -0,0 +1,9 @@
/* config_host/config_mpl.h. Generated from config_mpl.h.in by configure. */
#ifndef CONFIG_MPL_H
#define CONFIG_MPL_H
#define MPL_HAVE_SUBSET 0
#endif

44
configure.ac
View File

@ -569,6 +569,12 @@ dragonfly*)
linux-android*)
build_gstreamer=no
build_gstreamer_0_10=no
enable_lotuswordpro=no
enable_neon=no
enable_mpl_subset=yes
enable_opengl=no
enable_lpsolve=no
with_theme="tango"
test_cups=no
test_dbus=no
test_fontconfig=no
@ -695,6 +701,12 @@ AC_ARG_ENABLE(ext-wiki-publisher,
AS_HELP_STRING([--enable-ext-wiki-publisher],
[Enable the Wiki Publisher extension.])
)
AC_ARG_ENABLE(lpsolve,
AS_HELP_STRING([--disable-lpsolve],
[Disable compilation of the lp solve solver ])
)
###############################################################################
dnl ---------- *** ----------
@ -6913,10 +6925,14 @@ AC_SUBST(WINEGCC)
if test $_os = iOS; then
enable_mpl_subset=yes
enable_opengl=no
enable_lotuswordpro=no
enable_lpsolve=no
enable_postgresql_sdbc=no
enable_lotuswordpro=no
enable_neon=no
enable_extension_integration=no
with_theme="tango"
with_ppds=no
fi
@ -8773,8 +8789,18 @@ AC_SUBST(MYTHES_CFLAGS)
AC_SUBST(MYTHES_LIBS)
dnl ===================================================================
dnl Checking for lpsolve
dnl How should we build the linear programming solver ?
dnl ===================================================================
ENABLE_LPSOLVE=
AC_MSG_CHECKING([whether to build with lpsolve])
if test "$enable_lpsolve" != "no"; then
ENABLE_LPSOLVE=TRUE
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_LPSOLVE)
AC_MSG_CHECKING([which lpsolve to use])
if test "$with_system_lpsolve" = "yes"; then
AC_MSG_RESULT([external])
@ -11709,7 +11735,7 @@ if test "$enable_mpl_subset" = "yes"; then
if test "$enable_lotuswordpro" = "yes"; then
AC_MSG_ERROR([need to --disable-lotuswordpro - a Lotus Word Pro file format import filter.])
fi
if test "$enable_neon" != "no"; then
if test "$enable_neon" != "no" -o "x$DISABLE_NEON" != "xTRUE"; then
AC_MSG_ERROR([need to --disable-neon - webdav support.])
fi
if test "x$enable_ext_mariadb_connector" = "xyes"; then
@ -11724,6 +11750,19 @@ if test "$enable_mpl_subset" = "yes"; then
if test "x$WITH_EXTRA_EXTENSIONS" != "x"; then
AC_MSG_ERROR([need to disable extra extensions '$WITH_EXTRA_EXTENSIONS'])
fi
for theme in $WITH_THEMES; do
case $theme in
crystal|default|hicontrast|human|oxygen)
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;;
*) : ;;
esac
done
if test "$enable_opengl" != "no" -o "x$ENABLE_OPENGL" == "xTRUE"; then
AC_MSG_ERROR([need to --disable-opengl - GL transitions support.])
fi
if test "$enable_lpsolve" != "no" -o "x$ENABLE_LPSOLVE" == "xTRUE"; then
AC_MSG_ERROR([need to --disable-lpsolve - calc linear programming solver.])
fi
MPL_SUBSET="TRUE"
AC_DEFINE(MPL_HAVE_SUBSET)
@ -11854,6 +11893,7 @@ AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_lgpl.h])
AC_CONFIG_HEADERS([config_host/config_mpl.h])
AC_CONFIG_HEADERS([config_host/config_kde4.h])
AC_CONFIG_HEADERS([config_host/config_mingw.h])
AC_CONFIG_HEADERS([config_host/config_oox.h])

2
lpsolve/Module_lpsolve.mk
View File

@ -9,8 +9,8 @@
$(eval $(call gb_Module_Module,lpsolve))
ifeq ($(ENABLE_LPSOLVE),TRUE)
ifeq ($(SYSTEM_LPSOLVE),NO)
ifneq ($(OS),IOS)
$(eval $(call gb_Module_add_targets,lpsolve,\
UnpackedTarball_lpsolve \
ExternalPackage_lpsolve \

4
postprocess/Rdb_services.mk
View File

@ -112,8 +112,10 @@ $(eval $(call gb_Rdb_add_components,services,\
xmlscript/util/xmlscript \
xmlsecurity/util/xmlsecurity \
xmlsecurity/util/xsec_fw \
$(if $(filter-out IOS,$(OS)), \
$(if $(ENABLE_LPSOLVE), \
sccomp/source/solver/solver \
) \
$(if $(filter-out IOS,$(OS)), \
writerfilter/util/writerfilter \
writerperfect/util/wpftwriter \
writerperfect/util/wpftdraw \

6
sc/Library_sc.mk
View File

@ -357,11 +357,13 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/dbgui/csvtablebox \
sc/source/ui/dbgui/dbnamdlg \
sc/source/ui/dbgui/expftext \
sc/source/ui/dbgui/fieldwnd \
$(if $(filter TRUE,$(MPL_SUBSET)),, \
sc/source/ui/dbgui/fieldwnd) \
sc/source/ui/dbgui/filtdlg \
sc/source/ui/dbgui/foptmgr \
sc/source/ui/dbgui/imoptdlg \
sc/source/ui/dbgui/pvlaydlg \
$(if $(filter TRUE,$(MPL_SUBSET)),, \
sc/source/ui/dbgui/pvlaydlg) \
sc/source/ui/dbgui/sfiltdlg \
sc/source/ui/docshell/arealink \
sc/source/ui/docshell/autostyl \

2
sc/source/ui/dbgui/fieldwnd.cxx
View File

@ -35,6 +35,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
************************************************************************/
#include <config_lgpl.h>
#include "fieldwnd.hxx"
#include <comphelper/string.hxx>

2
sc/source/ui/dbgui/pvlaydlg.cxx
View File

@ -35,6 +35,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
************************************************************************/
#include <config_lgpl.h>
#include "pvlaydlg.hxx"
#include "dpuiglobal.hxx"

2
sc/source/ui/inc/pvlaydlg.hxx
View File

@ -38,6 +38,8 @@
#ifndef SC_PVLAYDLG_HXX
#define SC_PVLAYDLG_HXX
#include <config_lgpl.h>
#include <memory>
#include <vector>

1
sc/source/ui/view/cellsh2.cxx
View File

@ -48,7 +48,6 @@
#include "filtdlg.hxx"
#include "dbnamdlg.hxx"
#include "reffact.hxx"
#include "pvlaydlg.hxx"
#include "validat.hxx"
#include "scresid.hxx"

8
sc/source/ui/view/tabvwshc.cxx
View File

@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_mpl.h>
#include "scitems.hxx"
#include <vcl/msgbox.hxx>
#include <sfx2/childwin.hxx>
@ -41,7 +43,9 @@
#include "consdlg.hxx"
#include "filtdlg.hxx"
#include "dbnamdlg.hxx"
#include "pvlaydlg.hxx"
#if ! MPL_HAVE_SUBSET
# include "pvlaydlg.hxx"
#endif
#include "areasdlg.hxx"
#include "rangeutl.hxx"
#include "crnrdlg.hxx"
@ -317,6 +321,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_OPENDLG_PIVOTTABLE:
{
#if ! MPL_HAVE_SUBSET
// all settings must be in pDialogDPObject
if( pDialogDPObject )
@ -329,6 +334,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() );
pResult = new ScPivotLayoutDlg( pB, pCW, pParent, *pDialogDPObject, pObj == NULL);
}
#endif
}
break;

2
sccomp/Module_sccomp.mk
View File

@ -19,7 +19,7 @@
$(eval $(call gb_Module_Module,sccomp))
ifneq ($(OS),IOS)
ifeq ($(ENABLE_LPSOLVE),TRUE)
$(eval $(call gb_Module_add_targets,sccomp,\
AllLangResTarget_solver \

11
sccomp/source/solver/solver.cxx
View File

@ -24,9 +24,20 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
* 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 .
*
************************************************************************/
#include "sal/config.h"
#include <config_lgpl.h>
#undef LANGUAGE_NONE
#if defined SAL_W32

1
scp2/InstallModule_calc.mk
View File

@ -10,6 +10,7 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/calc))
$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
ENABLE_LPSOLVE \
SYSTEM_LPSOLVE \
))

1
scp2/InstallModule_ooo.mk
View File

@ -31,6 +31,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_KDE \
ENABLE_KDE4 \
ENABLE_LIBLANGTAG \
ENABLE_LPSOLVE \
ENABLE_NPAPI_FROM_BROWSER \
ENABLE_NPAPI_INTO_BROWSER \
ENABLE_ONLINE_UPDATE \

8
scp2/source/calc/file_calc.scp
View File

@ -43,8 +43,6 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
STD_LIB_FILE( gid_File_Lib_Scd, scd)
STD_RES_FILE( gid_File_Res_Solver, solver)
STD_RES_FILE( gid_File_Res_Analysis, analysis)
STD_RES_FILE( gid_File_Res_Date, date)
@ -70,9 +68,15 @@ File gid_File_Exe_Scalc
End
#endif
#if defined(ENABLE_LPSOLVE)
STD_RES_FILE( gid_File_Res_Solver, solver)
#if ! defined (SYSTEM_LPSOLVE)
File gid_File_Lib_Lpsolve
PACKED_LIB_FILE_BODY;
Name = SPECIAL_NAME(lpsolve55);
End
#endif
#endif

11
slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
View File

@ -24,8 +24,19 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
* 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 .
************************************************************************/
#include <config_lgpl.h>
#include <osl/diagnose.hxx>
#include "OGLTrans_Shaders.hxx"

2
slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx
View File

@ -29,6 +29,8 @@
#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
#define INCLUDED_OGLTRANS_SHADERS_HXX_
#include <config_lgpl.h>
#define GL_GLEXT_PROTOTYPES 1
#include <GL/gl.h>
#include <GL/glext.h>

2
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
View File

@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#include <config_lgpl.h>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>

2
slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h
View File

@ -29,6 +29,8 @@
#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
#define INCLUDED_OGLTRANS_SHADERS_HXX_
#include <config_lgpl.h>
/* FIXME : Really needed ? */
#define GL_GLEXT_PROTOTYPES 1

2
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
View File

@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#include <config_lgpl.h>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>

2
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
View File

@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#include <config_lgpl.h>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>