Enough with that...

peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess

reverting the whole mess for now...
to be resubmited when a bit less borked...

This reverts commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a.
This reverts commit faef2e51d0c7b74334a11400b205daf382805780.
This reverts commit 057ce1fe2911f51be97199bf95e175db8aebfa42.
This reverts commit a7d34af344900233ba08aee2a56a3daf85ab2421.
This reverts commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad.
This reverts commit 433b43bcd2dbd146a9d6342fab0704d653c50d29.
This reverts commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8.

31 files changed, 325 insertions, 324 deletions

diff --git a/Makefile.top b/Makefile.top
index d8fee074ad13..acdfcb90b0f6 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -105,7 +105,6 @@ jvmaccess\
 jvmfwk\
 l10ntools\
 languagetool\
-lcms2\
 libcdr\
 libcmis\
 libmspub\
@@ -119,7 +118,6 @@ libwps\
 lingucomponent\
 linguistic\
 lotuswordpro\
-lpsolve\
 mdds\
 more_fonts\
 mythes\
@@ -233,6 +231,8 @@ liblangtag\
 libxml2\
 libxmlsec\
 libxslt\
+lcms2\
+lpsolve\
 migrationanalysis\
 moz\
 mysqlc\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index fe270c3edaa5..bb6cfc2eb897 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,LCMS2,lcms2) \
 	libcdr \
 	libcmis \
 	libmspub \
@@ -107,7 +106,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
-	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	MathMLDTD \
 	mdds \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bbf352f31195..a1fc086a5990 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -878,6 +878,7 @@ gb_LinkTarget__use_graphite :=
 
 endif # SYSTEM_GRAPHITE
 
+
 ifeq ($(SYSTEM_ICU),YES)
 
 define gb_LinkTarget__use_icudata
@@ -909,7 +910,7 @@ else
 gb_ICU_suffix:=
 endif
 
-# icudata and icui18n is called icudt and icuin when built with MSVC :-/
+# icudata and icui18n is called icudt and icuin when built with MSVC :-(
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	icudt \
@@ -1218,7 +1219,7 @@ ifeq ($(SYSTEM_LCMS2),YES)
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	$(LCMS2_CFLAGS) \
+    $(LCMS2_CFLAGS) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
 
@@ -1233,9 +1234,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_lcms2
-$(call gb_LinkTarget_use_external_project,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
+	-I$(OUTDIR)/inc/lcms2 \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -1251,17 +1251,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 ))
 
 define gb_LinkTarget__use_lcms2
-$(call gb_LinkTarget_use_external_project,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
+	-I$(OUTDIR)/inc/lcms2 \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
-
-endef
-
-define gb_ExternalProject__use_lcms2
-$(call gb_ExternalProject_use_package,$(1),lcms2)
+$(call gb_LinkTarget_use_libraries,$(1),\
+	lcms2 \
+)
 
 endef
 
@@ -1271,11 +1267,8 @@ endif # SYSTEM_LCMS2
 
 ifeq ($(SYSTEM_LPSOLVE),YES)
 
-define gb_LinkTarget__use_lpsolve
+define gb_LinkTarget__use_lpsolve55
 $(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
-$(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_LPSOLVE \
-))
 
 endef
 
@@ -1285,14 +1278,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	lpsolve55 \
 ))
 
-define gb_LinkTarget__use_lpsolve
+define gb_LinkTarget__use_lpsolve55
 $(call gb_LinkTarget_use_libraries,$(1),\
 	lpsolve55 \
 )
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,lpsolve) \
-	$$(INCLUDE) \
-)
 
 endef
 
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c9b7b9f8ffca..752bfdc35875 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -102,7 +102,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	jvmfwk \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,LCMS2,lcms2) \
 	libcdr \
 	libcmis \
 	libmspub \
@@ -116,7 +115,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
-	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	MathMLDTD \
 	mdds \
 	Mesa \
diff --git a/config_host.mk.in b/config_host.mk.in
index 3b2d42ee4106..48758f172966 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -311,7 +311,6 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
 export L10N_MODULE=@L10N_MODULE@
 export LCMS2_CFLAGS=@LCMS2_CFLAGS@
 export LCMS2_LIBS=@LCMS2_LIBS@
