Merge pull request #142057 from TheRealKeto/update/libplist

libplist 2.3.0
Homebrew · Sep 17, 2023 · 0af29cd · 0af29cd
2 parents 93579d6 + bce0a73
commit 0af29cd
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 114 deletions.
diff --git a/Formula/i/ideviceinstaller.rb b/Formula/i/ideviceinstaller.rb
@@ -3,37 +3,31 @@ class Ideviceinstaller < Formula
   homepage "https://www.libimobiledevice.org/"
   url "https://github.com/libimobiledevice/ideviceinstaller/releases/download/1.1.1/ideviceinstaller-1.1.1.tar.bz2"
   sha256 "deb883ec97f2f88115aab39f701b83c843e9f2b67fe02f5e00a9a7d6196c3063"
-  license "GPL-2.0"
+  license "GPL-2.0-or-later"
+  revision 1
+  head "https://github.com/libimobiledevice/ideviceinstaller.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any,                 arm64_ventura:  "fb42f5fc7e6da997dc22dd68fe9c57a711250259c737992eeb162cfe871cce99"
-    sha256 cellar: :any,                 arm64_monterey: "e5bf0e5ed6aad688593878bdf8e78c5aa84530ee053f5ea21ad433cf99f59873"
-    sha256 cellar: :any,                 arm64_big_sur:  "30f56186281509d1f77d7a00cbcd1f313cd80135e3f9e2a235ca649f9a23e5f1"
-    sha256 cellar: :any,                 ventura:        "d99cfeb0873b28db4ded6c9fdeb4ba29aa7603a20a284444752ca97c6e7af3b6"
-    sha256 cellar: :any,                 monterey:       "e6e374f35c4eeb37763e7755228c108ee96024b8599943fa741450be35915d93"
-    sha256 cellar: :any,                 big_sur:        "6d98523b90770662e350311c375f1157ac0c708769ce2145036aeed451e26621"
-    sha256 cellar: :any,                 catalina:       "6ee12db78e8c224c0eb0cf88eb4f43242eb1ba672eb006636273b99b75b02a87"
-    sha256 cellar: :any,                 mojave:         "6ed5e4f7ace33fd5f4d1b4c6b9f0fd519836080e170b981e63942087698351c6"
-    sha256 cellar: :any,                 high_sierra:    "0dfe944eaa47cad87ad22f70dbbcefdb6b27bbeb83ca1f7a229827c03054c07c"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "e225e3d9f0e6508b4fb73d9e7ea5eaec71b75d9d7ca7ac591adcfb3b9fd324fc"
-  end
-
-  head do
-    url "https://git.sukimashita.com/ideviceinstaller.git"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+    sha256 cellar: :any,                 arm64_ventura:  "dfaf6de5dc0578c882412ef904195d77a6aacf7f1b9b28855ba5d8610ce17ca1"
+    sha256 cellar: :any,                 arm64_monterey: "64803ee9f44f71a81476e4f609a96be3c33276da4eaa07f5f4c402e758fbd18c"
+    sha256 cellar: :any,                 arm64_big_sur:  "b76c11584f52a003b8b473a8b6e74a44244255b372d129a9dc0c89ae920a6c6b"
+    sha256 cellar: :any,                 ventura:        "cca7171c1e51ae86824029858e05c382a4f8088644aa0ac1d075c8d8a901b5ee"
+    sha256 cellar: :any,                 monterey:       "baade9b3f29b7de45b0ddfd66f911eadaba2b7d4a2fe6601e69f660757400ff7"
+    sha256 cellar: :any,                 big_sur:        "76b96ca732ae1bbba325139477cca6fe6f601cb62f0435232e497d619c56d828"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "85e4dd1751770e3068d164a48202b714923ac6acb344934f67ee2c9b6bd5b375"
   end
 
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "libtool" => :build
   depends_on "pkg-config" => :build
   depends_on "libimobiledevice"
   depends_on "libplist"
   depends_on "libzip"
 
   def install
-    system "./autogen.sh" if build.head?
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+    system "./autogen.sh", *std_configure_args if build.head?
+    system "./configure", *std_configure_args if build.stable?
     system "make", "install"
   end
 

diff --git a/Formula/i/ifuse.rb b/Formula/i/ifuse.rb
@@ -4,10 +4,11 @@ class Ifuse < Formula
   url "https://github.com/libimobiledevice/ifuse/archive/1.1.4.tar.gz"
   sha256 "2a00769e8f1d8bad50898b9d00baf12c8ae1cda2d19ff49eaa9bf580e5dbe78c"
   license "LGPL-2.1-or-later"
