nokogiri 1.6.8-x86-mingw32 → 1.6.8.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99debe6aeb9a5efe23829ceb2c509b78bccf7fe
-  data.tar.gz: 0a87cbb2324b73854dedde53e063097482f1e56c
+  metadata.gz: e12af763184ea498fc7ebd952643aa2a38ffac28
+  data.tar.gz: ee125179e2ba9300a703db4ae505315618acc9ee
 SHA512:
-  metadata.gz: d9ca761b92ec08e70d04df86803f4df5a44cdcfcf858564e8513c989dfe7431a9dc2af8d591d8733bb0854799c607cc1768a2d385fe2980e29d7b8ae6b648352
-  data.tar.gz: f50a0d73cc8f249412b337d8ac0ee3353990554d1a216fc4a5401231e7faaf74adc27143425875e9e104a1527d124597aa0981e22d7461234081ee8814be1cac
+  metadata.gz: 88062178bfc2293f9215317d4995c852cebff38f5f73f8f30b7552a650a0683473a373e5c4984c809d6cef923c9c9a801fc9958f3d221e425f6d4955a1b1be2c
+  data.tar.gz: f0f757abd6809d0ae610ebc052ff28e98ece5824e9f0a6b083bffa4baa4ff1a3177b6a7897ec983314f889ead98d1153dcd7d7db1f38d30b43477e45f76a43f8

data/CHANGELOG.rdoc

@@ -1,4 +1,17 @@
-=== 1.6.8 / unreleased
+=== 1.6.8.1 / 2016-10-03
+
+==== Dependency License Notes
+
+Removes required dependency on the `pkg-config` gem. This dependency
+was introduced in v1.6.8 and, because it's distributed under LGPL, was
+objectionable to many Nokogiri users (#1488, #1496).
+
+This version makes `pkg-config` an optional dependency. If it's
+installed, it's used; but otherwise Nokogiri will attempt to work
+around its absence.
+
+
+=== 1.6.8 / 2016-06-06
 
 ==== Security Notes
 

data/Gemfile

@@ -5,7 +5,6 @@
 source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.1.0"
-gem "pkg-config", "~>1.1.7"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2.0", :group => [:development, :test]

data/Rakefile

@@ -128,7 +128,6 @@ HOE = Hoe.spec 'nokogiri' do
   unless java?
     self.extra_deps += [
       ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
-      ["pkg-config",       "~> 1.1.7"], # keep version in sync with extconf.rb
     ]
   end
 

data/build_all

@@ -16,7 +16,7 @@ else
 fi
 
 set -o errexit
-set -x
+#set -x
 
 rm -rf tmp pkg
 bundle exec rake clean clobber

data/ext/nokogiri/extconf.rb

@@ -106,27 +106,28 @@ def do_clean
   exit! 0
 end
 
-# The gem version constraint in the Rakefile is not respected at install time.
-# Keep this version in sync with the one in the Rakefile !
-require 'rubygems'
-gem 'pkg-config', '~> 1.1.7'
-require 'pkg-config'
-message "Using pkg-config version #{PKGConfig::VERSION}\n"
-
 def package_config pkg, options={}
   package = pkg_config(pkg)
   return package if package
 
-  return nil unless PKGConfig.have_package(pkg)
+  begin
+    require 'rubygems'
+    gem 'pkg-config', (gem_ver='~> 1.1.7')
+    require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n")
+  rescue LoadError
+    message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n    gem install pkg-config -v #{gem_ver.inspect}\n\n"
+  else
+    return nil unless PKGConfig.have_package(pkg)
 
-  cflags  = PKGConfig.cflags(pkg)
-  ldflags = PKGConfig.libs_only_L(pkg)
-  libs    = PKGConfig.libs_only_l(pkg)
+    cflags  = PKGConfig.cflags(pkg)
+    ldflags = PKGConfig.libs_only_L(pkg)
+    libs    = PKGConfig.libs_only_l(pkg)
 
-  Logging::message "PKGConfig package configuration for %s\n", pkg
-  Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
+    Logging::message "PKGConfig package configuration for %s\n", pkg
+    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
 
-  [cflags, ldflags, libs]
+    [cflags, ldflags, libs]
+  end
 end
 
 def nokogiri_try_compile

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.8'
+  VERSION = '1.6.8.1'
 
   class VersionInfo # :nodoc:
     def jruby?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.8.1
 platform: x86-mingw32
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -28,20 +28,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: pkg-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement