diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-01 13:05:06 +0200 |
| commit | 93e11e4fb697aaea63c99308f980e4c932bd1efa (patch) | |
| tree | 1892e49932d8d7b7656ae504113a40e4e39f876f /libvisio | |
| parent | a5b6a379a2d628040db98060c2adfe8f2fac5607 (diff) | |
| parent | c6786add5a58268e11aa027c47054344040db1bc (diff) | |
Merge tag 'libreoffice-4.0.3.2' into suse-4.0
Tag libreoffice-4.0.3.2
Conflicts:
basic/qa/cppunit/test_vba.cxx
basic/source/runtime/step2.cxx
dictionaries
helpcontent2
instsetoo_native/util/openoffice.lst
libvisio/UnpackedTarball_visio.mk
sc/source/ui/vba/vbaapplication.cxx
sc/source/ui/vba/vbavalidation.cxx
solenv/inc/minor.mk
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
translations
Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 10 | ||||
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 2 | ||||
| -rw-r--r-- | libvisio/prj/build.lst | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 38627990d270..940d3cd7713d 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -31,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ && $(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj "Release|Win32" \ && touch $@ else ifeq ($(VCVER),100) @@ -41,6 +42,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ && msbuild.exe libvisio.vcxproj /p:Configuration=Release \ && touch $@ else @@ -51,6 +53,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ && msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \ && touch $@ endif @@ -59,8 +62,11 @@ else $(call gb_ExternalProject_get_state_target,libvisio,build) : cd $(EXTERNAL_WORKDIR) \ - && PKG_CONFIG="" \ - ./configure \ + && export PKG_CONFIG="" \ + && export ICU_LIBS=" " \ + $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \ + $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \ + && ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index 98313c170441..492f857f3ed7 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1)) + $(eval $(call gb_UnpackedTarball_add_patches,visio,\ libvisio/libvisio-0.0.25.patch \ diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst index 5fdc953e050f..3bb2b3e01818 100644 --- a/libvisio/prj/build.lst +++ b/libvisio/prj/build.lst @@ -1,2 +1,2 @@ -vsd libvisio : LIBWPD:libwpd LIBWPD:libwpg BOOST:boost LIBXML2:libxml2 ZLIB:zlib soltools NULL +vsd libvisio : LIBWPD:libwpd LIBWPD:libwpg BOOST:boost ICU:icu LIBXML2:libxml2 ZLIB:zlib soltools NULL vsd libvisio\prj nmake - all vsd_libvisio NULL |