[gmt] 14/29: Disable use of non-free triangle source.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gmt.

commit af5b3fa9b7d602f0aa2521cecfe41ef67f7ec6dd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 5 20:31:04 2015 +0200

    Disable use of non-free triangle source.
---
 debian/changelog                      |  1 +
 debian/patches/disable-triangle.patch | 50 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9ec219d..f887d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ gmt (5.1.2+dfsg-1) UNRELEASED; urgency=medium
     - Add license & copyright for differently licensed files (mostly BSD/MIT)
   * Repack upstream source using Files-Excluded in the copyright file.
   * Fix libgmt5 installation.
+  * Disable use of non-free triangle source.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 Jun 2015 18:12:12 +0200
 
diff --git a/debian/patches/disable-triangle.patch b/debian/patches/disable-triangle.patch
new file mode 100644
index 0000000..9c9cb0a
--- /dev/null
+++ b/debian/patches/disable-triangle.patch
@@ -0,0 +1,50 @@
+Description: Disable non-free triangle source use.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -131,15 +131,15 @@ endif (DO_EXAMPLES OR DO_TESTS AND NOT D
+ # These lines are temporarily here for the beta release
+ set (GMT_DEMOS_SRCS testapi.c testgmt5.c testgmtio.c testgrdio.c testio.c)
+ 
+-if (NOT LICENSE_RESTRICTED) # off
+-	# enable Shewchuk's triangle routine
+-	set (GMT_TRIANGULATE "Shewchuk" PARENT_SCOPE)
+-	set (GMT_TRIANGLE_SRCS triangle.c triangle.h)
+-	list (APPEND GMT_EXTRA_LICENSE_FILES ${CMAKE_CURRENT_DIR}/README.TRIANGLE)
+-else (NOT LICENSE_RESTRICTED) # on
++#if (NOT LICENSE_RESTRICTED) # off
++#	# enable Shewchuk's triangle routine
++#	set (GMT_TRIANGULATE "Shewchuk" PARENT_SCOPE)
++#	set (GMT_TRIANGLE_SRCS triangle.c triangle.h)
++#	list (APPEND GMT_EXTRA_LICENSE_FILES ${CMAKE_CURRENT_DIR}/README.TRIANGLE)
++#else (NOT LICENSE_RESTRICTED) # on
+ 	# disable Shewchuk's triangle routine
+ 	set (GMT_TRIANGULATE "Watson" PARENT_SCOPE)
+-endif (NOT LICENSE_RESTRICTED)
++#endif (NOT LICENSE_RESTRICTED)
+ 
+ set (GMT_PROGS_SRCS blockmean.c blockmedian.c blockmode.c filter1d.c
+ 	fitcircle.c gmt2kml.c gmtconvert.c gmtmath.c gmtselect.c gmtsimplify.c
+@@ -175,7 +175,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
+ 	gmt_plot.h gmt_project.h gmt_prototypes.h gmt_ps.h gmt_shore.h gmt_stat.h
+ 	gmt_support.h gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h
+ 	gmt_types.h gmt_unique.h gmt_version.h gshhg_version.h pslib.h
+-	s_rint.h triangle.h gmt.h gmt_resources.h gmt_define.h gmt_private.h
++	s_rint.h gmt.h gmt_resources.h gmt_define.h gmt_private.h
+ 	gmt_error_codes.h gmt_api.c gmt_bcr.c gmt_calclock.c gmt_cdf.c gmt_compat.c
+ 	gmt_customio.c gmt_dcw.c gmt_error.c gmt_fft.c gmt_grdio.c gmt_io.c
+ 	gmt_memory.c gmt_nc.c gmt_notposix.c gmt_proj.c gmt_shore.c gmt_sph.c
+@@ -277,11 +277,6 @@ configure_file (gmt-config.in gmt-config
+ # gmtprogram
+ set (GMT_PROGRAM ${GMT_SOURCE_DIR}/src/gmtprogram.c)
+ 
+-# extra ugly definitions for triangle
+-set_source_files_properties (triangle.c
+-	PROPERTIES
+-	COMPILE_DEFINITIONS "NO_TIMER;TRILIBRARY;REDUCED;CDT_ONLY;ANSI_DECLARATORS")
+-
+ if (MSVC)
+ 	# Disable automatic manifest generation
+ 	string(REGEX REPLACE "/MANIFEST[^ ]*( |$)" ""
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..226a1e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-triangle.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git