-  head "https://cgit.sukimashita.com/ifuse.git", branch: "master"
+  revision 1
+  head "https://github.com/libimobiledevice/ifuse.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, x86_64_linux: "ec03965eeaecd9443c4b5d20a0b20e6275fed16c084a4e05fe1f6cb01f3f7e42"
+    sha256 cellar: :any_skip_relocation, x86_64_linux: "15ee98ba9acdeac9332f12e1d97797bf7fb9cd5dd6cfcaaa508a795e9248fac2"
   end
 
   depends_on "autoconf" => :build
@@ -21,9 +22,7 @@ class Ifuse < Formula
   depends_on :linux # on macOS, requires closed-source macFUSE
 
   def install
-    system "./autogen.sh"
-    system "./configure", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+    system "./autogen.sh", *std_configure_args
     system "make", "install"
   end
 

diff --git a/Formula/i/ios-webkit-debug-proxy.rb b/Formula/i/ios-webkit-debug-proxy.rb
@@ -4,16 +4,16 @@ class IosWebkitDebugProxy < Formula
   url "https://github.com/google/ios-webkit-debug-proxy/archive/v1.9.0.tar.gz"
   sha256 "ba9bb2feaa976ad999e9e405d8cd8794cdf3546130a79f4785235200ead3c96c"
   license "BSD-3-Clause"
-  revision 1
+  revision 2
   head "https://github.com/google/ios-webkit-debug-proxy.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any, arm64_ventura:  "98a52dee813f9b7cc3bb923f01229d5b11641e18562f22ef52e96e2b248bbb6b"
-    sha256 cellar: :any, arm64_monterey: "5268a6ef7b32c2cd9d88e35e9e5667a7127258dd23c22a824e74bd4487e686fb"
-    sha256 cellar: :any, arm64_big_sur:  "3d693f91e25d8b165037afcbc36e14d8d54c8317bd01c770e5077a0ea4a0e72d"
-    sha256 cellar: :any, ventura:        "777efb32172aa98ef7cde6fd34107cd7fb42f132e12c8595bc2d5ad1c674e217"
-    sha256 cellar: :any, monterey:       "e17aec779a16ba66f75eb9bbbc76db078192ee15b5f87490e2ccfc54f699d4c8"
-    sha256 cellar: :any, big_sur:        "df411040e0e3babe6a487de5930b3ed7387610d1673ee42679780a34f72f3557"
+    sha256 cellar: :any, arm64_ventura:  "2e15e2507a76e76bac5b808e5a312dee84534081d3b61ed9b0e6cd6064de41d7"
+    sha256 cellar: :any, arm64_monterey: "6e2de52a77bb737e611b61efcb6a3990daaa177f1b464e1ca9aa6bb067f6b10b"
+    sha256 cellar: :any, arm64_big_sur:  "cb9b1101f02036e9fff4bd42dc85184726f579f8781ae77b5ab6f63a4e8e0318"
+    sha256 cellar: :any, ventura:        "318c0dc88e175fea4de51f1d34c33fd28547d8cdbc13530fece81069ef3d8181"
+    sha256 cellar: :any, monterey:       "0380d81a70ec66f0cac1c1c86a71dc82a3d93fbfffbba49ac5435389855dd508"
+    sha256 cellar: :any, big_sur:        "07ebc21b39e195a83a93240d74432e882ca31618b4efe9805c39da194035271f"
   end
 
   depends_on "autoconf" => :build
@@ -24,9 +24,15 @@ class IosWebkitDebugProxy < Formula
   depends_on "libplist"
   depends_on "openssl@3"
 
+  # Patch ios_webkit_debug_proxy to work with libplist 2.3.0
+  # Remove this once ios_webkit_debug_proxy gets a new release.
+  patch do
+    url "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch?full_index=1"
+    sha256 "39e7c648f1ecc96368caa469bd9aa0a552a272d72fafc937210f10d0894551e6"
+  end
+
   def install
-    system "./autogen.sh"
-    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./autogen.sh", *std_configure_args
     system "make", "install"
   end
 

diff --git a/Formula/l/ldid-procursus.rb b/Formula/l/ldid-procursus.rb
@@ -6,16 +6,17 @@ class LdidProcursus < Formula
      revision: "aaf8f23d7975ecdb8e77e3a8f22253e0a2352cef"
   version "2.1.5-procursus7"
   license "AGPL-3.0-or-later"
+  revision 1
   head "https://github.com/ProcursusTeam/ldid.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "244b1731df2a4fd86998f450ef8468c3e8146432f138e4d34e5026e1c67cf6ad"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "080815221a051720f22be34233295190556c516a99be52ef6ddd01303770660d"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "50fa08dc7167dfb64741eb6c7b423f2972764e45e06a4d8b269a4abc4c38181f"
-    sha256 cellar: :any_skip_relocation, ventura:        "463d3d0c21d8fcff6a905c46212a35402c215faffc92ba72c061d7a56404a3c6"
-    sha256 cellar: :any_skip_relocation, monterey:       "4e553ff21f53fa3c8d111a0692c5d214265eb2ff362530d66d6350311db48f0d"
-    sha256 cellar: :any_skip_relocation, big_sur:        "1e33ec8015cb54f040f112818c7a4de417c4bda73b0856d1ce1ddedf92da3906"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "dd92a11facd88817f7ea51211a599d2e16691f9ace76dde451d013171091089e"
+    sha256 cellar: :any,                 arm64_ventura:  "ce834166720b5788636ce9dfeb2b446be1a454515abde1941187d219282def09"
+    sha256 cellar: :any,                 arm64_monterey: "93e84ff2e1e2da2b857b52f275128d97681cfe41e9f59f2f3222f378ef35fa37"
+    sha256 cellar: :any,                 arm64_big_sur:  "4a685ad1062cc656373edfe43548bf7adbf5c3dead465cc86d0739dac006df01"
+    sha256 cellar: :any,                 ventura:        "f3745355487cf17375f645f31cf34e85bde0bbb4960e75885c6106196a265589"
+    sha256 cellar: :any,                 monterey:       "21262358f8d2a81af29c475ace106bf65a970a85c69f391386b9f9fdfe8106b3"
+    sha256 cellar: :any,                 big_sur:        "ff338dfc081e8ed4930aecbfb55629ed21cc4a34bf9f346ca987e01ea5c48cf7"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "652b8cca448c7047a641d795a7149bff84a282bf8727c72ec6a83a05619fd2ac"
   end
 
   depends_on "pkg-config" => :build

diff --git a/Formula/l/ldid.rb b/Formula/l/ldid.rb
@@ -5,17 +5,17 @@ class Ldid < Formula
       tag:      "v2.1.5",
       revision: "a23f0faadd29ec00a6b7fb2498c3d15af15a7100"
   license "AGPL-3.0-or-later"
+  revision 1
   head "https://git.saurik.com/ldid.git", branch: "master"
 
   bottle do
-    rebuild 2
-    sha256 cellar: :any_skip_relocation, arm64_ventura:  "de5309e94aa8b3d89a5fc491303ba085f1447e78dfc5faf3b33b3ea5924a26ce"
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "46638da20907c85a843694387ebff5a5519efb954073f6d2c516ab24ab75b0a2"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "cc9883ac2ba363d2b4a2d95cc473be36d856ab84fad1251ecbaaa95b976f98c9"
-    sha256 cellar: :any_skip_relocation, ventura:        "80abfac117205b631eec200775430181265f811d33b559e3d51608e19894f4ba"
-    sha256 cellar: :any_skip_relocation, monterey:       "238070b4a07e3a2606620266d870be97193e60c34224e3056a40288efaf589a1"
-    sha256 cellar: :any_skip_relocation, big_sur:        "1d1c195538de1b21aed193e94866f82951b3ad99226d0b6e4a9852af09fec35e"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "eba4a8deb51016607b6fdc681c2bb9168e294f83d098f6c25a76b1c66d3be803"
+    sha256 cellar: :any,                 arm64_ventura:  "552c265e507a066ffec6f2476dc9d6057a2ba41537f44f067a50c74ece9429bf"
+    sha256 cellar: :any,                 arm64_monterey: "a14aa56dab553afd69f82c3b63a167edb6ae2c3355a8f393e9a6c6c3c05e8432"
+    sha256 cellar: :any,                 arm64_big_sur:  "a5f4fffe051e8b54f8c0158ce937802297a76af4dad9140c13ad25a935f4f38d"
+    sha256 cellar: :any,                 ventura:        "b6aba3db5dd5aab6835280e0fe777a566cc5eb524290482602ee2b8018145760"
+    sha256 cellar: :any,                 monterey:       "2adcc78190f359d7c5485a29cc84c37f5bf3360c39e2cd2cc975a5449bf3db6c"
+    sha256 cellar: :any,                 big_sur:        "7373fc777890c829de08c79475c3b2caa55f68c30f97398201ff3dd9c55638ca"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "4519a8fb688fea614c230562638a0d4704e7f1aad8d9372845d0b28cc5281479"
   end
 
   depends_on "libplist"

