Merge pull request #191187 from Homebrew/bump-ghostscript-10.04.0

ghostscript 10.04.0
Homebrew · Sep 19, 2024 · abdd37f · abdd37f
2 parents 92e89cc + d038299
commit abdd37f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 105 deletions.
diff --git a/Formula/g/ghostscript.rb b/Formula/g/ghostscript.rb
@@ -1,27 +1,10 @@
 class Ghostscript < Formula
   desc "Interpreter for PostScript and PDF"
   homepage "https://www.ghostscript.com/"
+  url "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10040/ghostpdl-10.04.0.tar.xz"
+  sha256 "0603f5629bc6f567b454911d104cd96702489c9e70e577787843f480b23d4a77"
   license "AGPL-3.0-or-later"
 
-  stable do
-    url "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/ghostpdl-10.03.1.tar.xz"
-    sha256 "05eee45268f6bb2c6189f9a40685c4608ca089443a93f2af5f5194d83dc368db"
-
-    on_macos do
-      # 1. Prevent dependent rebuilds on minor version bumps.
-      # Reported upstream at:
-      #   https://bugs.ghostscript.com/show_bug.cgi?id=705907
-      patch :DATA
-    end
-
-    # Backport fix for missing pointer dereference
-    # https://bugs.ghostscript.com/show_bug.cgi?id=707649
-    patch do
-      url "https://github.com/ArtifexSoftware/ghostpdl/commit/90cabe08422afdd16bac5dd9217602679d943045.patch?full_index=1"
-      sha256 "deed9573aa17adbab2776f44b58a851b5aac06e2cdd99440169ca16ec9504de0"
-    end
-  end
-
   # The GitHub tags omit delimiters (e.g. `gs9533` for version 9.53.3). The
   # `head` repository tags are formatted fine (e.g. `ghostpdl-9.53.3`) but a
   # version may be tagged before the release is available on GitHub, so we
@@ -32,15 +15,12 @@ class Ghostscript < Formula
   end
 
   bottle do
-    rebuild 1
-    sha256 arm64_sequoia:  "c5f70c8ebed71bf33bfc579776e9d0b161dd2a6cb2b5db19d63c09a366d361d4"
-    sha256 arm64_sonoma:   "b0d9503a7efa718b2c1c2994b442065e79cf3a7807402944e19d278391766077"
-    sha256 arm64_ventura:  "7bd21d992e534be507dd7d457c6a0b1cdf76ef1743976276c1eaa256bca2306c"
-    sha256 arm64_monterey: "ac3c82a2bccbea544614781dc85aa1400d1665d40e37f1df1de0986daa76e1f0"
-    sha256 sonoma:         "42ea47a742a77e6b96346d8989cbe9dbeed019537865aa38e61209fe73e28bc4"
-    sha256 ventura:        "1f4b9b7577337c6702d6891d1ad686cca240c9895135b917d3bc146c580a9d86"
-    sha256 monterey:       "ea25cdd4def41ef333c0503b3101d6baf6a47505cd585de55d1e0cba88426f53"
-    sha256 x86_64_linux:   "b2b04161201e1f17a9ca9511e0579ae97d65a40f4bc7d195865ac7f5d8c972f6"
+    sha256 arm64_sequoia: "1ec5dc13df46f9336bd39399ba4d0564fcba2f63f0c4ca008f2b86e3172f4d04"
+    sha256 arm64_sonoma:  "0193b5a6ca5b47a35263cb547d09b438048ff532315d010cd544bf513d2a64ec"
+    sha256 arm64_ventura: "ddc4cba70de0af25125eba0ba9e5b7ced5e2290622f83bba20f20da246637594"
+    sha256 sonoma:        "0ea2144019a3128a6b1e0b640d491b5d457666be21d0763166ffe94764eab716"
+    sha256 ventura:       "6505dca6f56f4af62d12af839ee75b3ad5ef91c880d87982b81567b1f59835e2"
+    sha256 x86_64_linux:  "51882cc46695af1c7e7732ddedfa8e02e41a4c7797981e5c77bd3dc75bdb6950"
   end
 
   head do
@@ -56,11 +36,14 @@ class Ghostscript < Formula
   depends_on "freetype"
   depends_on "jbig2dec"
   depends_on "jpeg-turbo"
+  depends_on "leptonica"
+  depends_on "libarchive"
   depends_on "libidn"
   depends_on "libpng"
   depends_on "libtiff"
   depends_on "little-cms2"
   depends_on "openjpeg"
+  depends_on "tesseract"
 
   uses_from_macos "expat"
   uses_from_macos "zlib"