-export LCMS2_TARBALL=@LCMS2_TARBALL@
 ifneq ($(strip @LDFLAGS@),)
 export LDFLAGS=@LDFLAGS@
 endif
@@ -341,7 +340,6 @@ export LIBXML_LIBS=@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=@LIBXSLT_LIBS@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
-export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@
 @x_Cygwin@ export LS=@WIN_LS@
 export MANDIR=@MANDIR@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
diff --git a/configure.ac b/configure.ac
index 877a72faf6a6..9517836e9b8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7042,17 +7042,15 @@ if test "$with_system_lcms2" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LCMS2=NO
+    BUILD_TYPE="$BUILD_TYPE LCMS2"
     LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2"
     if test $_os = Darwin; then
         LCMS2_CFLAGS="$LCMS2_CFLAGS -Wno-long-long"
     fi
     LCMS2_LIBS="-L${OUTDIR}/lib -llcms2"
-    LCMS2_TARBALL="861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz"
-    BUILD_TYPE="$BUILD_TYPE LCMS2"
 fi
 AC_SUBST(SYSTEM_LCMS2)
 AC_SUBST(LCMS2_CFLAGS)
-AC_SUBST(LCMS2_TARBALL)
 AC_SUBST(LCMS2_LIBS)
 AC_SUBST([MINGW_LCMS2_DLL])
 
@@ -8957,11 +8955,9 @@ if test "$with_system_lpsolve" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LPSOLVE=NO
-    LPSOLVE_TARBALL="26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
     BUILD_TYPE="$BUILD_TYPE LPSOLVE"
 fi
 AC_SUBST(SYSTEM_LPSOLVE)
