[DRE-commits] [ruby-nokogiri] 06/07: Add a patch to always use the system libraries

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-nokogiri.

commit 16bc80cabf9253b70427eef58ec1cf18ebcaf2b5
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Nov 3 12:06:26 2013 +0100

    Add a patch to always use the system libraries
---
 debian/patches/always_use_system_libraries.patch |   33 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/always_use_system_libraries.patch b/debian/patches/always_use_system_libraries.patch
new file mode 100644
index 0000000..48d8e4a
--- /dev/null
+++ b/debian/patches/always_use_system_libraries.patch
@@ -0,0 +1,33 @@
+Description: always use system libraries and remov the dependency to mini_portile
+Author: Jérémy Bobbio <lunar at debian.org>
+Origin: vendor
+Forwarded: not-needed
+
+diff --git a/Rakefile b/Rakefile
+index 2e5564a..dddae2d 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -40,10 +40,6 @@ HOE = Hoe.spec 'nokogiri' do
+     # GENERATED_TOKENIZER
+   ]
+ 
+-  self.extra_deps += [
+-    ["mini_portile",    "~> 0.5.0"],
+-  ]
+-
+   self.extra_dev_deps += [
+     ["hoe-bundler",     ">= 1.1"],
+     ["hoe-debugging",   ">= 1.0.3"],
+diff --git a/ext/nokogiri/extconf.rb b/ext/nokogiri/extconf.rb
+index 47df402..91baff3 100644
+--- a/ext/nokogiri/extconf.rb
++++ b/ext/nokogiri/extconf.rb
+@@ -45,7 +45,7 @@ if windows_p
+   XML2_HEADER_DIRS = [File.join(INCLUDEDIR, "libxml2"), INCLUDEDIR]
+ 
+ else
+-  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
++  if ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] || true
+     HEADER_DIRS = [
+       # First search /opt/local for macports
+       '/opt/local/include',
diff --git a/debian/patches/series b/debian/patches/series
index 6575ba8..1c2029c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove-annoying-warning.patch
 no-require-rubygems.patch
 skip_test_reader_entity_reference_without_dtdload.patch
 deactivate_test_reader_blocking.patch
+always_use_system_libraries.patch

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