Uploading libcdr 0.0.10, hoping it works

Conflicts:

	RepositoryExternal.mk
	libcdr/ExternalProject_libcdr.mk

Change-Id: Ibf21b856c0f9da276df60680513421be3c871a2d
Signed-off-by: Petr Mladek <pmladek@suse.cz>

download.lst

-CDR_MD5SUM := 3c0037fb07dea2f0bbae8386fa7c6a9a
-export CDR_TARBALL := libcdr-0.0.9.tar.bz2
+CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
+export CDR_TARBALL := libcdr-0.0.10.tar.bz2
 MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc
 export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2
 VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea

libcdr/ExternalProject_libcdr.mk

@@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \
 	&& touch $@
 else ifeq ($(VCVER),100)
@@ -39,6 +40,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& msbuild.exe libcdr.vcxproj /p:Configuration=Release \
 	&& touch $@
 else
@@ -48,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \
 	&& touch $@
 endif
@@ -56,8 +59,10 @@ else
 
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR) \
-	&& PKG_CONFIG="" \
-	./configure \
+	&& export PKG_CONFIG="" \
+	&& export ICU_LIBS=" " \
+	&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \
+	&& ./configure \
 		--with-pic \
 		--enable-static \
 		--disable-shared \

libcdr/UnpackedTarball_cdr.mk

@@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
-	libcdr/libcdr-configure.patch.1 \
-	libcdr/libcdr-issupported-exception.patch.1 \
-	libcdr/libcdr-msvc.patch \
-))
-
 # vim: set noet sw=4 ts=4:

libcdr/libcdr-issupported-exception.patch.1

-rhbz#891082: CMXDocument::isSupported: catch exceptions
-
-diff -ru cdr.old/src/lib/CMXDocument.cpp cdr/src/lib/CMXDocument.cpp
---- cdr.old/src/lib/CMXDocument.cpp
-+++ cdr/src/lib/CMXDocument.cpp
-@@ -46,20 +46,24 @@
- */
- bool libcdr::CMXDocument::isSupported(WPXInputStream *input)
- {
--  input->seek(0, WPX_SEEK_SET);
--  unsigned riff = readU32(input);
--  if (riff != FOURCC_RIFF && riff != FOURCC_RIFX)
--    return false;
--  input->seek(4, WPX_SEEK_CUR);
--  char signature_c = (char)readU8(input);
--  if (signature_c != 'C' && signature_c != 'c')
--    return false;
--  char signature_d = (char)readU8(input);
--  if (signature_d != 'M' && signature_d != 'm')
--    return false;
--  char signature_r = (char)readU8(input);
--  if (signature_r != 'X' && signature_r != 'x')
-+  try {
-+    input->seek(0, WPX_SEEK_SET);
-+    unsigned riff = readU32(input);
-+    if (riff != FOURCC_RIFF && riff != FOURCC_RIFX)
-+      return false;
-+    input->seek(4, WPX_SEEK_CUR);
-+    char signature_c = (char)readU8(input);
-+    if (signature_c != 'C' && signature_c != 'c')
-+      return false;
-+    char signature_d = (char)readU8(input);
-+    if (signature_d != 'M' && signature_d != 'm')
-+      return false;
-+    char signature_r = (char)readU8(input);
-+    if (signature_r != 'X' && signature_r != 'x')
-+      return false;
-+  } catch (...) {
-     return false;
-+  }
-   return true;
- }
- 

libcdr/prj/build.lst

-cdr	libcdr	: libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
+cdr	libcdr	: libwpd libwpg ICU:icu LCMS2:lcms2 ZLIB:zlib soltools NULL
 cdr	libcdr\prj	nmake	-	all	cdr_libcdr NULL

writerperfect/Library_wpftdraw.mk

@@ -53,6 +53,9 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
 	lcms2 \
 	libxml2 \
 	zlib \
+	icui18n \
+	icuuc \
+	icudata \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,wpftdraw,\