Skip to content

Commit 963dfbf

Browse files
BrewTestBotchenrui333
authored andcommitted
libxml2 2.14.0
libxml2: remove build patch Signed-off-by: Rui Chen <[email protected]>
1 parent eeaf9bd commit 963dfbf

File tree

1 file changed

+3
-37
lines changed

1 file changed

+3
-37
lines changed

Formula/lib/libxml2.rb

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
11
class Libxml2 < Formula
22
desc "GNOME XML library"
33
homepage "http://xmlsoft.org/"
4+
url "https://download.gnome.org/sources/libxml2/2.14/libxml2-2.14.0.tar.xz"
5+
sha256 "3e2ed89d81d210322d70b35460166d4ea285e5bb017576972a1d76a09631985c"
46
license "MIT"
57

6-
stable do
7-
url "https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.7.tar.xz"
8-
sha256 "14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b"
9-
10-
depends_on "autoconf" => :build
11-
depends_on "automake" => :build
12-
depends_on "libtool" => :build
13-
14-
# Fix pkg-config checks for libicuuc. Patch taken from:
15-
# https://gitlab.gnome.org/GNOME/libxml2/-/commit/b57e022d75425ef8b617a1c3153198ee0a941da8
16-
# When the patch is no longer needed, remove along with the `stable` block
17-
# and the autotools dependencies above. Also uncomment `if build.head?`
18-
# condition in the `install` block.
19-
patch :DATA
20-
end
21-
228
# We use a common regex because libxml2 doesn't use GNOME's "even-numbered
239
# minor is stable" version scheme.
2410
livecheck do
@@ -73,7 +59,7 @@ def install
7359
# nanohttp.c:1019:42: error: invalid use of undefined type 'struct addrinfo'
7460
ENV.append "CFLAGS", "-std=gnu11" if OS.linux?
7561

76-
system "autoreconf", "--force", "--install", "--verbose" # if build.head?
62+
system "autoreconf", "--force", "--install", "--verbose" if build.head?
7763
system "./configure", "--disable-silent-rules",
7864
"--sysconfdir=#{etc}",
7965
"--with-history",
@@ -160,23 +146,3 @@ def install
160146
end
161147
end
162148
end
163-
164-
__END__
165-
diff --git a/configure.ac b/configure.ac
166-
index c6dc93d58f84f21c4528753d2ee1bc1d50e67ced..e7bad24d8f1aa7659e1aa4e2ad1986cc2167483b 100644
167-
--- a/configure.ac
168-
+++ b/configure.ac
169-
@@ -984,10 +984,10 @@ if test "$with_icu" != "no" && test "$with_icu" != "" ; then
170-
171-
# Try pkg-config first so that static linking works.
172-
# If this succeeeds, we ignore the WITH_ICU directory.
173-
- PKG_CHECK_MODULES([ICU], [icu-i18n], [
174-
- WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-i18n"
175-
+ PKG_CHECK_MODULES([ICU], [icu-uc], [
176-
+ WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-uc"
177-
m4_ifdef([PKG_CHECK_VAR],
178-
- [PKG_CHECK_VAR([ICU_DEFS], [icu-i18n], [DEFS])])
179-
+ [PKG_CHECK_VAR([ICU_DEFS], [icu-uc], [DEFS])])
180-
if test "x$ICU_DEFS" != "x"; then
181-
ICU_CFLAGS="$ICU_CFLAGS $ICU_DEFS"
182-
fi],[:])

0 commit comments

Comments
 (0)