[Plplot-cvs] SF.net SVN: plplot:[12618] trunk/cmake/build_projects/libharu

[<ai...@us...>]

Revision: 12618
          http://sourceforge.net/p/plplot/code/12618
Author:   airwin
Date:     2013-10-23 02:42:08 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Update libharu-2.2.1 build configuration so that it works on both
Linux and MinGW/MSYS.

Tested by Alan W. Irwin <ai...@us...> using the
build_plplot_lite target of the build_projects project on both Linux
and MinGW/MSYS/Wine.  The PDF files resulting from the
test_noninteractive target run as part of that build, look reasonable
on both platforms and there were no obvious run-time errors.

Modified Paths:
--------------
    trunk/cmake/build_projects/libharu/bp.cmake
    trunk/cmake/build_projects/libharu/cmake.patch

Added Paths:
-----------
    trunk/cmake/build_projects/libharu/remove_configured.patch

Removed Paths:
-------------
    trunk/cmake/build_projects/libharu/missing_zlib_headers.patch

Modified: trunk/cmake/build_projects/libharu/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libharu/bp.cmake	2013-10-22 17:47:13 UTC (rev 12617)
+++ trunk/cmake/build_projects/libharu/bp.cmake	2013-10-23 02:42:08 UTC (rev 12618)
@@ -62,12 +62,12 @@
   COMMAND ${CMAKE_COMMAND} -E echo "Apply all patches"
   COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/cmake.patch
   COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/large_font.patch
-  COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/missing_zlib_headers.patch
+  COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/remove_configured.patch
   COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/visibility.patch
   DEPENDS
   ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/cmake.patch
   ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/large_font.patch
-  ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/missing_zlib_headers.patch
+  ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/remove_configured.patch
   ${CMAKE_CURRENT_SOURCE_DIR}/${BP_PACKAGE}/visibility.patch
   APPEND
   )

Modified: trunk/cmake/build_projects/libharu/cmake.patch
===================================================================
--- trunk/cmake/build_projects/libharu/cmake.patch	2013-10-22 17:47:13 UTC (rev 12617)
+++ trunk/cmake/build_projects/libharu/cmake.patch	2013-10-23 02:42:08 UTC (rev 12618)
@@ -1,6 +1,6 @@
 diff -Naur libharu-2.2.1_pristine/CMakeLists.txt libharu-2.2.1/CMakeLists.txt
 --- libharu-2.2.1_pristine/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/CMakeLists.txt	2013-10-21 10:51:25.543121062 -0700
++++ libharu-2.2.1/CMakeLists.txt	2013-10-22 15:55:30.205030236 -0700
 @@ -0,0 +1,216 @@
 +# CMakeLists.txt
 +#
@@ -136,7 +136,7 @@
 +  include_directories(${ZLIB_INCLUDE_DIR})
 +  list(APPEND ADDITIONAL_LIBRARIES ${ZLIB_LIBRARIES})
 +else(ZLIB_FOUND)
-+  set(HPDF_NOZLIB ON)  
++  set(LIBHPDF_HAVE_NOZLIB ON)  
 +endif(ZLIB_FOUND)
 +
 +# check png availibility
@@ -147,7 +147,7 @@
 +  add_definitions(${PNG_DEFINITIONS})
 +  list(APPEND ADDITIONAL_LIBRARIES ${PNG_LIBRARIES})
 +else(PNG_FOUND)
-+  set(HPDF_NOPNGLIB ON)  
++  set(LIBHPDF_HAVE_NOPNGLIB ON)  
 +endif(PNG_FOUND)
 +
 +# =======================================================================
@@ -220,7 +220,7 @@
 +INCLUDE( CPack )
 diff -Naur libharu-2.2.1_pristine/cmake/modules/haru.cmake libharu-2.2.1/cmake/modules/haru.cmake
 --- libharu-2.2.1_pristine/cmake/modules/haru.cmake	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/cmake/modules/haru.cmake	2013-10-21 10:52:11.838244974 -0700
++++ libharu-2.2.1/cmake/modules/haru.cmake	2013-10-22 15:55:30.205030236 -0700
 @@ -0,0 +1,54 @@
 +# cmake/modules/haru.cmake
 +#
@@ -278,7 +278,7 @@
 +endif(NOT WIN32)
 diff -Naur libharu-2.2.1_pristine/cmake/modules/summary.cmake libharu-2.2.1/cmake/modules/summary.cmake
 --- libharu-2.2.1_pristine/cmake/modules/summary.cmake	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/cmake/modules/summary.cmake	2013-10-21 10:52:36.297782032 -0700
++++ libharu-2.2.1/cmake/modules/summary.cmake	2013-10-22 15:55:30.213030083 -0700
 @@ -0,0 +1,66 @@
 +# cmake/modules/summary.cmake
 +#
@@ -348,7 +348,7 @@
 +endmacro(summary)
 diff -Naur libharu-2.2.1_pristine/demo/CMakeLists.txt libharu-2.2.1/demo/CMakeLists.txt
 --- libharu-2.2.1_pristine/demo/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/demo/CMakeLists.txt	2013-10-21 10:54:41.939403569 -0700
