[libkml] 12/18: Drop patches applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Mar 13 00:59:35 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 fdc8d5f2c54f43aa3638096fb10bfdb1be382462
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Mar 13 01:27:50 2015 +0100
Drop patches applied upstream.
---
debian/patches/fix-ftbfs-gcc4.7.diff | 14 --------
debian/patches/ld-as-needed.diff | 64 ------------------------------------
debian/patches/libtool-archiver.diff | 13 --------
debian/patches/series | 4 ---
debian/patches/swig.diff | 26 ---------------
5 files changed, 121 deletions(-)
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
deleted file mode 100644
index 23855ce..0000000
--- a/debian/patches/fix-ftbfs-gcc4.7.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix building with GCC 4.7
-Author: Matthias Klose <doko at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667247
-Last-Update: 2013-10-07
---- a/src/kml/base/file_posix.cc
-+++ b/src/kml/base/file_posix.cc
-@@ -29,6 +29,7 @@
- #include "kml/base/file.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h> // For unlink, close.
diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff
deleted file mode 100644
index ed029da..0000000
--- a/debian/patches/ld-as-needed.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Fix build with --as-needed.
-Author: Matthias Klose <doko at ubuntu.com>, Ilya Barygin <randomaction at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605889
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641681
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650525
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692055
-Last-Update: 2013-10-07
---- a/examples/helloworld/Makefile.am
-+++ b/examples/helloworld/Makefile.am
-@@ -26,8 +26,8 @@ circlegen_SOURCES = circlegen.cc
- circlegen_LDADD = \
- $(top_builddir)/src/kml/base/libkmlbase.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
-- $(top_builddir)/src/kml/engine/libkmlengine.la \
-- $(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
-+ $(top_builddir)/src/kml/engine/libkmlengine.la
-
- checklinks_SOURCES = checklinks.cc
- checklinks_LDADD = \
-@@ -75,8 +75,8 @@ hellohref_LDADD = \
-
- hellokmz_SOURCES = hellokmz.cc
- hellokmz_LDADD = \
-- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
-+ $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
- helloregion_SOURCES = helloregion.cc
-@@ -102,8 +102,8 @@ parsens_LDADD = \
-
- prettykml_SOURCES = prettykml.cc
- prettykml_LDADD = \
-- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
-+ $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/base/libkmlbase.la
-
- printgeometry_SOURCES = printgeometry.cc
---- a/examples/regionator/Makefile.am
-+++ b/examples/regionator/Makefile.am
-@@ -10,17 +10,17 @@ noinst_PROGRAMS = csvregionator kmlregio
-
- csvregionator_SOURCES = csvregionator.cc
- csvregionator_LDADD = \
-+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
- $(top_builddir)/src/kml/base/libkmlbase.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
- $(top_builddir)/src/kml/engine/libkmlengine.la \
-- $(top_builddir)/src/kml/regionator/libkmlregionator.la \
-- $(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+ $(top_builddir)/src/kml/regionator/libkmlregionator.la
-
- kmlregionator_SOURCES = kmlregionator.cc
- kmlregionator_LDADD = \
- $(top_builddir)/src/kml/base/libkmlbase.la \
- $(top_builddir)/src/kml/dom/libkmldom.la \
-- $(top_builddir)/src/kml/engine/libkmlengine.la \
- $(top_builddir)/src/kml/regionator/libkmlregionator.la \
-- $(top_builddir)/src/kml/convenience/libkmlconvenience.la
-+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \
-+ $(top_builddir)/src/kml/engine/libkmlengine.la
-
diff --git a/debian/patches/libtool-archiver.diff b/debian/patches/libtool-archiver.diff
deleted file mode 100644
index b90fc46..0000000
--- a/debian/patches/libtool-archiver.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix build failure after autoreconf
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-10-07
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT(libkml, 1.3.0, http://code.googl
- AC_CONFIG_SRCDIR(README)
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE(-Wall -Werror)
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
- AC_PROG_CPP
- AC_PROG_CXX
diff --git a/debian/patches/series b/debian/patches/series
index c865de2..d195f80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,8 @@
kfreebsd.diff
hurd.diff
automake.diff
-#ld-as-needed.diff
feature_view_test.diff
geometry_test.diff
-#swig.diff
-#fix-ftbfs-gcc4.7.diff
java-run-sh-shebang.diff
automake-subdir-objects.diff
-#libtool-archiver.diff
dont-build-all.diff
diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff
deleted file mode 100644
index 540cb94..0000000
--- a/debian/patches/swig.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Support swig 2.0 by disabling 1.x specific version check.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-10-07
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,13 +86,13 @@ AC_ARG_ENABLE(swig,
- [do not generate any SWIG language bindings])])
- if test "x$enable_swig" != xno; then
- AC_CHECK_PROG(SWIG, swig, swig)
-- if test "x$SWIG" != x; then
-- SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-- if test ${SWIG_VERSION:4} -lt 35; then
-- AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
-- SWIG=
-- fi
-- fi
-+# if test "x$SWIG" != x; then
-+# SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-+# if test ${SWIG_VERSION:4} -lt 35; then
-+# AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
-+# SWIG=
-+# fi
-+# fi
- fi
- AM_CONDITIONAL(WITH_SWIG, [test "x$SWIG" != x])
-
--
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