diff --git a/Formula/lib/libimobiledevice.rb b/Formula/lib/libimobiledevice.rb
@@ -3,41 +3,45 @@ class Libimobiledevice < Formula
   homepage "https://www.libimobiledevice.org/"
   url "https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2"
   sha256 "53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6"
-  license "LGPL-2.1"
-  revision 1
+  license "LGPL-2.1-or-later"
+  revision 2
+  head "https://github.com/libimobiledevice/libimobiledevice.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any,                 arm64_ventura:  "8b0bc526c6c835d2520e0639f3d69878d36924ff027cdf37079b4e13c1c3c811"
-    sha256 cellar: :any,                 arm64_monterey: "fbb4fb23c2748673e31c493b5e0cf96d95004e6ab5dd68be83a6544153499ba7"
-    sha256 cellar: :any,                 arm64_big_sur:  "a65ec432835dd253158a5044dfd7fafaab256467973b8a01f066fd6e29cedba7"
-    sha256 cellar: :any,                 ventura:        "9f4d061e7b5acbc2b923417015ace4bd8612a5c15da38e0499ae6835b449b890"
-    sha256 cellar: :any,                 monterey:       "d896a569b513227dae0b0db4a2b2ae3117b1a7330be096bc9a2d791a925c232b"
-    sha256 cellar: :any,                 big_sur:        "62ea023e2c7fa38577a731e0d19e97d7e0a109beb6da1ea9b1a3c5baee6f034e"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "eb10c484ec49f216384ad7e80d309e026178359df395892b28400f24cb7fedf5"
-  end
-
-  head do
-    url "https://git.libimobiledevice.org/libimobiledevice.git"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+    sha256 cellar: :any,                 arm64_ventura:  "70b129a29fcade5e0717d8f7b747158294bcc81be05163c072b1f8bb069489de"
+    sha256 cellar: :any,                 arm64_monterey: "307443c3218998505bc71579e9f7ba270f17d825dc59f7cbdac51705cba14760"
+    sha256 cellar: :any,                 arm64_big_sur:  "b9b7296bb7f0573e62bdd3d6f9637b6206455b7628a80db653f5636e13bbc6a3"
+    sha256 cellar: :any,                 ventura:        "bf17ea268adc5a0e2f0a20fe0a54cadfddd93694034571958492f33337ce201e"
+    sha256 cellar: :any,                 monterey:       "fa00bbc261ab959da8712ddcdf118019321870216d6d92eb5243273598ebbe84"
+    sha256 cellar: :any,                 big_sur:        "fb8e517ba7c3d558f22513d32844c6810c49c37a59241191b7ee6e2a509775f4"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "9543f31389a43c41fafeed7e92c477aa9fb936ecd75de0397c3bf337c49ee1c9"
   end
 
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "libtool" => :build
   depends_on "pkg-config" => :build
   depends_on "libplist"
   depends_on "libtasn1"
   depends_on "libusbmuxd"
   depends_on "openssl@3"
 
   def install
-    system "./autogen.sh" if build.head?
-    system "./configure", "--disable-dependency-tracking",
-                          "--disable-silent-rules",
-                          "--prefix=#{prefix}",
-                          # As long as libplist builds without Cython
-                          # bindings, libimobiledevice must as well.
-                          "--without-cython",
-                          "--enable-debug-code"
+    # Make libimobiledevice work with libplist 2.3.0
+    # Remove this once libimobiledevice gets a new release
+    inreplace "common/utils.h", "PLIST_FORMAT_XML", "PLIST_FORMAT_XML_" if build.stable?
+    inreplace "common/utils.h", "PLIST_FORMAT_BINARY", "PLIST_FORMAT_BINARY_" if build.stable?
+
+    # As long as libplist builds without Cython bindings,
+    # so should libimobiledevice as well.
+    args = %w[
+      --disable-silent-rules
+      --without-cython
+      --enable-debug
+    ]
+
+    system "./autogen.sh", *std_configure_args, *args if build.head?
+    system "./configure", *std_configure_args, *args if build.stable?
     system "make", "install"
   end
 

diff --git a/Formula/lib/libplist.rb b/Formula/lib/libplist.rb
@@ -1,27 +1,19 @@
 class Libplist < Formula
   desc "Library for Apple Binary- and XML-Property Lists"
   homepage "https://www.libimobiledevice.org/"