++++ libharu-2.2.1/demo/CMakeLists.txt	2013-10-22 15:55:30.213030083 -0700
 @@ -0,0 +1,183 @@
 +# demo/CMakeLists.txt
 +#
@@ -535,7 +535,7 @@
 +endif(LIBHARU_EXAMPLES)
 diff -Naur libharu-2.2.1_pristine/include/CMakeLists.txt libharu-2.2.1/include/CMakeLists.txt
 --- libharu-2.2.1_pristine/include/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/include/CMakeLists.txt	2013-10-21 10:53:43.508509852 -0700
++++ libharu-2.2.1/include/CMakeLists.txt	2013-10-22 15:55:30.213030083 -0700
 @@ -0,0 +1,63 @@
 +# include/CMakeLists.txt for libharu.
 +###
@@ -602,8 +602,8 @@
 +install(FILES ${include_INSTALLED_HEADERS} DESTINATION include/hpdf)
 diff -Naur libharu-2.2.1_pristine/include/hpdf_config.h.cmake libharu-2.2.1/include/hpdf_config.h.cmake
 --- libharu-2.2.1_pristine/include/hpdf_config.h.cmake	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/include/hpdf_config.h.cmake	2013-10-21 10:55:06.162944881 -0700
-@@ -0,0 +1,97 @@
++++ libharu-2.2.1/include/hpdf_config.h.cmake	2013-10-22 15:56:31.771881667 -0700
+@@ -0,0 +1,91 @@
 +/* 
 + * Copyright (C) 2008  Werner Smekal
 + * Copyright (C) 2010  Alan W. Irwin
@@ -637,12 +637,6 @@
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#cmakedefine LIBHPDF_HAVE_INTTYPES_H
 +
-+/* Define to 1 if you have the `png' library (-lpng). */
-+#cmakedefine HAVE_LIBPNG
-+
-+/* Define to 1 if you have the `z' library (-lz). */
-+#cmakedefine HAVE_LIBZ
-+
 +/* Define to 1 if you have the <memory.h> header file. */
 +#cmakedefine LIBHPDF_HAVE_MEMORY_H
 +
@@ -674,10 +668,10 @@
 +#cmakedefine LIBHPDF_DEBUG_TRACE
 +
 +/* libpng is not available */
-+#cmakedefine HPDF_NOPNGLIB
++#cmakedefine LIBHPDF_HAVE_NOPNGLIB
 +
 +/* zlib is not available */
-+#cmakedefine HPDF_NOZLIB
++#cmakedefine LIBHPDF_HAVE_NOZLIB
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#cmakedefine LIBHPDF_PACKAGE_BUGREPORT
@@ -703,7 +697,7 @@
 +#endif /* _HPDF_CONFIG_H */
 diff -Naur libharu-2.2.1_pristine/src/CMakeLists.txt libharu-2.2.1/src/CMakeLists.txt
 --- libharu-2.2.1_pristine/src/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
-+++ libharu-2.2.1/src/CMakeLists.txt	2013-10-21 10:53:23.164894950 -0700
++++ libharu-2.2.1/src/CMakeLists.txt	2013-10-22 15:55:30.213030083 -0700
 @@ -0,0 +1,150 @@
 +# src/CMakeLists.txt
 +#

Deleted: trunk/cmake/build_projects/libharu/missing_zlib_headers.patch
===================================================================
--- trunk/cmake/build_projects/libharu/missing_zlib_headers.patch	2013-10-22 17:47:13 UTC (rev 12617)
+++ trunk/cmake/build_projects/libharu/missing_zlib_headers.patch	2013-10-23 02:42:08 UTC (rev 12618)
@@ -1,11 +0,0 @@
-diff -Naur libharu-2.2.1_pristine/src/hpdf_streams.c libharu-2.2.1/src/hpdf_streams.c
---- libharu-2.2.1_pristine/src/hpdf_streams.c	2010-02-08 01:49:57.000000000 -0800
-+++ libharu-2.2.1/src/hpdf_streams.c	2013-10-21 11:47:12.026846086 -0700
-@@ -23,6 +23,7 @@
- #include "hpdf_consts.h"
- #include "hpdf_utils.h"
- #include "hpdf_streams.h"
-+#include "hpdf_config.h"
- 
- #ifndef LIBHPDF_HAVE_NOZLIB
- #include <zlib.h>

