[med-svn] [sra-sdk] 12/13: Enable build using ncbi-vdb version 2.8.0

[Andreas Tille]

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

tille pushed a commit to branch master
in repository sra-sdk.

commit e53d16711f01e9fb8485264c942733df76e4250f
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 25 19:08:06 2016 +0100

    Enable build using ncbi-vdb version 2.8.0
---
 debian/changelog                                   |  1 +
 ...enable_build_using_ncbi-vdb_version_2.8.0.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1699004..ab2782a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sra-sdk (2.7.0-2) UNRELEASED; urgency=medium
 
   * d/rules: Remove -pie to adapt to latest changes in dpkg
   * link against Debian packaged libmbedtls-dev
+  * Enable build using ncbi-vdb version 2.8.0
 
  -- Andreas Tille <tille at debian.org>  Fri, 25 Nov 2016 18:06:45 +0100
 
diff --git a/debian/patches/enable_build_using_ncbi-vdb_version_2.8.0.patch b/debian/patches/enable_build_using_ncbi-vdb_version_2.8.0.patch
new file mode 100644
index 0000000..54b32a9
--- /dev/null
+++ b/debian/patches/enable_build_using_ncbi-vdb_version_2.8.0.patch
@@ -0,0 +1,39 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Fri, 25 Nov 2016 12:41:49 +0100
+Description: Enable build using ncbi-vdb version 2.8.0
+
+--- a/tools/kget/kget.c
++++ b/tools/kget/kget.c
+@@ -646,32 +646,6 @@ static rc_t check_cache_completeness( KD
+ 
+ /* -------------------------------------------------------------------------------------------------------------------- */
+ 
+-/* this is 'borrowed' from libs/kns/http-priv.h :
+-    - this is a private header inside the source-directory
+-    - without it KNSManagerMakeClientHttp( ... ) a public function cannot be used
+-        ( or the user writes it's own URL-parsing )
+-*/
+-
+-typedef enum 
+-{
+-    st_NONE,
+-    st_HTTP,
+-    st_S3
+-} SchemeType;
+-
+-typedef struct URLBlock URLBlock;
+-struct URLBlock
+-{
+-    String scheme;
+-    String host;
+-    String path; /* Path includes any parameter portion */
+-    String query;
+-    String fragment;
+-
+-    uint32_t port;
+-
+-    SchemeType scheme_type;
+-};
+ extern void URLBlockInit ( URLBlock *self );
+ extern rc_t ParseUrl ( URLBlock * b, const char * url, size_t url_size );
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 857d5a5..22ff44b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,5 @@ set_explicit_path_to_schemata.patch
 absolute_vschema_path_in_test.patch
 ignore_failing_tests_for_the_moment.patch
 do_not_link_statically.patch
+link_debian_packaged_libmbed.patch
+enable_build_using_ncbi-vdb_version_2.8.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sra-sdk.git