Merge pull request #2640 from sparklemotion/flavorjones-update-libxml…

…-2.10.2

dep: update libxml2 to v2.10.2 and libxslt to v1.1.37

CHANGELOG.md

@@ -25,8 +25,8 @@ This version of Nokogiri uses [`jar-dependencies`](https://github.com/mkristian/
 
 ### Dependencies
 
-* [CRuby] Vendored libxml2 is updated to [v2.10.1](https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.0.news).
-* [CRuby] Vendored libxslt is updated to [v1.1.36](https://gitlab.gnome.org/GNOME/libxslt/-/releases/v1.1.36).
+* [CRuby] Vendored libxml2 is updated to [v2.10.2](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.10.2)
+* [CRuby] Vendored libxslt is updated to [v1.1.37](https://gitlab.gnome.org/GNOME/libxslt/-/releases/v1.1.37).
 * [CRuby] Vendored libiconv is updated to [v1.17](https://savannah.gnu.org/forum/forum.php?forum_id=10175)
 * [JRuby] HTML parsing is now provided `net.sourceforge.htmlunit:neko-htmlunit:2.61.0` (previously was a fork of `org.cyberneko.html:nekohtml`)
 * [JRuby] Vendored Jing is updated from `com.thaiopensource:jing:20091111` to `nu.validator:jing:20200702VNU`.

dependencies.yml

@@ -1,12 +1,12 @@
 libxml2:
-  version: "2.10.1"
-  sha256: "21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.1.sha256sum
+  version: "2.10.2"
+  sha256: "d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.2.sha256sum
 
 libxslt:
-  version: "1.1.36"
-  sha256: "12848f0a4408f65b530d3962cd9ff670b6ae796191cfeff37522b5772de8dc8e"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.36.sha256sum
+  version: "1.1.37"
+  sha256: "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum
 
 zlib:
   version: "1.2.12"

ext/nokogiri/extconf.rb

@@ -903,9 +903,6 @@ def configure
         # xslt-config does not have a flag to emit options including
         # -lexslt, so add it manually.
         libs.unshift("-lexslt")
-
-        # see https://gitlab.gnome.org/GNOME/libxslt/-/issues/73 in libxslt 1.1.36
-        append_cppflags("-DLIBXSLT_STATIC -DLIBEXSLT_STATIC") if windows?
       end
     end
   end.shelljoin