[libkml] 08/23: Drop automake related patches, refresh remaining patch.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Jul 25 19:41:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libkml.
commit 3e156cd7d38c2dc51fe435fca307d63ceb2c92b9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jul 25 15:35:17 2015 +0200
Drop automake related patches, refresh remaining patch.
---
debian/changelog | 1 +
debian/patches/automake-subdir-objects.diff | 11 --
debian/patches/automake.diff | 277 ----------------------------
debian/patches/dont-build-all.diff | 14 --
debian/patches/feature_view_test.diff | 32 ----
debian/patches/geometry_test.diff | 37 ----
debian/patches/hurd.diff | 28 ---
debian/patches/kfreebsd.diff | 15 --
debian/patches/series | 7 -
9 files changed, 1 insertion(+), 421 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42afd42..8a10f7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libkml (1.3.0~r864+git20150723-0fa2f22-1) UNRELEASED; urgency=medium
* Drop Files-Excluded from copyright & repacksuffix from watch file,
third party sources no longer included.
* Switch build system from autotools to cmake.
+ * Drop automake related patches, refresh remaining patch.
-- Bas Couwenberg <sebastic at debian.org> Sat, 25 Jul 2015 15:16:12 +0200
diff --git a/debian/patches/automake-subdir-objects.diff b/debian/patches/automake-subdir-objects.diff
deleted file mode 100644
index c6c9383..0000000
--- a/debian/patches/automake-subdir-objects.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Remain forward compatible with automake using subdir-objects.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-10-07
---- a/third_party/Makefile.am
-+++ b/third_party/Makefile.am
-@@ -1,3 +1,5 @@
-+AUTOMAKE_OPTIONS = subdir-objects
-+
- # As of automake 1.14 it's not possible to use variable references
- # in AM_CPPFLAGS -- the combination of -I$(top_srcdir) and $(foo) generates
- # directories with the literal unexpanded $(foo) name. It looks like a real
diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff
deleted file mode 100644
index fe715da..0000000
--- a/debian/patches/automake.diff
+++ /dev/null
@@ -1,277 +0,0 @@
-Description: Don't fail build on warnings, don't use embedded liburiparser.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-10-07
---- a/examples/engine/Makefile.am
-+++ b/examples/engine/Makefile.am
-@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = \
---- a/examples/gpx/Makefile.am
-+++ b/examples/gpx/Makefile.am
-@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = gpxtracktokml
---- a/examples/gx/Makefile.am
-+++ b/examples/gx/Makefile.am
-@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = \
---- a/examples/hellonet/Makefile.am
-+++ b/examples/hellonet/Makefile.am
-@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = csvurl2gmap getgmapkml getgsheetcsv getgsheetkml \
---- a/examples/helloworld/Makefile.am
-+++ b/examples/helloworld/Makefile.am
-@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
-
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_LTLIBRARIES = libhelloutil.la
---- a/examples/regionator/Makefile.am
-+++ b/examples/regionator/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = csvregionator kmlregionator
---- a/examples/xsd/Makefile.am
-+++ b/examples/xsd/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1
-
- if GCC
--AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
-+AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
- endif
-
- noinst_PROGRAMS = xsdchildren xsdcoverage xsdelements xsdenums xsdfind xsdtypes
---- a/src/kml/base/Makefile.am
-+++ b/src/kml/base/Makefile.am
-@@ -1,15 +1,14 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/boost_1_34_1 \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include \
-- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
- -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
--libkmlbase_la_LDFLAGS = -lexpat
-+libkmlbase_la_LDFLAGS = -lexpat -luriparser
-
- lib_LTLIBRARIES = libkmlbase.la
- libkmlbase_la_SOURCES = \
-@@ -31,8 +30,7 @@ libkmlbase_la_SOURCES = \
- zip_file.cc
-
- libkmlbase_la_LIBADD = \
-- $(top_builddir)/third_party/libminizip.la \
-- $(top_builddir)/third_party/liburiparser.la
-+ $(top_builddir)/third_party/libminizip.la
-
- # These header files will be installed in $(includedir)/kml/base
- libkmlbaseincludedir = $(includedir)/kml/base
-@@ -137,8 +135,7 @@ math_util_test_LDADD = libkmlbase.la \
-
- net_cache_test_SOURCES = net_cache_test.cc
- net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--net_cache_test_LDADD = libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-+net_cache_test_LDADD = libkmlbase.la -luriparser \
- $(top_builddir)/third_party/libgtest_main.la
-
- referent_test_SOURCES = referent_test.cc
-@@ -163,8 +160,7 @@ time_util_test_LDADD= libkmlbase.la \
-
- uri_parser_test_SOURCES = uri_parser_test.cc
- uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
--uri_parser_test_LDADD= libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-+uri_parser_test_LDADD= libkmlbase.la -luriparser \
- $(top_builddir)/third_party/libgtest_main.la
-
- util_test_SOURCES = util_test.cc
---- a/src/kml/convenience/Makefile.am
-+++ b/src/kml/convenience/Makefile.am
-@@ -3,8 +3,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
- # These header files are added to the distribution such that it can be built,
---- a/src/kml/dom/Makefile.am
-+++ b/src/kml/dom/Makefile.am
-@@ -3,8 +3,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
- lib_LTLIBRARIES = libkmldom.la
---- a/src/kml/engine/Makefile.am
-+++ b/src/kml/engine/Makefile.am
-@@ -3,8 +3,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
- lib_LTLIBRARIES = libkmlengine.la
-@@ -303,8 +303,7 @@ style_inliner_test_SOURCES = style_inlin
- style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
- style_inliner_test_LDADD= libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
-- $(top_builddir)/src/kml/base/libkmlbase.la \
-- $(top_builddir)/third_party/liburiparser.la \
-+ $(top_builddir)/src/kml/base/libkmlbase.la -luriparser \
- $(top_builddir)/third_party/libgtest_main.la
-
- style_merger_test_SOURCES = style_merger_test.cc
---- a/src/kml/regionator/Makefile.am
-+++ b/src/kml/regionator/Makefile.am
-@@ -4,8 +4,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \
-
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
- lib_LTLIBRARIES = libkmlregionator.la
---- a/src/kml/xsd/Makefile.am
-+++ b/src/kml/xsd/Makefile.am
-@@ -3,8 +3,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include
-
- if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
- endif
-
- lib_LTLIBRARIES = libkmlxsd.la
---- a/src/swig/Makefile.am
-+++ b/src/swig/Makefile.am
-@@ -1,8 +1,7 @@
- SUBDIRS = java python
-
- AM_CPPFLAGS = -I$(top_srcdir)/src \
-- -I$(top_srcdir)/third_party/boost_1_34_1 \
-- -I$(top_srcdir)/third_party/uriparser-0.7.5/include
-+ -I$(top_srcdir)/third_party/boost_1_34_1
-
- COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
---- a/third_party/Makefile.am
-+++ b/third_party/Makefile.am
-@@ -7,11 +7,10 @@
- #googletest = gtest-1.7.0
-
- AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
-- -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
- -I$(top_srcdir)/third_party/gtest-1.7.0 \
- -I$(top_srcdir)/third_party/gtest-1.7.0/include
-
--lib_LTLIBRARIES = libminizip.la liburiparser.la
-+lib_LTLIBRARIES = libminizip.la
- noinst_LTLIBRARIES = libgtest.la libgtest_main.la
-
- libminizip_la_SOURCES = \
-@@ -21,27 +20,6 @@ libminizip_la_SOURCES = \
- zlib-1.2.3/contrib/minizip/zip.c
- libminizip_la_LDFLAGS = -lz
-
--liburiparser_la_SOURCES = \
-- uriparser-0.7.5/lib/UriCommon.c \
-- uriparser-0.7.5/lib/UriCommon.h \
-- uriparser-0.7.5/lib/UriCompare.c \
-- uriparser-0.7.5/lib/UriEscape.c \
-- uriparser-0.7.5/lib/UriFile.c \
-- uriparser-0.7.5/lib/UriIp4.c \
-- uriparser-0.7.5/lib/UriIp4Base.c \
-- uriparser-0.7.5/lib/UriIp4Base.h \
-- uriparser-0.7.5/lib/UriNormalize.c \
-- uriparser-0.7.5/lib/UriNormalizeBase.c \
-- uriparser-0.7.5/lib/UriNormalizeBase.h \
-- uriparser-0.7.5/lib/UriParse.c \
-- uriparser-0.7.5/lib/UriParseBase.c \
-- uriparser-0.7.5/lib/UriParseBase.h \
-- uriparser-0.7.5/lib/UriQuery.c \
-- uriparser-0.7.5/lib/UriRecompose.c \
-- uriparser-0.7.5/lib/UriResolve.c \
-- uriparser-0.7.5/lib/UriShorten.c
--liburiparser_la_LDFLAGS = -version-info 1:5:0
--
- boost_root = boost_1_34_1
- boost = $(boost_root)/boost
- boostinc = $(includedir)/kml/third_party/$(boost)
-@@ -181,15 +159,6 @@ EXTRA_DIST = \
- gtest-1.7.0/src/gtest-test-part.cc \
- gtest-1.7.0/src/gtest-typed-test.cc \
- gtest-1.7.0/src/gtest.cc \
-- uriparser-0.7.5/COPYING \
-- uriparser-0.7.5.win32/debug/uriparser.lib \
-- uriparser-0.7.5.win32/release/uriparser.lib \
-- uriparser-0.7.5/include/uriparser/Uri.h \
-- uriparser-0.7.5/include/uriparser/UriBase.h \
-- uriparser-0.7.5/include/uriparser/UriDefsAnsi.h \
-- uriparser-0.7.5/include/uriparser/UriDefsConfig.h \
-- uriparser-0.7.5/include/uriparser/UriDefsUnicode.h \
-- uriparser-0.7.5/include/uriparser/UriIp4.h \
- zlib-1.2.3/zconf.h \
- zlib-1.2.3/zlib.h \
- zlib-1.2.3/contrib/minizip/crypt.h \
diff --git a/debian/patches/dont-build-all.diff b/debian/patches/dont-build-all.diff
deleted file mode 100644
index 21d9640..0000000
--- a/debian/patches/dont-build-all.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Don't build unneeded subprojects
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-10-07
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
-
- # Order is important:
--SUBDIRS = third_party src testdata examples msvc xcode
-+SUBDIRS = third_party src testdata
-
- EXTRA_DIST = \
- AUTHORS \
diff --git a/debian/patches/feature_view_test.diff b/debian/patches/feature_view_test.diff
deleted file mode 100644
index 81a6fd0..0000000
--- a/debian/patches/feature_view_test.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Remove failing test.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-10-07
---- a/src/kml/engine/feature_view_test.cc
-+++ b/src/kml/engine/feature_view_test.cc
-@@ -27,7 +27,6 @@
-
- #include "kml/engine/feature_view.h"
- #include "gtest/gtest.h"
--#include "kml/engine/bbox.h"
- #include "kml/engine/kml_file.h"
-
- using kmldom::CoordinatesPtr;
-@@ -137,18 +136,4 @@ TEST(FeatureViewTest, TestComputeFeature
- ASSERT_NEAR(1494183.4444, lookat->get_range(), 0.0001);
- }
-
--TEST(FeatureViewTest, TestComputeBboxLookAt) {
-- Bbox bbox(36.59062, 34.98788, -82.00043, -90.06512);
-- kmldom::LookAtPtr lookat = ComputeBboxLookAt(bbox);
-- ASSERT_TRUE(lookat);
-- // These fields are expected to be set to these values.
-- ASSERT_DOUBLE_EQ(-86.032775, lookat->get_longitude());
-- ASSERT_DOUBLE_EQ(35.78925, lookat->get_latitude());
-- ASSERT_DOUBLE_EQ(712928.68603440293, lookat->get_range());
-- // These fields are not set by ComputeBboxLookAt.
-- ASSERT_FALSE(lookat->has_altitude());
-- ASSERT_FALSE(lookat->has_heading());
-- ASSERT_FALSE(lookat->has_tilt());
--}
--
- } // end namespace kmlengine
diff --git a/debian/patches/geometry_test.diff b/debian/patches/geometry_test.diff
deleted file mode 100644
index 5c82eee..0000000
--- a/debian/patches/geometry_test.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Remove failing test.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626259
-Last-Update: 2013-10-07
---- a/src/kml/dom/geometry_test.cc
-+++ b/src/kml/dom/geometry_test.cc
-@@ -356,30 +356,6 @@ TEST_F(CoordinatesTest, TestSerializeOne
- ASSERT_EQ(vec3.get_altitude(), vec3_vector[0].get_altitude());
- }
-
--// Test serialization of:
--// <coordinates>0.2,0.1,0.3 1.2,1.1,1.3 2.2,2.1,2.3 ... </coordinates>/
--TEST_F(CoordinatesTest, TestSerializeMany) {
-- const size_t kNumTuples = 47;
-- const double kLatFrac = 0.1;
-- const double kLngFrac = 0.2;
-- const double kAltFrac = 0.3;
-- for (size_t i = 0; i < kNumTuples; ++i) {
-- coordinates_->add_latlngalt(i + kLatFrac, i + kLngFrac, i + kAltFrac);
-- }
-- Vec3Vector vec3_vector;
-- MockCoordinatesSerializer mock(&vec3_vector);
-- // This calls Coordinates::Serialize().
-- mock.SaveElement(coordinates_);
-- ASSERT_EQ(kNumTuples, vec3_vector.size());
-- ASSERT_EQ(static_cast<int>(kNumTuples), mock.get_element_count());
-- for (size_t i = 0; i < kNumTuples; ++i) {
-- ASSERT_EQ(i + kLatFrac, vec3_vector[i].get_latitude());
-- ASSERT_EQ(i + kLngFrac, vec3_vector[i].get_longitude());
-- ASSERT_TRUE(vec3_vector[i].has_altitude());
-- ASSERT_EQ(i + kAltFrac, vec3_vector[i].get_altitude());
-- }
--}
--
- // Coordinate tuples must be separated by a space. However, the world is
- // imperfect and thus we try to do the right thing with this:
- // <coordinates>1,2,3,4,5,6,7,8,9</coordinates>, where the "right thing" is
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
deleted file mode 100644
index 22afad6..0000000
--- a/debian/patches/hurd.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Support building on hurd-i386
-Author: Pino Toscano <pino at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671894
-Last-Update: 2013-10-07
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,7 @@ dnl Which platform are we building on?
- PLATFORM=
- SHLIBSUFFIX=
- case "`uname -s`" in
-- Linux|GNU/kFreeBSD) PLATFORM=linux
-+ Linux|GNU/kFreeBSD|GNU) PLATFORM=linux
- SHLIBSUFFIX="so"
- ;;
- Darwin) PLATFORM=darwin
---- a/third_party/gtest-1.7.0/src/gtest-filepath.cc
-+++ b/third_party/gtest-1.7.0/src/gtest-filepath.cc
-@@ -60,6 +60,10 @@
-
- #include "gtest/internal/gtest-string.h"
-
-+#ifndef PATH_MAX
-+# define PATH_MAX 4096
-+#endif
-+
- namespace testing {
- namespace internal {
-
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
deleted file mode 100644
index 56d7fce..0000000
--- a/debian/patches/kfreebsd.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Support building on Debian GNU/kFreeBSD.
-Author: Cyril Brulebois <kibi at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558208
-Last-Update: 2013-10-07
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,7 @@ dnl Which platform are we building on?
- PLATFORM=
- SHLIBSUFFIX=
- case "`uname -s`" in
-- Linux) PLATFORM=linux
-+ Linux|GNU/kFreeBSD) PLATFORM=linux
- SHLIBSUFFIX="so"
- ;;
- Darwin) PLATFORM=darwin
diff --git a/debian/patches/series b/debian/patches/series
index d195f80..1da88f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
-kfreebsd.diff
-hurd.diff
-automake.diff
-feature_view_test.diff
-geometry_test.diff
java-run-sh-shebang.diff
-automake-subdir-objects.diff
-dont-build-all.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git
More information about the Pkg-grass-devel
mailing list