diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-07 21:53:24 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-07 21:54:52 +0100 |
| commit | 1a142e8b5c5a45032a4c940afe90320d5023c324 (patch) | |
| tree | 798a09f0b108b4d1ccc4e9d174171be73d1707a6 /libvisio | |
| parent | e06c6c4cfc55a95ca6a340ac8527fe2d61b3f003 (diff) | |
Make libvisio build pick the right zlib headers
Change-Id: I159cd926e5b373ca7bbecea87a4798b08b89b7ef
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 6 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.20-zlib.patch | 26 |
2 files changed, 32 insertions, 0 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index aa9113bafd6d..59d4adb87489 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,4 +11,10 @@ $(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.20-zlib.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libvisio/libvisio-0.0.20-zlib.patch b/libvisio/libvisio-0.0.20-zlib.patch new file mode 100644 index 000000000000..28cf881902db --- /dev/null +++ b/libvisio/libvisio-0.0.20-zlib.patch @@ -0,0 +1,26 @@ +--- libvisio-0.0.20/configure ++++ libvisio-0.0.20/configure +@@ -17165,8 +17165,8 @@ + fi + + fi +-LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}" +-LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}" ++LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS}" ++LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}" + + + +--- libvisio-0.0.20/Makefile.in ++++ libvisio-0.0.20/Makefile.in +@@ -55,8 +55,8 @@ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/libvisio-0.0.pc.in $(srcdir)/libvisio-zip.in \ + $(srcdir)/libvisio.spec.in $(top_srcdir)/configure AUTHORS \ +- NEWS ar-lib config.guess config.sub install-sh ltmain.sh \ +- missing ++ NEWS ar-lib config.guess config.sub depcomp install-sh \ ++ ltmain.sh missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |