[med-svn] [r-cran-igraph] 01/08: Build-Depends: libxml2-dev, drop useless gcc-7 patch

[Andreas Tille]

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

tille pushed a commit to branch master
in repository r-cran-igraph.

commit 58948f8a02bd5e29a919e1382dd9977077e0a47e
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 12:07:58 2017 +0200

    Build-Depends: libxml2-dev, drop useless gcc-7 patch
---
 debian/changelog           |  2 +-
 debian/control             |  3 ++-
 debian/patches/gcc-7.patch | 39 ---------------------------------------
 debian/patches/series      |  1 -
 4 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a0bec1..b85607b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 r-cran-igraph (1.1.2-1) UNRELEASED; urgency=medium
 
   * New upstream version
-  * Build-Depends: pkg-config
+  * Build-Depends: pkg-config, libxml2-dev
 
  -- Andreas Tille <tille at debian.org>  Thu, 07 Sep 2017 09:28:22 +0200
 
diff --git a/debian/control b/debian/control
index 89f6d14..3245531 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9),
                r-cran-magrittr,
                r-cran-nmf,
                r-cran-irlba,
-               pkg-config
+               pkg-config,
+               libxml2-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/r-cran-igraph.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/r-cran-igraph.git
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
deleted file mode 100644
index 788ce07..0000000
--- a/debian/patches/gcc-7.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 07 Sep 2017 09:28:22 +0200
-Description: Fix some spurious printf statements which are broken with gcc-7
- Unfortunately this patch does not work since it ends up in
- .
- gcc -std=gnu99 -I/usr/share/R/include -DNDEBUG     -DUSING_R -I. -Iinclude -Ics -Iglpk -Iplfit -ICHOLMOD/Include -IAMD/Include -ICOLAMD/Include -ISuiteSparse_config -g -O2 -fdebug-prefix-map=/build/r-base-5SFKJ
- foreign-graphml.c: In function 'igraph_write_graph_graphml':
- foreign-graphml.c:1408:53: error: 'GRAPHML_NAMESPACE_URI' undeclared (first use in this function); did you mean '__USING_NAMESPACE_STD'?
-   ret=fprintf(outstream, "<graphml xmlns=\"%s\"\n", GRAPHML_NAMESPACE_URI);
-                                                     ^~~~~~~~~~~~~~~~~~~~~
-                                                     __USING_NAMESPACE_STD
- foreign-graphml.c:1408:53: note: each undeclared identifier is reported only once for each function it appears in
- .
- despite there is
- .
- /r-cran-igraph(master) $ grep "^#define.*GRAPHML_NAMESPACE_URI" src/foreign-graphml.c
- #define GRAPHML_NAMESPACE_URI "http://graphml.graphdrawing.org/xmlns"
- .
- (not encapsulated in any conditional statement)
-
---- a/src/foreign-graphml.c
-+++ b/src/foreign-graphml.c
-@@ -1405,13 +1405,13 @@ int igraph_write_graph_graphml(const igr
-   
-   ret=fprintf(outstream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
--  ret=fprintf(outstream, "<graphml xmlns=\"" GRAPHML_NAMESPACE_URI "\"\n");
-+  ret=fprintf(outstream, "<graphml xmlns=\"%s\"\n", GRAPHML_NAMESPACE_URI);
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
-   ret=fprintf(outstream, "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
--  ret=fprintf(outstream, "         xsi:schemaLocation=\"" GRAPHML_NAMESPACE_URI "\n");
-+  ret=fprintf(outstream, "         xsi:schemaLocation=\"%s\n", GRAPHML_NAMESPACE_URI);
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
--  ret=fprintf(outstream, "         " GRAPHML_NAMESPACE_URI "/1.0/graphml.xsd\">\n");
-+  ret=fprintf(outstream, "         %s/1.0/graphml.xsd\">\n", GRAPHML_NAMESPACE_URI);
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
-   ret=fprintf(outstream, "<!-- Created by igraph -->\n");
-   if (ret<0) IGRAPH_ERROR("Write failed", IGRAPH_EFILE);
diff --git a/debian/patches/series b/debian/patches/series
index 0b7e77f..33c8191 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 no_pkg_config_dependency.patch
-gcc-7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-igraph.git