diff options
| -rw-r--r-- | Makefile.top | 2 | ||||
| -rw-r--r-- | Module_tail_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | libcdr/prj/build.lst | 2 | ||||
| -rw-r--r-- | libmspub/prj/build.lst | 2 | ||||
| -rw-r--r-- | libvisio/prj/build.lst | 2 | ||||
| -rw-r--r-- | libwpg/Makefile | 7 | ||||
| -rw-r--r-- | libwpg/Module_libwpg.mk | 22 | ||||
| -rw-r--r-- | libwpg/Package_libwpg.mk | 20 | ||||
| -rw-r--r-- | libwpg/StaticLibrary_wpg.mk | 35 | ||||
| -rw-r--r-- | libwpg/UnpackedTarball_wpg.mk | 14 | ||||
| -rw-r--r-- | libwpg/libwpg-0.2.1-build.patch | 11 | ||||
| -rw-r--r-- | libwpg/makefile.mk | 65 | ||||
| -rw-r--r-- | libwpg/prj/d.lst | 6 | ||||
| -rw-r--r-- | libwpg/prj/dmake | 0 | ||||
| -rw-r--r-- | ooo.lst.in | 2 | ||||
| -rw-r--r-- | tail_build/prj/build.lst | 2 | ||||
| -rw-r--r-- | writerperfect/prj/build.lst | 2 |
20 files changed, 110 insertions, 90 deletions
diff --git a/Makefile.top b/Makefile.top index 8a96a66104e0..b0d0279ec175 100644 --- a/Makefile.top +++ b/Makefile.top @@ -89,6 +89,7 @@ l10ntools\ libcdr\ libmspub\ libvisio\ +libwpg\ libwps\ lingucomponent\ linguistic\ @@ -216,7 +217,6 @@ liborcus\ libpng\ librsvg\ libwpd\ -libwpg\ libxml2\ libxmlsec\ libxslt\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 33ec2e1f3c9c..4cdeb969efed 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ libcdr \ libmspub \ libvisio \ + libwpg \ libwps \ lingucomponent \ linguistic \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 791cdff74ce5..f90b5da934ec 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ libcdr \ libmspub \ libvisio \ + libwpg \ libwps \ lingucomponent \ linguistic \ diff --git a/config_host.mk.in b/config_host.mk.in index b35aa222779d..15c0a743ba42 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -622,6 +622,7 @@ export WPD_CFLAGS=@WPD_CFLAGS@ export WPD_LIBS=@WPD_LIBS@ export WPG_CFLAGS=@WPG_CFLAGS@ export WPG_LIBS=@WPG_LIBS@ +export WPG_TARBALL=@WPG_TARBALL@ export WPS_CFLAGS=@WPS_CFLAGS@ export WPS_LIBS=@WPS_LIBS@ export WPS_TARBALL=@WPS_TARBALL@ diff --git a/configure.in b/configure.in index f5cb450534e6..9476f3500225 100644 --- a/configure.in +++ b/configure.in @@ -6792,11 +6792,12 @@ elif test $_os = iOS; then else AC_MSG_RESULT([internal]) SYSTEM_LIBWPG=NO - BUILD_TYPE="$BUILD_TYPE LIBWPG" + WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 fi AC_SUBST(SYSTEM_LIBWPG) AC_SUBST(WPG_CFLAGS) AC_SUBST(WPG_LIBS) +AC_SUBST(WPG_TARBALL) dnl =================================================================== dnl Check whether freetype2 supports emboldening diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst index a3a0e2c7e602..5ce6e7d55d56 100644 --- a/libcdr/prj/build.lst +++ b/libcdr/prj/build.lst @@ -1,3 +1,3 @@ -cdr libcdr : LIBWPD:libwpd LIBWPG:libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL +cdr libcdr : LIBWPD:libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL cdr libcdr usr1 - all cdr_mkout NULL cdr libcdr nmake - all cdr_libcdr NULL diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst index 597c5740b50c..2543c8f72f4f 100644 --- a/libmspub/prj/build.lst +++ b/libmspub/prj/build.lst @@ -1,3 +1,3 @@ -mspub libmspub : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib BOOST:boost soltools NULL +mspub libmspub : LIBWPD:libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL mspub libmspub usr1 - all mspub_mkout NULL mspub libmspub nmake - all mspub_libmspub NULL diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst index dd788b5b53fb..98d73643b704 100644 --- a/libvisio/prj/build.lst +++ b/libvisio/prj/build.lst @@ -1,3 +1,3 @@ -vsd libvisio : LIBWPD:libwpd LIBWPG:libwpg BOOST:boost soltools NULL +vsd libvisio : LIBWPD:libwpd libwpg BOOST:boost soltools NULL vsd libvisio usr1 - all vsd_mkout NULL vsd libvisio nmake - all vsd_libvisio NULL diff --git a/libwpg/Makefile b/libwpg/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/libwpg/Makefile @@ -0,0 +1,7 @@ +# -*- 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/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk new file mode 100644 index 000000000000..9e271dc08511 --- /dev/null +++ b/libwpg/Module_libwpg.mk @@ -0,0 +1,22 @@ +# -*- 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,libwpg)) + +ifeq ($(SYSTEM_LIBWPG),NO) + +$(eval $(call gb_Module_add_targets,libwpg,\ + Package_libwpg \ + StaticLibrary_wpg \ + UnpackedTarball_wpg \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/libwpg/Package_libwpg.mk b/libwpg/Package_libwpg.mk new file mode 100644 index 000000000000..6a1f6a4a3b99 --- /dev/null +++ b/libwpg/Package_libwpg.mk @@ -0,0 +1,20 @@ +# -*- 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_Package_Package,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib))) + +$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg)) + +$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\ + libwpg.h \ + WPGPaintInterface.h \ + WPGraphics.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libwpg/StaticLibrary_wpg.mk b/libwpg/StaticLibrary_wpg.mk new file mode 100644 index 000000000000..6ce7499877b8 --- /dev/null +++ b/libwpg/StaticLibrary_wpg.mk @@ -0,0 +1,35 @@ +# -*- 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_StaticLibrary_StaticLibrary,wpglib)) + +$(eval $(call gb_StaticLibrary_use_unpacked,wpglib,wpg)) + +$(eval $(call gb_StaticLibrary_use_package,wpglib,libwpg_inc)) + +$(eval $(call gb_StaticLibrary_use_externals,wpglib,\ + wpd \ +)) + +$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpglib,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\ + UnpackedTarball/wpg/src/lib/WPG1Parser \ + UnpackedTarball/wpg/src/lib/WPG2Parser \ + UnpackedTarball/wpg/src/lib/WPGBitmap \ + UnpackedTarball/wpg/src/lib/WPGColor \ + UnpackedTarball/wpg/src/lib/WPGDashArray \ + UnpackedTarball/wpg/src/lib/WPGHeader \ + UnpackedTarball/wpg/src/lib/WPGInternalStream \ + UnpackedTarball/wpg/src/lib/WPGraphics \ + UnpackedTarball/wpg/src/lib/WPGSVGGenerator \ + UnpackedTarball/wpg/src/lib/WPGXParser \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwpg/UnpackedTarball_wpg.mk new file mode 100644 index 000000000000..00c127c77449 --- /dev/null +++ b/libwpg/UnpackedTarball_wpg.mk @@ -0,0 +1,14 @@ +# -*- 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,wpg)) + +$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/libwpg/libwpg-0.2.1-build.patch b/libwpg/libwpg-0.2.1-build.patch deleted file mode 100644 index 1b9240e19dc8..000000000000 --- a/libwpg/libwpg-0.2.1-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libwpg-0.2.1/src/lib/makefile.mk 2011-09-12 09:04:43.000000000 +0200 -+++ misc/build/libwpg-0.2.1/src/lib/makefile.mk 2011-10-05 14:47:18.028693834 +0200 -@@ -17,7 +17,7 @@ - .ENDIF - - .IF "$(SYSTEM_LIBWPD)" == "YES" --INCPRE+=$(LIBWPD_CFLAGS) -I.. -+INCPRE+=$(WPD_CFLAGS) -I.. - .ELSE - INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd - .ENDIF diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk deleted file mode 100644 index 7888b55133bc..000000000000 --- a/libwpg/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# 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=wpg -TARGET=wpg - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_LIBWPG)" == "YES" -@all: - @echo "Using system libwpg..." -.ENDIF - -# libwpg depends on the libwpd framework -.IF "$(SYSTEM_LIBWPD)" == "YES" -INCPRE+=$(WPD_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd -INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream -.ENDIF - -TARFILE_NAME=libwpg-0.2.1 -TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67 - -BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -BUILD_DIR=src/lib - -PATCH_FILES=\ - libwpg-0.2.1-build.patch - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst index a6a84a396e28..e69de29bb2d1 100644 --- a/libwpg/prj/d.lst +++ b/libwpg/prj/d.lst @@ -1,6 +0,0 @@ -mkdir: %_DEST%\inc\libwpg -..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\ -..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\ -..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\ -..\%__SRC%\lib\*.a %_DEST%\lib\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/libwpg/prj/dmake b/libwpg/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/libwpg/prj/dmake +++ /dev/null diff --git a/ooo.lst.in b/ooo.lst.in index 08658778f28a..83e8425cf584 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -81,7 +81,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz -9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 +@WPG_TARBALL@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 @WPS_TARBALL@ @MDDS_TARBALL@ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 7ddeefd19df9..b77f04f3352c 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst index 2ca4fe6ddb95..526065e52bcd 100644 --- a/writerperfect/prj/build.lst +++ b/writerperfect/prj/build.lst @@ -1,3 +1,3 @@ -wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL +wp writerperfect : libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL wp writerperfect usr1 - all wp_mkout NULL wp writerperfect\prj nmake - all wp_prj NULL |