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

can now drop external dependency vigra

Browse Source 
Change-Id: I3babe33ab5be1c3521ccb8bee71239e3d8893a2f
This commit is contained in:
Caolán McNamara
2016-01-19 21:01:09 +00:00
parent 4ebe249104
commit 82cdcc392a
15 changed files with 3 additions and 1663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.fetch
View File

@@ -203,7 +203,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,RHINO,SWING_TARBALL) \
$(call fetch_Optional,SERF,SERF_TARBALL) \
$(call fetch_Optional,UCPP,UCPP_TARBALL) \
$(call fetch_Optional,VIGRA,VIGRA_TARBALL) \
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
$(call fetch_Optional,WPD,WPD_TARBALL) \
$(call fetch_Optional,WPG,WPG_TARBALL) \

17
RepositoryExternal.mk
View File

@@ -58,23 +58,6 @@ endef
endif # SYSTEM_ODBC_HEADERS
ifneq ($(SYSTEM_VIGRA),)
gb_LinkTarget__use_vigra_headers :=
else
define gb_LinkTarget__use_vigra_headers
$(call gb_LinkTarget_use_unpacked,$(1),vigra)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,vigra/include) \
$$(INCLUDE) \
)
endef
endif
ifneq ($(SYSTEM_MDDS),)
gb_ExternalProject__use_mdds_headers :=

1
config_host.mk.in
View File

@@ -576,7 +576,6 @@ export SYSTEM_REVENGE=@SYSTEM_REVENGE@
export SYSTEM_RHINO=@SYSTEM_RHINO@
export SYSTEM_SERF=@SYSTEM_SERF@
export SYSTEM_UCPP=@SYSTEM_UCPP@
export SYSTEM_VIGRA=@SYSTEM_VIGRA@
export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_WPD=@SYSTEM_WPD@
export SYSTEM_WPG=@SYSTEM_WPG@

25
configure.ac
View File

@@ -1619,7 +1619,7 @@ AC_ARG_WITH(system-headers,
AS_HELP_STRING([--with-system-headers],
[Use headers already on system -- enables all --with-system-* flags for
external packages whose headers are the only entities used i.e.
boost/vigra/odbc/sane-header(s).]),,
boost/odbc/sane-header(s).]),,
[with_system_headers="$with_system_libs"])
AC_ARG_WITH(system-jars,
@@ -1920,11 +1920,6 @@ AC_ARG_WITH(system-glm,
[Use glm already on system.]),,
[with_system_glm="$with_system_headers"])
AC_ARG_WITH(system-vigra,
AS_HELP_STRING([--with-system-vigra],
[Use vigra already on system.]),,
[with_system_vigra="$with_system_headers"])
AC_ARG_WITH(system-hunspell,
AS_HELP_STRING([--with-system-hunspell],
[Use libhunspell already on system.]),,
@@ -8829,24 +8824,6 @@ if test $_os = WINNT; then
libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/glyphy/src"])
fi
dnl ===================================================================
dnl Check for system vigra
dnl ===================================================================
AC_MSG_CHECKING([which vigra to use])
if test "$with_system_vigra" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_VIGRA=TRUE
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(vigra/copyimage.hxx, [],
[AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], [])
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE VIGRA"
SYSTEM_VIGRA=
fi
AC_SUBST(SYSTEM_VIGRA)
dnl ===================================================================
dnl Check for system odbc
dnl ===================================================================

1
download.lst
View File

@@ -148,7 +148,6 @@ export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
export SERF_TARBALL := serf-1.2.1.tar.bz2
export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
export VISIO_MD5SUM := cbee198a78b842b2087f32d33c522818
export VISIO_TARBALL := libvisio-0.1.5.tar.bz2
export WPD_MD5SUM := 79b56bcc349264d686a67994506ad199

2
external/Module_external.mk vendored
View File

@@ -92,7 +92,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,SERF,serf) \
$(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,VIGRA,vigra) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
@@ -104,7 +103,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,VIGRA,vigra) \
) \
) \
))

7
external/vigra/Makefile vendored
View File

@@ -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:

20
external/vigra/Module_vigra.mk vendored
View File

@@ -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,vigra))
ifeq ($(SYSTEM_VIGRA),)
$(eval $(call gb_Module_add_targets,vigra,\
UnpackedTarball_vigra \
))
endif
# vim: set noet sw=4 ts=4:

3
external/vigra/README vendored
View File

@@ -1,3 +0,0 @@
Computer vision library in C++ from [http://hci.iwr.uni-heidelberg.de/vigra/].
Used only by basebmp.

20
external/vigra/UnpackedTarball_vigra.mk vendored
View File

@@ -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,vigra))
$(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,vigra,\
external/vigra/vigra1.6.0.patch \
$(if $(filter GCC,$(COM)), \
external/vigra/vigra1.6.0-unused-parameters.patch) \
))
# vim: set noet sw=4 ts=4:

42
external/vigra/vigra1.6.0-unused-parameters.patch vendored
View File

@@ -1,42 +0,0 @@
--- misc/vigra1.6.0/include/vigra/basicimage.hxx 2012-01-19 22:49:11.232074631 +0100
+++ misc/build/vigra1.6.0/include/vigra/basicimage.hxx 2012-01-19 22:48:12.997439136 +0100
@@ -72,7 +72,7 @@
difference_type offset_;
};
- static void initialize(BaseType &) {}
+ static void initialize(__attribute__ ((unused)) BaseType &) {}
static reference dereference(BaseType const & d)
{ return const_cast<reference>(*(*d.line_start_ + d.offset_)); }
--- misc/vigra1.6.0/include/vigra/diff2d.hxx 2012-01-19 22:49:11.280074335 +0100
+++ misc/build/vigra1.6.0/include/vigra/diff2d.hxx 2012-01-19 22:49:00.129144170 +0100
@@ -60,7 +60,7 @@
typedef Diff const * pointer;
typedef std::random_access_iterator_tag iterator_category;
- static void initialize(BaseType &) {}
+ static void initialize(__attribute__ ((unused)) BaseType &) {}
static reference dereference(BaseType const & d)
{ return d; }
@@ -102,7 +102,7 @@
typedef Diff const * pointer;
typedef std::random_access_iterator_tag iterator_category;
- static void initialize(BaseType & /*d*/) {}
+ static void initialize(__attribute__ ((unused)) BaseType & /*d*/) {}
static reference dereference(BaseType const & d)
{ return d; }
--- misc/vigra1.6.0/include/vigra/rgbvalue.hxx
+++ misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx
@@ -184,7 +184,7 @@
/** Construct from another sequence (must have length 3!)
*/
template <class Iterator>
- RGBValue(Iterator i, Iterator end)
+ RGBValue(Iterator i, __attribute__ ((unused)) Iterator)
: Base(i[0], i[1], i[2])
{
VIGRA_STATIC_ASSERT((RGBValue_bad_color_indices<RED_IDX, GREEN_IDX, BLUE_IDX>));

1401
external/vigra/vigra1.6.0.patch vendored
View File

File diff suppressed because it is too large Load Diff

96
readlicense_oo/license/LICENSE
View File

@@ -2452,102 +2452,6 @@ UnixODBC
See LGPL Version 2.1 below
vigra
The following software may be included in this product: vigra. Use of
any of this software is governed by the terms of the license below:
The VIGRA Artistic License
(modeled after the Perl Artistic License)
Preamble
The intent of this document is to state the conditions under which
VIGRA may be copied, such that the author maintains some semblance of
artistic control over the development of the library, while giving the
users of the library the right to use and distribute VIGRA in a
more-or-less customary fashion, plus the right to make reasonable
modifications.
Definitions
"Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive
Systems Group, University of Hamburg, Germany.
"Library" refers to the collection of files distributed by the
Copyright Holder under the name "VIGRA" (including this LICENSE file
and all accompanying documentation), and derivatives of that collection
of files created through textual modification.
"Standard Version" refers to the Library if it has not been modified,
or has been modified in accordance with the wishes of the Copyright
Holder as specified below.
"You" is you, if you're thinking about using, copying, modifying or
distributing this Library.
"Freely Available" means that no fee is charged for the item. It also
means that recipients of the item may redistribute it under the same
conditions they received it.
"Reasonable copying fee" is whatever you can justify on the basis of
media cost, duplication charges, time of people involved, and so on.
(You will not be required to justify it to the Copyright Holder, but
only to the computing community at large as a market that must bear the
fee.)
License terms
1. You may make and give away verbatim copies of the Standard Version
of this Library without restriction, provided that you duplicate all of
the original copyright notices, this license, and associated
disclaimers.
2. The Standard Version of the Library may be distributed as part of a
collection of software, provided no more than a reasonable copying fee
is charged for the software collection.
3. You may apply bug fixes and portability fixes derived from the
Public Domain or from the Copyright Holder. A Library modified in such
a way shall still be considered the Standard Version.
4. You may otherwise modify your copy of this Library in any way,
provided that you insert a prominent notice in each changed file
stating how and when you changed that file, and provided that you do at
least ONE of the following:
a. place your modifications in the Public Domain or otherwise make them
Freely Available, for example by allowing the Copyright Holder to
include your modifications in the Standard Version of the Library.
b. use the modified Library only within your corporation or
organization.
c. make other distribution arrangements with the Copyright Holder.
5. You may distribute programs which use this Library in object code or
executable form without restriction.
6. Any object code generated as a result of using this Library does not
fall under the copyright of this Library, but belongs to whomever
generated it, and may be sold commercially.
7. The name of the Copyright Holder or the Library may not be used to
endorse or promote products derived from this software without specific
prior written permission.
8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL,
INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF
LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS LIBRARY.
W3C Simple API for CSS (SAC)
The following software may be included in this product: W3C Simple API

28
readlicense_oo/license/LICENSE.fodt
View File

@@ -4034,32 +4034,6 @@
<text:h text:style-name="Heading_20_2" text:outline-level="2">UnixODBC</text:h>
<text:p text:style-name="Standard">The following software may be included in this product: unixODBC. Use of any of this software is governed by the terms of the license below:</text:p>
<text:p text:style-name="Standard"><text:a xlink:type="simple" xlink:href="#7.GNU Lesser General Public License Version 2.1|outline" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">Jump to LGPL Version 2.1</text:a></text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">vigra</text:h>
<text:p text:style-name="Standard">The following software may be included in this product: vigra. Use of any of this software is governed by the terms of the license below:</text:p>
<text:h text:style-name="Heading_20_3" text:outline-level="3">The VIGRA Artistic License</text:h>
<text:p text:style-name="Standard">(modeled after the Perl Artistic License)</text:p>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Preamble</text:h>
<text:p text:style-name="Standard">The intent of this document is to state the conditions under which VIGRA may be copied, such that the author maintains some semblance of artistic control over the development of the library, while giving the users of the library the right to use and distribute VIGRA in a more-or-less customary fashion, plus the right to make reasonable modifications.</text:p>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Definitions</text:h>
<text:p text:style-name="Standard">&quot;Copyright Holder&quot; of the VIGRA library is Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany.</text:p>
<text:p text:style-name="Standard">&quot;Library&quot; refers to the collection of files distributed by the Copyright Holder under the name &quot;VIGRA&quot; (including this LICENSE file and all accompanying documentation), and derivatives of that collection of files created through <text:soft-page-break/>textual modification.</text:p>
<text:p text:style-name="Standard">&quot;Standard Version&quot; refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below.</text:p>
<text:p text:style-name="Standard">&quot;You&quot; is you, if you&apos;re thinking about using, copying, modifying or distributing this Library.</text:p>
<text:p text:style-name="Standard">&quot;Freely Available&quot; means that no fee is charged for the item. It also means that recipients of the item may redistribute it under the same conditions they received it.</text:p>
<text:p text:style-name="Standard">&quot;Reasonable copying fee&quot; is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.)</text:p>
<text:h text:style-name="Heading_20_4" text:outline-level="4">License terms</text:h>
<text:p text:style-name="Standard">1. You may make and give away verbatim copies of the Standard Version of this Library without restriction, provided that you duplicate all of the original copyright notices, this license, and associated disclaimers.</text:p>
<text:p text:style-name="Standard">2. The Standard Version of the Library may be distributed as part of a collection of software, provided no more than a reasonable copying fee is charged for the software collection.</text:p>
<text:p text:style-name="Standard">3. You may apply bug fixes and portability fixes derived from the Public Domain or from the Copyright Holder. A Library modified in such a way shall still be considered the Standard Version.</text:p>
<text:p text:style-name="Standard">4. You may otherwise modify your copy of this Library in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following:</text:p>
<text:p text:style-name="Standard">a. place your modifications in the Public Domain or otherwise make them Freely Available, for example by allowing the Copyright Holder to include your modifications in the Standard Version of the Library.</text:p>
<text:p text:style-name="Standard">b. use the modified Library only within your corporation or organization.</text:p>
<text:p text:style-name="Standard">c. make other distribution arrangements with the Copyright Holder.</text:p>
<text:p text:style-name="Standard">5. You may distribute programs which use this Library in object code or executable form without restriction.</text:p>
<text:p text:style-name="Standard">6. Any object code generated as a result of using this Library does not fall <text:soft-page-break/>under the copyright of this Library, but belongs to whomever generated it, and may be sold commercially.</text:p>
<text:p text:style-name="Standard">7. The name of the Copyright Holder or the Library may not be used to endorse or promote products derived from this software without specific prior written permission.</text:p>
<text:p text:style-name="Standard">8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</text:p>
<text:p text:style-name="Standard">IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS LIBRARY.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">W3C Simple API for CSS (SAC)</text:h>
<text:p text:style-name="Standard">The following software may be included in this product: W3C Simple API for CSS (SAC). Use of any of this software is governed by the terms of the license below:</text:p>
<text:h text:style-name="Heading_20_3" text:outline-level="3">W3C IPR SOFTWARE NOTICE</text:h>
@@ -6733,4 +6707,4 @@
<text:p text:style-name="Standard">Creative Commons may be contacted at <text:a xlink:type="simple" xlink:href="http://creativecommons.org/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://creativecommons.org/</text:a>.</text:p>
</office:text>
</office:body>
</office:document>
</office:document>

2
readlicense_oo/license/LICENSE.html
View File

File diff suppressed because one or more lines are too long