-AC_SUBST(LPSOLVE_TARBALL)
 AC_SUBST([MINGW_LPSOLVE_DLL])
 
 dnl ===================================================================
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
deleted file mode 100644
index 628930f321e3..000000000000
--- a/lcms2/ExternalPackage_lcms2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
-$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
-
-$(eval $(call gb_ExternalPackage_add_file,lcms2,inc/lcms2/lcms2.h,include/lcms2.h))
-
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib))
-else ifeq ($(filter-out IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a))
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2.dll,src/.libs/liblcms2.dll))
-else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll))
-endif
-else
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
deleted file mode 100644
index ef677f2c72bf..000000000000
--- a/lcms2/ExternalProject_lcms2.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,lcms2))
-
-$(eval $(call gb_ExternalProject_use_unpacked,lcms2,lcms2))
-
-$(eval $(call gb_ExternalProject_use_package,lcms2,hunspell))
-
-$(eval $(call gb_ExternalProject_register_targets,lcms2,\
-	build \
-))
-
-ifeq ($(COM),MSC)
-
-ifeq ($(filter-out 14 13,$(COMEX)),)
-$(call gb_ExternalProject_get_state_target,lcms2,build):
-	cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \
-	&& MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \
-	$(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110) \
-	&& touch $@
-else
-$(call gb_ExternalProject_get_state_target,lcms2,build):
-	cd $(EXTERNAL_WORKDIR)/VC2008/lcms2_DLL \
-	&& $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" \
-	&& touch $@
-endif
-else
-$(call gb_ExternalProject_get_state_target,lcms2,build):
-	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure --without-jpeg --without-tiff --with-pic \
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	CPPFLAGS=" $(SOLARINC)" \
-	$(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \
-	&& cd src \
-	&& $(MAKE) \
-	&& touch $@
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/lcms2/Makefile b/lcms2/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/lcms2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/lcms2/Module_lcms2.mk b/lcms2/Module_lcms2.mk
deleted file mode 100644
index 898af93bce76..000000000000
--- a/lcms2/Module_lcms2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,lcms2))
-
-ifeq ($(SYSTEM_LCMS2),NO)
-$(eval $(call gb_Module_add_targets,lcms2,\
-	UnpackedTarball_lcms2 \
-	ExternalPackage_lcms2 \
-	ExternalProject_lcms2 \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/lcms2/UnpackedTarball_lcms2.mk b/lcms2/UnpackedTarball_lcms2.mk
deleted file mode 100644
index 4d6cfda74a48..000000000000
--- a/lcms2/UnpackedTarball_lcms2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,lcms2))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
-
-$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
-	lcms2/lcms2.patch \
-	lcms2/lcms2-2.4-windows.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
new file mode 100644
index 000000000000..01011f204c1c
--- /dev/null
+++ b/lcms2/makefile.mk
@@ -0,0 +1,115 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=lcms2
+TARGET=so_lcms2
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=lcms2-2.4
+TARFILE_MD5=861ef15fa0bc018f9ddc932c4ad8b6dd
+
+PATCH_FILES = lcms2.patch
+
+.IF "$(SYSTEM_LCMS2)" == "YES"
+@all:
+    @echo "Using system littlecms2..."
+.ENDIF
+
+.IF "$(GUI)$(COM)"=="WNTMSC"
+
+PATCH_FILES += lcms2-2.4-windows.patch
+
+CONFIGURE_DIR=.
+
+CONFIGURE_ACTION =
+
+.IF "$(CCNUMVER)" >= "001700000000"
+BUILD_DIR=Projects/VC2010/lcms2_DLL
+BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 /p:PlatformToolset=v110
+.ELIF "$(CCNUMVER)" >= "001600000000"
+BUILD_DIR=Projects/VC2010/lcms2_DLL
+BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2
+.ELSE
+BUILD_DIR=Projects/VC2008/lcms2_DLL
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32"
+.ENDIF
+
+.ELSE #"$(GUI)$(COM)"!="WNTMSC"
+
+CONFIGURE_DIR=.
+BUILD_DIR=src
+
+CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" ./configure --without-jpeg --without-tiff --with-pic --enable-shared --disable-static
+
+.IF "$(CROSS_COMPILING)" == "YES"
+CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+    --prefix=/@.__________________________________________________$(EXTRPATH)
+.END
+
+.IF "$(OS)" == "IOS" || "$(OS)" == "ANDROID" 
+CONFIGURE_ACTION += --disable-shared
+.ENDIF
+
+BUILD_ACTION = $(GNUMAKE) -j$(PARALLELISM)
+
+.ENDIF # "$(GUI)$(COM)"=="WNTMSC"
+
+OUT2INC+=include$/lcms2*.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=src$/.libs$/liblcms2.*.dylib
+.ELIF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" 
+OUT2LIB+=src$/.libs$/liblcms2.a
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=src$/.libs$/liblcms2.dll.a
+OUT2BIN+=src$/.libs$/*.dll
+.ELSE
+OUT2LIB+=bin$/lcms2.lib
+OUT2BIN+=bin$/lcms2.dll
+.ENDIF
+.ELSE
+OUT2LIB+=src$/.libs$/liblcms2.so*
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/lcms2/prj/build.lst b/lcms2/prj/build.lst
index e9c203e5b484..551f0f385474 100644
--- a/lcms2/prj/build.lst
+++ b/lcms2/prj/build.lst
@@ -1,2 +1,3 @@
 lcms	lcms2	: soltools ZLIB:zlib NULL
-lcms	lcms2/prj nmake	-	all	lcms_prj NULL
+lcms	lcms2	usr1	-	all	lcms_mkout NULL
+lcms	lcms2	nmake	-	all	lcms_libwpd NULL
diff --git a/lcms2/prj/d.lst b/lcms2/prj/d.lst
index e69de29bb2d1..b79227eff87f 100644
--- a/lcms2/prj/d.lst
+++ b/lcms2/prj/d.lst
@@ -0,0 +1,11 @@
+mkdir: %_DEST%\inc\lcms2
+..\%__SRC%\inc\*.h %_DEST%\inc\lcms2\*.h
+..\%__SRC%\lib\liblcms2.so.2 %_DEST%\lib\liblcms2.so.2
+..\%__SRC%\lib\liblcms2.a %_DEST%\lib\liblcms2.a
+symlink: %_DEST%\lib\liblcms2.so.2 %_DEST%\lib\liblcms2.so
+..\%__SRC%\lib\liblcms2.2.dylib %_DEST%\lib\liblcms2.2.dylib
+symlink: %_DEST%\lib\liblcms2.2.dylib %_DEST%\lib\liblcms2.dylib
+..\%__SRC%\lib\liblcms2.so %_DEST%\lib\liblcms2.so
+..\%__SRC%\lib\*.lib %_DEST%\lib
+..\%__SRC%\lib\liblcms2.dll.a %_DEST%\lib\liblcms2.dll.a
+..\%__SRC%\bin\*.dll %_DEST%\bin
diff --git a/lcms2/prj/dmake b/lcms2/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lcms2/prj/dmake
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 0f894f4a5054..83267dda5fee 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libcdr,\
-	lcms2 \
 	wpd \
 	wpg \
 ))
diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
deleted file mode 100644
index 7fcf0c233ec8..000000000000
--- a/lpsolve/ExternalPackage_lpsolve.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
-$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
-
-ifeq ($(GUI),WNT)
-ifeq ($(COM),GCC)
-ifneq ($(GUI_FOR_BUILD),WNT)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(GUI_FOR_BUILD)
-else # $(COM)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
-endif # $(COM)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
-else # $(GUI)
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
-else # $(OS)
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
-else # DISABLE_DYNLOADING
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so))
-endif # $(DISABLE_DYNLOADING)
-endif # $(OS)
-endif # $(GUI)
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
deleted file mode 100644
index 97f3428927e3..000000000000
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
-
-$(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve))
-
-$(eval $(call gb_ExternalProject_use_package,lpsolve,hunspell))
-
-$(eval $(call gb_ExternalProject_register_targets,lpsolve,\
-	build \
-))
-
-ifeq ($(GUI),WNT)
-ifeq ($(COM),GCC)
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& $(if $(filter WNT,$(GUI_FOR_BUILD)), \
-	$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
-	$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
-	cmd /c cgcc.bat, sh ccc) \
-	&& touch $@
-else # $(COM)!=GCC
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& LIB="$(ILIB)" cmd /c cvc6.bat \
-	&& touch $@
-endif # $(COM)
-else # $(GUI)!=WNT
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
-	$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc,ccc))) \
-	&& touch $@
-endif # $(GUI)
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Makefile b/lpsolve/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/lpsolve/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Module_lpsolve.mk b/lpsolve/Module_lpsolve.mk
deleted file mode 100644
index 420053467f6d..000000000000
--- a/lpsolve/Module_lpsolve.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,lpsolve))
-
-ifeq ($(SYSTEM_LPSOLVE),NO)
-ifneq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,lpsolve,\
-	UnpackedTarball_lpsolve \
-	ExternalPackage_lpsolve \
-	ExternalProject_lpsolve \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
deleted file mode 100644
index fc376b345b7d..000000000000
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,lpsolve))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
-
-ifeq ($(GUI_FOR_BUILD),WNT)
-
-$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve_5.5-windows.patch \
-))
-
-else
-
-$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve-aix.patch \
-	lpsolve/lp_solve-fixed-warn.patch \
-	lpsolve/lp_solve_5.5.patch \
-))
-
-$(eval $(call gb_UnpackedTarball_add_file,lpsolve,\
-	lpsolve/lpsolve55/ccc.static,lpsolve/ccc.static))
-
-endif
-# vim: set noet sw=4 ts=4:
-
-
diff --git a/lpsolve/ccc.static b/lpsolve/ccc.static
deleted file mode 100644
index 3f9bba8b670c..000000000000
--- a/lpsolve/ccc.static
+++ /dev/null
@@ -1,11 +0,0 @@
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+$AR -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch
index 28f7c71de5e0..1a76c32f4bbd 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -43,10 +43,9 @@
 @@ -14,15 +14,4 @@
  set c=cl
  
--rc lpsolve.rc
-+rc %SOLARINC% lpsolve.rc
+ rc lpsolve.rc
 -%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
 -rem /link /LINK50COMPAT
 -
 -if exist a.obj del a.obj
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index cea61168913d..8b5702be8cae 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -98,3 +98,53 @@
  fi
  
  rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig	Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris	Sun May 22 11:19:48 2011
+@@ -1 +1,31 @@
+-dummy
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++c=$CC
++
++if [ "$CPU" = "U" -o "$CPU" = "X" ]
++then
++  extra_cflags=-m64
++  extra_linkflags=-m64
++fi
++
++def=
++so=
++if [ "$PLATFORM" = "SCO_UNIX" ]
++then def='-dy -K PIC -DNOLONGLONG'
++     dl=-lc
++else dl=-ldl
++     so=y
++fi
++
++opts='-xO3'
++
++$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ranlib liblpsolve55.a
++
++if [ "$so" != "" ]
++then
++  $c $extra_cflags -K PIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++  $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
++fi
++
++rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.static
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.static
+@@ -1,1 +1,11 @@
+-dummy
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
++
++opts='-O3'
++
++def=
++
++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
++ls -l
++$AR -r liblpsolve55.a $obj
++rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
new file mode 100644
index 000000000000..b2f12aabfdd5
--- /dev/null
+++ b/lpsolve/makefile.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=lpsolve
+TARGET=lpsolve
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(OS)" != "IOS"
+
+TARFILE_NAME=lp_solve_5.5
+TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
+
+.IF "$(GUI_FOR_BUILD)"=="WNT"
+PATCH_FILES=lp_solve_5.5-windows.patch
+.ELSE
+PATCH_FILES=\
+    lp_solve_5.5.patch \
+    lp_solve-aix.patch \
+    lp_solve-fixed-warn.patch
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.static
+.ENDIF
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
+CONFIGURE_FLAGS+=--enable-static --disable-shared
+.ENDIF
+
+BUILD_DIR=lpsolve55
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+lpsolve_LDFLAGS=-shared-libgcc
+.ENDIF
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
+.ENDIF
+.IF "$(GUI_FOR_BUILD)"=="WNT"
+BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
+.ELSE
+BUILD_ACTION=sh ccc
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
+.ENDIF
+.ELSE
+BUILD_ACTION=cmd /c cvc6.bat
+OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
+.ENDIF
+OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
+.ELSE
+.IF "$(OS)"=="MACOSX"
+.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose
+BUILD_ACTION=sh ccc.osx
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
+.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
+BUILD_ACTION=sh ccc.static
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
+.ELSE
+.IF "$(COMNAME)"=="sunpro5"
+BUILD_ACTION=sh ccc.solaris
+.ELIF "$(OS)$(COM)"=="AIXGCC"
+BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh ccc.aix.gcc
+.ELSE
+BUILD_ACTION=sh ccc
+.ENDIF
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+.ENDIF
+.ENDIF
+
+OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	set_ext.mk
+
+.ENDIF
+
+.INCLUDE :	target.mk
+
+.IF "$(OS)" != "IOS"
+
+.INCLUDE :	tg_ext.mk
+
+.ENDIF
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index e69de29bb2d1..bf8d87c4eef0 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -0,0 +1,11 @@
+mkdir: %_DEST%\inc\lpsolve
+
+..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
+..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
+..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
+..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
+..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a
+..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
+..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
+
diff --git a/lpsolve/prj/dmake b/lpsolve/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lpsolve/prj/dmake
diff --git a/ooo.lst.in b/ooo.lst.in
index c9ecb9e10aa1..17bc578c4a63 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -4,6 +4,7 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
@@ -31,6 +32,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
+861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
 fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 @AFMS_TARBALL@
 @APACHE_COMMONS_CODEC_TARBALL@
@@ -71,9 +73,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 @JFREEREPORT_SAC_TARBALL@
 @JPEG_TARBALL@
 @LANGUAGETOOL_TARBALL@
-@LCMS2_TARBALL@
 @LIBRSVG_TARBALL@
-@LPSOLVE_TARBALL@
 @MDDS_TARBALL@
 @MOZ_TARBALL@
 @MSPUB_TARBALL@
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 52f99ccc980f..578bd8824bc5 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_use_libraries,solver,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_external,solver,lpsolve))
+$(eval $(call gb_Library_use_external,solver,lpsolve55))
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
 	sccomp/source/solver/solver \
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 8e92c9ab9c96..fa506953d3d4 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -30,11 +30,7 @@
 #define WINAPI __stdcall
 #define LoadInverseLib FALSE
 #define LoadLanguageLib FALSE
-#ifdef SYSTEM_LPSOLVE
 #include <lpsolve/lp_lib.h>
-#else
-#include <lp_lib.h>
-#endif
 #undef LANGUAGE_NONE
 
 #include "solver.hxx"
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 10c423a8c2a0..8051c98bb404 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf ICU:icu JPEG:jpeg LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL