Merge pull request #233 from tid-kijyun/feature/v5.2.1

Feature/v5.2.1
tid-kijyun · Mar 26, 2020 · 0d51d5e · 0d51d5e
2 parents e924895 + a6dd49f
commit 0d51d5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/Package.swift b/Package.swift
@@ -2,6 +2,17 @@
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
 
+#if swift(>=5.2)
+let provider: [SystemPackageProvider] = [
+    .apt(["libxml2-dev"]),
+]
+#else
+let provider: [SystemPackageProvider] = [
+    .apt(["libxml2-dev"]),
+    .brew(["libxml2"]),
+]
+#endif
+
 let package = Package(
     name: "Kanna",
     products: [
@@ -12,10 +23,7 @@ let package = Package(
             name: "libxml2",
             path: "Modules",
             pkgConfig: "libxml-2.0",
-            providers: [
-                .apt(["libxml2-dev"]),
-                .brew(["libxml2"]),
-            ]
+            providers: provider
         ),
         .target(
             name: "Kanna",

diff --git a/Sources/Kanna/libxmlHTMLDocument.swift b/Sources/Kanna/libxmlHTMLDocument.swift
@@ -204,8 +204,7 @@ final class libxmlHTMLDocument: HTMLDocument {
         }
 
         let url : String = ""
-        docPtr = cur.withUnsafeBytes { xmlReadDoc($0.bindMemory(to: xmlChar.self).baseAddress!, url, charsetName, CInt(option)) }
-
+        docPtr = cur.withUnsafeBytes { htmlReadDoc($0.bindMemory(to: xmlChar.self).baseAddress!, url, charsetName, CInt(option)) }
         guard let docPtr = docPtr else {
             throw ParseError.EncodingMismatch
         }