-  url "https://github.com/libimobiledevice/libplist/archive/2.2.0.tar.gz"
-  sha256 "7e654bdd5d8b96f03240227ed09057377f06ebad08e1c37d0cfa2abe6ba0cee2"
-  license "LGPL-2.1"
+  url "https://github.com/libimobiledevice/libplist/releases/download/2.3.0/libplist-2.3.0.tar.bz2"
+  sha256 "4e8580d3f39d3dfa13cefab1a13f39ea85c4b0202e9305c5c8f63818182cac61"
+  license "LGPL-2.1-or-later"
+  head "https://github.com/libimobiledevice/libplist.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any,                 arm64_sonoma:   "01262690c3dea33ba8d621b5f9e748c84f7e38a3b6648425bf5a97493a9d3ccf"
-    sha256 cellar: :any,                 arm64_ventura:  "6d101d1a75fe2859fce732e1a9448053c74707a3cdc7e10e4b67488d978b0796"
-    sha256 cellar: :any,                 arm64_monterey: "b31c287f7c027c0f241dbfecb261e2a71910dcff601ceb5404ec8072dfd2a453"
-    sha256 cellar: :any,                 arm64_big_sur:  "ed9c2d665d5700c91f099bd433a38ba904b63eef4d3cdc47bd0f6b0229ac689a"
-    sha256 cellar: :any,                 sonoma:         "14142fc189e6a7252f33178270df4f7480ea41ea3d9e802332eb84d6c2d4ad74"
-    sha256 cellar: :any,                 ventura:        "df3e285aa4d7ce69059bf1609fa5d2a442e0c1434e478e5603567702d3e38760"
-    sha256 cellar: :any,                 monterey:       "fd33860939e18cc5a5c50be2ca667db7d99a191aa445fefdfde51435c0f4453d"
-    sha256 cellar: :any,                 big_sur:        "1ac05ef69cc02f4663fbb1c3d6d6e964c70a5ba0743d7e9e242da06864a63a70"
-    sha256 cellar: :any,                 catalina:       "20faf60d286c8ceed790a9b6e34245acf7bafacc7fcbcb390d6b62e194b323e6"
-    sha256 cellar: :any,                 mojave:         "768453f8710ec1c3e074ad0ebc7723da88c2b8575e5de6962ca6f1d4a85cb61d"
-    sha256 cellar: :any,                 high_sierra:    "02291f2f28099a73de8fa37b49962fe575a434be63af356cceff9200c6d73f37"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "f6677078ae6fbcfeabfee04dcb64e405f1bfcea07643752e3b5db89780404d5e"
-  end
-
-  head do
-    url "https://git.sukimashita.com/libplist.git"
+    sha256 cellar: :any,                 arm64_ventura:  "d0848674bb98f00bff90a4fd2050199f4af5089013615232b39a1576f2aa499f"
+    sha256 cellar: :any,                 arm64_monterey: "d9d090a1fb60685102e8bd96ed3c45b67790c0e8fb96307ce9afdc081657ad4f"
+    sha256 cellar: :any,                 arm64_big_sur:  "7877aaa1c6c9402f87c7fd7a9acdc6f3d8b8c64cee8930f8b51e3392e5e2c571"
+    sha256 cellar: :any,                 ventura:        "9065713a5114093c9b7bf00dd38684efb174258cdc55aa088782c7dfc8072f3f"
+    sha256 cellar: :any,                 monterey:       "a0b5c7c503c8a6f37b066f7a4681981286cfa310e775d9dffecee11909d1b7eb"
+    sha256 cellar: :any,                 big_sur:        "cbfad8fed1b127f3837d6b4079b4c14198dbc56144af26c16de188c6b33b53be"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "99b326624adf5c2b1781060ef7692b9d0e476e73c1901eba64222be31c6a39c7"
   end
 
   depends_on "autoconf" => :build
@@ -32,16 +24,15 @@ class Libplist < Formula
   def install
     ENV.deparallelize
 
-    args = %W[
-      --disable-dependency-tracking
+    args = %w[
       --disable-silent-rules
-      --prefix=#{prefix}
       --without-cython
     ]
 
-    system "./autogen.sh", *args
+    system "./autogen.sh", *std_configure_args, *args if build.head?
+    system "./configure", *std_configure_args, *args if build.stable?
     system "make"
-    system "make", "install", "PYTHON_LDFLAGS=-undefined dynamic_lookup"
+    system "make", "install"
   end
 
   test do