glib 2.42.2

Update to latest stable release, use HTTPS on homepage URL, change
'test' option to 'with-test', modernize formula.

Closes #37463.

Signed-off-by: Xu Cheng <xucheng@me.com>

1 files changed, 27 insertions, 27 deletions

diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index a664c8351..e23fce56b 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -1,9 +1,7 @@
-require 'formula'
-
 class Glib < Formula
-  homepage "http://developer.gnome.org/glib/"
-  url "http://ftp.gnome.org/pub/gnome/sources/glib/2.42/glib-2.42.1.tar.xz"
-  sha256 "8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a"
+  homepage "https://developer.gnome.org/glib/"
+  url "http://ftp.gnome.org/pub/gnome/sources/glib/2.42/glib-2.42.2.tar.xz"
+  sha256 "a3cc1ebd2bd310a9fdf42ae4293ee713cdf1764bd29f552febf3bf44cadae7db"
 
   bottle do
     sha1 "4e6e2a4663a87d696be3d307b97451507f048b65" => :yosemite
@@ -12,22 +10,24 @@ class Glib < Formula
   end
 
   option :universal
-  option 'test', 'Build a debug build and run tests. NOTE: Not all tests succeed yet'
-  option 'with-static', 'Build glib with a static archive.'
+  option "with-test", "Build a debug build and run tests. NOTE: Not all tests succeed yet"
+  option "with-static", "Build glib with a static archive."
+
+  deprecated_option "test" => "with-test"
 
-  depends_on 'pkg-config' => :build
-  depends_on 'gettext'
-  depends_on 'libffi'
+  depends_on "pkg-config" => :build
+  depends_on "gettext"
+  depends_on "libffi"
 
   fails_with :llvm do
     build 2334
     cause "Undefined symbol errors while linking"
   end
 
-  resource 'config.h.ed' do
-    url 'https://trac.macports.org/export/111532/trunk/dports/devel/glib2/files/config.h.ed'
-    version '111532'
-    sha1 '0926f19d62769dfd3ff91a80ade5eff2c668ec54'
+  resource "config.h.ed" do
+    url "https://trac.macports.org/export/111532/trunk/dports/devel/glib2/files/config.h.ed"
+    version "111532"
+    sha256 "9f1e23a084bc879880e589893c17f01a2f561e20835d6a6f08fcc1dad62388f1"
   end
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix,
@@ -35,7 +35,7 @@ class Glib < Formula
   # id file.
   patch do
     url "https://gist.githubusercontent.com/jacknagel/af332f42fae80c570a77/raw/7b5fd0d2e6554e9b770729fddacaa2d648327644/glib-hardcoded-paths.diff"
-    sha1 "78bbc0c7349d7bfd6ab1bfeabfff27a5dfb1825a"
+    sha256 "a4cb96b5861672ec0750cb30ecebe1d417d38052cac12fbb8a77dbf04a886fcb"
   end
 
   # Fixes compilation with FSF GCC. Doesn't fix it on every platform, due
@@ -43,12 +43,12 @@ class Glib < Formula
   # Patch submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=672777
   patch do
     url "https://gist.githubusercontent.com/jacknagel/9835034/raw/371fd57f7d3823c67dbd5bc738df7ef5ffc7545f/gio.patch"
-    sha1 "b947912a4f59630c13e53056c8b18bde824860f4"
+    sha256 "c4a18981eb61c2f9adbf768d1f34be135d23e74d28e363a554f2b700a83a60fd"
   end
 
   patch do
     url "https://gist.githubusercontent.com/jacknagel/9726139/raw/bc60b41fa23ae72f56128e16c9aa5d2d26c75c11/universal.patch"
-    sha1 "ab9b8ba9d7c3fd493a0e24638a95e26f3fe613ac"
+    sha256 "54d964a9ed019b8949e33a1e7a0f174d40f6fc4a53f053d95f1506e03a53a5d0"
   end if build.universal?
 
   def install
@@ -69,35 +69,35 @@ class Glib < Formula
       --with-gio-module-dir=#{HOMEBREW_PREFIX}/lib/gio/modules
     ]
 
-    args << '--enable-static' if build.with? 'static'
+    args << "--enable-static" if build.with? "static"
 
     system "./configure", *args
 
     if build.universal?
-      buildpath.install resource('config.h.ed')
-      system "ed -s - config.h <config.h.ed"
+      buildpath.install resource("config.h.ed")
+      system "ed", "-s", "-", "config.h", "<config.h.ed"
     end
 
     system "make"
     # the spawn-multithreaded tests require more open files
-    system "ulimit -n 1024; make check" if build.include? 'test'
-    system "make install"
+    system "ulimit", "-n", "1024;", "make", "check" if build.include? "test"
+    system "make", "install"
 
     # `pkg-config --libs glib-2.0` includes -lintl, and gettext itself does not
     # have a pkgconfig file, so we add gettext lib and include paths here.
     gettext = Formula["gettext"].opt_prefix
-    inreplace lib+'pkgconfig/glib-2.0.pc' do |s|
-      s.gsub! 'Libs: -L${libdir} -lglib-2.0 -lintl',
+    inreplace lib+"pkgconfig/glib-2.0.pc" do |s|
+      s.gsub! "Libs: -L${libdir} -lglib-2.0 -lintl",
               "Libs: -L${libdir} -lglib-2.0 -L#{gettext}/lib -lintl"
-      s.gsub! 'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include',
+      s.gsub! "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include",
               "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext}/include"
     end
 
-    (share+'gtk-doc').rmtree
+    (share+"gtk-doc").rmtree
   end
 
   test do
-    (testpath/'test.c').write <<-EOS.undent
+    (testpath/"test.c").write <<-EOS.undent
       #include <string.h>
       #include <glib.h>