[DRE-commits] [ruby-rugged] 02/03: Add patch to not read version of libgit2 from (removed) convenience copy

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rugged.

commit c7d9c8ec46dcd5bc427af3b2802fd413e7d4ea51
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 1 23:04:14 2015 +0200

    Add patch to not read version of libgit2 from (removed) convenience copy
---
 debian/patches/fix_header_path.patch | 38 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/fix_header_path.patch b/debian/patches/fix_header_path.patch
new file mode 100644
index 0000000..a9d153a
--- /dev/null
+++ b/debian/patches/fix_header_path.patch
@@ -0,0 +1,38 @@
+Description: remove reading version of libgit2 from the embedded copy
+ since it has been stripped out
+ This is essentially reverting the following commit from upstream:
+ https://github.com/libgit2/rugged/commit/fa914748108b3c834928681ddc84556ed3790ce0.patch
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2015-06-01
+
+--- a/ext/rugged/extconf.rb
++++ b/ext/rugged/extconf.rb
+@@ -27,26 +27,11 @@
+ 
+   dir_config('git2').any? or pkg_config('libgit2')
+ 
+-  major = minor = nil
+ 
+-  File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line|
+-    if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR ([0-9]+)$/))
+-      major = matches[1]
+-      next
+-    end
+-
+-    if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR ([0-9]+)$/))
+-      minor = matches[1]
+-      next
+-    end
+-
+-    break if major && minor
+-  end
+-
+-  try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0"
++  try_compile(<<-SRC) or abort "libgit2 version is not compatible"
+ #include <git2/version.h>
+ 
+-#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor}
++#if LIBGIT2_SOVERSION != 22
+ #error libgit2 version is not compatible
+ #endif
+   SRC
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e2de9d6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_header_path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rugged.git