Added: trunk/cmake/build_projects/libharu/remove_configured.patch
===================================================================
--- trunk/cmake/build_projects/libharu/remove_configured.patch	                        (rev 0)
+++ trunk/cmake/build_projects/libharu/remove_configured.patch	2013-10-23 02:42:08 UTC (rev 12618)
@@ -0,0 +1,131 @@
+diff -Naur libharu-2.2.1_pristine/include/hpdf_config.h libharu-2.2.1/include/hpdf_config.h
+--- libharu-2.2.1_pristine/include/hpdf_config.h	2010-11-22 02:00:33.000000000 -0800
++++ libharu-2.2.1/include/hpdf_config.h	1969-12-31 16:00:00.000000000 -0800
+@@ -1,127 +0,0 @@
+-#ifndef _INCLUDE_HPDF_CONFIG_H
+-#define _INCLUDE_HPDF_CONFIG_H 1
+- 
+-/* include/hpdf_config.h. Generated automatically at end of configure. */
+-/* include/config.h.  Generated from config.h.in by configure.  */
+-/* include/config.h.in.  Generated from configure.in by autoheader.  */
+-
+-/* debug build */
+-#ifndef LIBHPDF_DEBUG 
+-#define LIBHPDF_DEBUG  /**/ 
+-#endif
+-
+-/* debug trace enabled */
+-/* #undef DEBUG_TRACE */
+-
+-/* Define to 1 if you have the <dlfcn.h> header file. */
+-#ifndef LIBHPDF_HAVE_DLFCN_H 
+-#define LIBHPDF_HAVE_DLFCN_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <inttypes.h> header file. */
+-#ifndef LIBHPDF_HAVE_INTTYPES_H 
+-#define LIBHPDF_HAVE_INTTYPES_H  1 
+-#endif
+-
+-/* Define to 1 if you have the `png' library (-lpng). */
+-#ifndef LIBHPDF_HAVE_LIBPNG 
+-#define LIBHPDF_HAVE_LIBPNG  1 
+-#endif
+-
+-/* Define to 1 if you have the `z' library (-lz). */
+-#ifndef LIBHPDF_HAVE_LIBZ 
+-#define LIBHPDF_HAVE_LIBZ  1 
+-#endif
+-
+-/* Define to 1 if you have the <memory.h> header file. */
+-#ifndef LIBHPDF_HAVE_MEMORY_H 
+-#define LIBHPDF_HAVE_MEMORY_H  1 
+-#endif
+-
+-/* libpng is not available */
+-/* #undef HAVE_NOPNGLIB */
+-
+-/* zlib is not available */
+-/* #undef HAVE_NOZLIB */
+-
+-/* Define to 1 if you have the <stdint.h> header file. */
+-#ifndef LIBHPDF_HAVE_STDINT_H 
+-#define LIBHPDF_HAVE_STDINT_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <stdlib.h> header file. */
+-#ifndef LIBHPDF_HAVE_STDLIB_H 
+-#define LIBHPDF_HAVE_STDLIB_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <strings.h> header file. */
+-#ifndef LIBHPDF_HAVE_STRINGS_H 
+-#define LIBHPDF_HAVE_STRINGS_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <string.h> header file. */
+-#ifndef LIBHPDF_HAVE_STRING_H 
+-#define LIBHPDF_HAVE_STRING_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <sys/stat.h> header file. */
+-#ifndef LIBHPDF_HAVE_SYS_STAT_H 
+-#define LIBHPDF_HAVE_SYS_STAT_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <sys/types.h> header file. */
+-#ifndef LIBHPDF_HAVE_SYS_TYPES_H 
+-#define LIBHPDF_HAVE_SYS_TYPES_H  1 
+-#endif
+-
+-/* Define to 1 if you have the <unistd.h> header file. */
+-#ifndef LIBHPDF_HAVE_UNISTD_H 
+-#define LIBHPDF_HAVE_UNISTD_H  1 
+-#endif
+-
+-/* Define to the sub-directory in which libtool stores uninstalled libraries.
+-   */
+-#ifndef LIBHPDF_LT_OBJDIR 
+-#define LIBHPDF_LT_OBJDIR  ".libs/" 
+-#endif
+-
+-/* Define to the address where bug reports for this package should be sent. */
+-#ifndef LIBHPDF_PACKAGE_BUGREPORT 
+-#define LIBHPDF_PACKAGE_BUGREPORT  "" 
+-#endif
+-
+-/* Define to the full name of this package. */
+-#ifndef LIBHPDF_PACKAGE_NAME 
+-#define LIBHPDF_PACKAGE_NAME  "libhpdf" 
+-#endif
+-
+-/* Define to the full name and version of this package. */
+-#ifndef LIBHPDF_PACKAGE_STRING 
+-#define LIBHPDF_PACKAGE_STRING  "libhpdf 2.2.1" 
+-#endif
+-
+-/* Define to the one symbol short name of this package. */
+-#ifndef LIBHPDF_PACKAGE_TARNAME 
+-#define LIBHPDF_PACKAGE_TARNAME  "libhpdf" 
+-#endif
+-
+-/* Define to the home page for this package. */
+-#ifndef LIBHPDF_PACKAGE_URL 
+-#define LIBHPDF_PACKAGE_URL  "" 
+-#endif
+-
+-/* Define to the version of this package. */
+-#ifndef LIBHPDF_PACKAGE_VERSION 
+-#define LIBHPDF_PACKAGE_VERSION  "2.2.1" 
+-#endif
+-
+-/* Define to 1 if you have the ANSI C header files. */
+-#ifndef LIBHPDF_STDC_HEADERS 
+-#define LIBHPDF_STDC_HEADERS  1 
+-#endif
+-
+-/* Define to `unsigned int' if <sys/types.h> does not define. */
+-/* #undef size_t */
+- 
+-/* once: _INCLUDE_HPDF_CONFIG_H */
+-#endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.