summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac18
-rw-r--r--download.lst4
-rw-r--r--external/libeot/UnpackedTarball_libeot.mk4
-rw-r--r--external/libeot/libeot-avoid-autotools-run.patch.044
-rw-r--r--vcl/source/gdi/embeddedfontshelper.cxx8
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
6 files changed, 8 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac
index e510bc6195f3..244fe0566190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7707,28 +7707,12 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_eot" = "yes"; then
AC_DEFINE([ENABLE_EOT])
AC_MSG_RESULT([yes])
- AC_MSG_CHECKING([which libeot to use])
- if test "$with_system_libeot" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_LIBEOT=YES
- AC_CHECK_HEADER([libeot.h], [],
- [AC_MSG_ERROR([libeot.h not found. install libeot])], [])
- AC_CHECK_LIB([libeot], [eot2ttf_file], [:],
- [AC_MSG_RESULT([libeot library not found or functional.])], [])
- libo_MINGW_CHECK_DLL([libeot])
- else
- AC_MSG_RESULT([internal])
- SYSTEM_LIBEOT=NO
- BUILD_TYPE="$BUILD_TYPE LIBEOT"
- fi
+ libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot >= 0.01])
else
ENABLE_EOT=
AC_MSG_RESULT([no])
fi
AC_SUBST([ENABLE_EOT])
-AC_SUBST([SYSTEM_LIBEOT])
-AC_SUBST([LIBEOT_CFLAGS])
-AC_SUBST([LIBEOT_LIBS])
dnl ===================================================================
dnl Check for system libe-book
diff --git a/download.lst b/download.lst
index ee63b4da18d9..444d6dcc223c 100644
--- a/download.lst
+++ b/download.lst
@@ -22,8 +22,8 @@ HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
-LIBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6
-export LIBEOT_TARBALL := libeot.tar.bz2
+LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
+export LIBEOT_TARBALL := libeot-0.01.tar.bz2
export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
diff --git a/external/libeot/UnpackedTarball_libeot.mk b/external/libeot/UnpackedTarball_libeot.mk
index 9b95fd2efef8..cbd1a69aa8b5 100644
--- a/external/libeot/UnpackedTarball_libeot.mk
+++ b/external/libeot/UnpackedTarball_libeot.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libeot))
$(eval $(call gb_UnpackedTarball_set_tarball,libeot,$(LIBEOT_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libeot,\
- external/libeot/libeot-avoid-autotools-run.patch.0 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libeot/libeot-avoid-autotools-run.patch.0 b/external/libeot/libeot-avoid-autotools-run.patch.0
deleted file mode 100644
index 875bda5429ed..000000000000
--- a/external/libeot/libeot-avoid-autotools-run.patch.0
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.in.dt 2013-11-12 17:02:57.555418341 +0100
-+++ Makefile.in 2013-11-12 17:04:03.100619894 +0100
-@@ -87,7 +87,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
- $(srcdir)/config.h.in depcomp $(libeot_include_HEADERS) ar-lib \
- compile config.guess config.sub install-sh missing ltmain.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps =
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -367,19 +367,6 @@ all: config.h
- .SUFFIXES: .c .lo .o .obj
- am--refresh: Makefile
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-- @for dep in $?; do \
-- case '$(am__configure_deps)' in \
-- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-- && exit 0; \
-- exit 1;; \
-- esac; \
-- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-- $(am__cd) $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -394,12 +381,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-- $(am__cd) $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
--
- config.h: stamp-h1
- @test -f $@ || rm -f stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 56611d2897b8..9d890177a2de 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -31,7 +31,7 @@ extern "C"
{
namespace libeot
{
-#include <libeot.h>
+#include <libeot/libeot.h>
} // namespace libeot
} // extern "C"
#endif
@@ -114,8 +114,8 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< io::XInputStream > st
unsigned char *nakedPointerToUncompressedFont = NULL;
libeot::EOTMetadata eotMetadata;
libeot::EOTError uncompressError =
- libeot::eot2ttf_buffer( (const unsigned char *)&fontData[0], fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
- boost::shared_ptr<unsigned char> uncompressedFont( nakedPointerToUncompressedFont, libeot::freeEOTBuffer );
+ libeot::EOT2ttf_buffer( (const unsigned char *)&fontData[0], fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
+ boost::shared_ptr<unsigned char> uncompressedFont( nakedPointerToUncompressedFont, libeot::EOTfreeBuffer );
if( uncompressError != libeot::EOT_SUCCESS )
{
SAL_WARN( "vcl.fonts", "Failed to uncompress font" );
@@ -134,7 +134,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< io::XInputStream > st
}
writtenTotal += written;
}
- sufficientFontRights = libeot::canLegallyEdit( &eotMetadata );
+ sufficientFontRights = libeot::EOTcanLegallyEdit( &eotMetadata );
libeot::EOTfreeMetadata( &eotMetadata );
}
#endif
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 572d4b9928d8..8f86255a7027 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -88,7 +88,7 @@
#include <config_eot.h>
#if ENABLE_EOT
-#include "libeot.h"
+#include <libeot/libeot.h>
#endif
using namespace vcl;