@@ -77,7 +60,7 @@ class Ghostscript < Formula
 
   def install
     # Delete local vendored sources so build uses system dependencies
-    libs = %w[expat freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib]
+    libs = %w[expat freetype jbig2dec jpeg lcms2mt leptonica libpng openjpeg tesseract tiff zlib]
     libs.each { |l| rm_r(buildpath/l) }
 
     configure = build.head? ? "./autogen.sh" : "./configure"
@@ -87,9 +70,7 @@ def install
               --disable-gtk
               --with-system-libtiff
               --without-x]
-    # Work around neon detection bug: https://bugs.ghostscript.com/show_bug.cgi?id=707993
-    odie "`--disable-neon` workaround should be removed!" if build.stable? && version > "10.03.1"
-    args << "--disable-neon" if DevelopmentTools.clang_build_version >= 1600
+
     system configure, *std_configure_args, *args
 
     # Install binaries and libraries
@@ -104,40 +85,3 @@ def install
     assert_match "Hello World!", shell_output("#{bin}/ps2ascii #{ps}")
   end
 end
-
-__END__
-diff --git a/base/unix-dll.mak b/base/unix-dll.mak
-index 89dfa5a..c907831 100644
---- a/base/unix-dll.mak
-+++ b/base/unix-dll.mak
-@@ -100,10 +100,26 @@ GS_DLLEXT=$(DLL_EXT)
-
-
- # MacOS X
--#GS_SOEXT=dylib
--#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
--#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
--#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+GS_SOEXT=dylib
-+GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-+GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+
-+PCL_SONAME=$(PCL_SONAME_BASE).$(GS_SOEXT)
-+PCL_SONAME_MAJOR=$(PCL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+PCL_SONAME_MAJOR_MINOR=$(PCL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+
-+XPS_SONAME=$(XPS_SONAME_BASE).$(GS_SOEXT)
-+XPS_SONAME_MAJOR=$(XPS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+XPS_SONAME_MAJOR_MINOR=$(XPS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+
-+PDF_SONAME=$(PDF_SONAME_BASE).$(GS_SOEXT)
-+PDF_SONAME_MAJOR=$(PDF_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+PDF_SONAME_MAJOR_MINOR=$(PDF_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
-+
-+GPDL_SONAME=$(GPDL_SONAME_BASE).$(GS_SOEXT)
-+GPDL_SONAME_MAJOR=$(GPDL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
-+GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
- #LDFLAGS_SO=-dynamiclib -flat_namespace
- #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
- #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
diff --git a/Formula/i/imagemagick.rb b/Formula/i/imagemagick.rb
@@ -4,7 +4,7 @@ class Imagemagick < Formula
   url "https://imagemagick.org/archive/releases/ImageMagick-7.1.1-38.tar.xz"
   sha256 "48de548d4977fc226c982ca03b9d6ad8001b47d8dc142b49fdca69333bc4ad82"
   license "ImageMagick"
-  revision 1
+  revision 2
   head "https://github.com/ImageMagick/ImageMagick.git", branch: "main"
 
   livecheck do
@@ -13,12 +13,12 @@ class Imagemagick < Formula
   end
 
   bottle do
-    sha256 arm64_sequoia: "679024968db36f074160e8d51387ba006f5272d5052e2a20d58af16572dda033"
-    sha256 arm64_sonoma:  "1def35803873d41a16207e12a313927906fe0f4cf3c3bb73c7fcdfbbb554845d"
-    sha256 arm64_ventura: "73127b2b3769724413bb14177c100e084d44a8ff8a0c4b837240bd85d37879f1"
-    sha256 sonoma:        "6343e84454c2c147888440d838d55506c4c69f8be65e8b935d9b504f84946d42"
-    sha256 ventura:       "7de104666135d7872657cac2e62ba007091257b521703aa15984c54a6f49d2bc"
-    sha256 x86_64_linux:  "800716ecff2ef27233eb73289f2c4ae47a88a0a01a3a2560375ff0c7559c1f2a"
+    sha256 arm64_sequoia: "c2cb0b528e9d2265cd80df802438f8c42826c0f394c4862720082a4655061ead"
+    sha256 arm64_sonoma:  "0f83ef549c139885ac25385a001d9a9d6de78a49ac00c6b0d554857fede02159"
+    sha256 arm64_ventura: "0fb63cab295985d97f12b4244149a268f11c9fc73fa7ffd03595c7f7133a03f1"
+    sha256 sonoma:        "0131b887acc0b5e150d56154284defec76d80ff059a11ca9f4f14bea290949a8"
+    sha256 ventura:       "d5cf70826f720760a7baf9f53b4b505196fa2c63d150be8925aae0d873f363af"
+    sha256 x86_64_linux:  "76d2634d9692e27eb767449178d06999f6863d43e385317f5b3ee37f9c9852f4"
   end
 
   depends_on "pkg-config" => :build

diff --git a/Formula/i/[email protected] b/Formula/i/[email protected]
@@ -4,6 +4,7 @@ class ImagemagickAT6 < Formula
   url "https://imagemagick.org/archive/releases/ImageMagick-6.9.13-16.tar.xz"
   sha256 "a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98"
   license "ImageMagick"
+  revision 1
   head "https://github.com/imagemagick/imagemagick6.git", branch: "main"
 
   livecheck do
@@ -12,14 +13,12 @@ class ImagemagickAT6 < Formula
   end
 
   bottle do
-    sha256 arm64_sequoia:  "b6eb6d29037266688445cdc3caff1eb9424fea85ddbbf3dc9e420bde629b57c3"
-    sha256 arm64_sonoma:   "22e2b322e90a67f5bfd202ca5563b7e0092f9e4a588d2622a3814454cbda6a63"
-    sha256 arm64_ventura:  "d523dba9fd8fbf18a727487fa97bd7b6cd5b90e20280389c2f8d28ba4797c601"
-    sha256 arm64_monterey: "9457587c607afb849627928ba7989ca37937a48d4dd651594a512fa83d9a997a"
-    sha256 sonoma:         "162c3cbb102b96ba4273b53998f2fc792e8f5f83cce4d945889652c306b02386"
-    sha256 ventura:        "7d2099b5f94988b0eedb847622ae2d1aa42135e52c49c77ce94c81ad52a6553f"
-    sha256 monterey:       "f8e7f4a45b7cc228414ab1d97a90cd08a189a5d2deb9c838fe88de3ab1c920f5"
-    sha256 x86_64_linux:   "03540960f619e976bcfa5976b9ead240da6e12d0f6341a97fbc7612fa1d171e9"
+    sha256 arm64_sequoia: "8f604cd071b004863d5ef5e43f488474315cd34da56cce1a0f67384c406bf71f"
+    sha256 arm64_sonoma:  "f79536fdaeee84255d18817097032c94ffc05a272f3332c798cc437d021cddd3"
+    sha256 arm64_ventura: "b876b1cabe6de56ce80e000b38f2d6dcf4be0904a2d728edf0f6815940302003"
+    sha256 sonoma:        "031f301aef21795fb538aa752cead963376521ffe5615dfc1e0333d59bca2c45"
+    sha256 ventura:       "42b248e9c26b0127826d710a7f2a83e1fd8cf99cc4483fdb7ea7d2404200a8e9"
+    sha256 x86_64_linux:  "8d72f3dca188b36694698f65f8f1586baea75309f7d82944202743d9d362f912"
   end
 
   keg_only :versioned_formula

diff --git a/Formula/lib/libspectre.rb b/Formula/lib/libspectre.rb
@@ -4,24 +4,20 @@ class Libspectre < Formula
   url "https://libspectre.freedesktop.org/releases/libspectre-0.2.12.tar.gz"
   sha256 "55a7517cd3572bd2565df0cf450944a04d5273b279ebb369a895391957f0f960"
   license "GPL-2.0-or-later"
-  revision 1
+  revision 2
 
   livecheck do
     url "https://libspectre.freedesktop.org/releases/"
     regex(/href=.*?libspectre[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia:  "ff6a0dc0776a7d81ccaa06e196fd582ce4ff60bc956b600588276142af738dd7"
-    sha256 cellar: :any,                 arm64_sonoma:   "cb745b0fbd3bd844205f3433c65bf0668487927d3faef3bd13250f7303f010a5"
-    sha256 cellar: :any,                 arm64_ventura:  "982e8f1996c44e7e473a141ffc5cf370405925f9a631c43b4a48da9e575c2b8f"
-    sha256 cellar: :any,                 arm64_monterey: "842d9762ba3438664feea6d163ac837f650ddb2f6f87d7464d90b6de4f070e3e"
-    sha256 cellar: :any,                 arm64_big_sur:  "e7eb36d1be8871a6c1b3442dcf77b0a1f7e0a33d5e4db59853fc603a62f742a0"
-    sha256 cellar: :any,                 sonoma:         "91965c40959e93bc19589acf6ebd5460bb391d7386905f1cdb9030ac55a99dbb"
-    sha256 cellar: :any,                 ventura:        "ea5c3404dc8e5e55a1f6a386e1e4b7a34718b99a1906f7f3a378df290ad120cd"
-    sha256 cellar: :any,                 monterey:       "7247bdd2974cd294ff3e4139bf5256f0d3c202c023d68a953f8f4491cece3e3e"
-    sha256 cellar: :any,                 big_sur:        "ac90c238075466686c5c6ed59a8b4dd0135f2b3db6fcb19a7cd865f4f11dc156"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "af8f8cdf6315633ce8dfef6a5b0078a786ca06219aa979f2f6f1818033a54203"
+    sha256 cellar: :any,                 arm64_sequoia: "d9e00969398b5ccd244aed543e3a6468f56e07dbc1939d7bde6b4b9d19701001"
+    sha256 cellar: :any,                 arm64_sonoma:  "c7ff644160fb7011b2eeba6c07102db37b587c1f80631f4f2abdd81dbe476dcf"
+    sha256 cellar: :any,                 arm64_ventura: "aac4fe3f1a81468053f6652fd67dec5416b759b86060a5e62cb804f5ed4bb6a2"
+    sha256 cellar: :any,                 sonoma:        "ef295c014933eb73252356d5f6ef9fcbadacf864fb02335c232f3f109d9c1733"
+    sha256 cellar: :any,                 ventura:       "5c11e5bf8c575510008c9d7f3cb0cd540d35897521a70d81fb30eb0099bbf658"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "749030918fe30fbba3b0332ad978765f638c0ce4b1a79b26cf8a632c10631cb4"
   end
 
   depends_on "ghostscript"

diff --git a/Formula/x/xfig.rb b/Formula/x/xfig.rb
@@ -4,23 +4,20 @@ class Xfig < Formula
   url "https://downloads.sourceforge.net/mcj/xfig-3.2.9.tar.xz"
   sha256 "13ed9d04d1bbc2dec09da7ef49ceec278382d290f6cd926474c2f2d016fec2f7"
   license "MIT"
+  revision 1
 
   livecheck do
     url :stable
     regex(%r{url=.*?/xfig[._-]v?(\d+(?:\.\d+)+[a-z]?)\.t}i)
   end
 
   bottle do
-    sha256 arm64_sequoia:  "f9eba9bad80e6cc3f7923c28a538a17f0f85bb60bb00522b0124e01b40d315ed"
-    sha256 arm64_sonoma:   "2ce377c656dab395b95d498c03b8b3b95a1153f63cef176c3039291c55760834"
-    sha256 arm64_ventura:  "ab1c86c5044e495596fe576e1c053478251d70a5faece3f221d165d29b9c3ee5"
-    sha256 arm64_monterey: "39f08a4ba5383fa90cb2a4b76d0b8b5d6929843f6fac04450249e85ef647ac43"
-    sha256 arm64_big_sur:  "7626ebc11c73a512392640c29e57a1579ef4cfc4bbfe1ec774cc42692c44554d"
-    sha256 sonoma:         "c147b060e3cafb4a5932294471a3b808faffc1c46dc321a50471e6e22b27e4a2"
-    sha256 ventura:        "680fc82cd8fb6aeb17cfc09c4de0d98eeec23a86e71d580757bebaf857fe0688"
-    sha256 monterey:       "18fff7f110a0e27f75e4a99c3116900af986814aa1dadd3fc7cb947bffca2852"
-    sha256 big_sur:        "0ff1ddc946b12ba65d183737b31678b6c4baedcb0cc012557bec0128f74b28f7"
-    sha256 x86_64_linux:   "b07b185ca2339fe988e5b4b379da797c1760874feead0d5029131953e4a78427"
+    sha256 arm64_sequoia: "00065bb855d889cb03d1b9a6be6b8e379afbdc34eec9bd8a6b295c7c6569f66f"
+    sha256 arm64_sonoma:  "fc167af1203cd9c55c4b608d648ec787c0fab60d03addae286b93354edfa4a27"
+    sha256 arm64_ventura: "78a6256536cf3979802f06d9c739f1167a9dd1dc79e82973c426c84002616ade"
+    sha256 sonoma:        "248e1c225dbae1d8272f3fdde6e7d73ab7c200ced0855e6da9fdfea637b0fb2d"
+    sha256 ventura:       "45c8fe0a50ab221a983d50b39016857a07df1a6e753a1fa62d21b100624c7fcf"
+    sha256 x86_64_linux:  "d18838b6078735b2015842785ca34e48695ecd25a33569b406bfd125cda965da"
   end
 
   depends_on "fig2dev"