Skip to content

Commit eba2c32

Browse files
BrewTestBotBrewTestBot
authored
Merge pull request #196688 from jeroen/poppler
poppler poppler-qt5 24.11.0
2 parents 30c3d2d + e5908ac commit eba2c32

File tree

6 files changed

+51
-53
lines changed

6 files changed

+51
-53
lines changed

‎Formula/e/efl.rb‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ class Efl < Formula
44
url "https://download.enlightenment.org/rel/libs/efl/efl-1.27.0.tar.xz"
55
sha256 "3dfb99fbcc268c0bc797e2f83e8c503ef9de66284f40b381bb597a08185c00f4"
66
license all_of: ["GPL-2.0-only", "LGPL-2.1-only", "BSD-2-Clause", "FTL", "zlib-acknowledgement"]
7+
revision 1
78

89
livecheck do
910
url "https://download.enlightenment.org/rel/libs/efl/"
1011
regex(/href=.*?efl[._-]v?(\d+(?:\.\d+)+)\.t/i)
1112
end
1213

1314
bottle do
14-
sha256 arm64_sequoia: "aeac256a77af8f1445ac750fffbc05ec0248ed81a4cdff7c98baba1a54d7ff95"
15-
sha256 arm64_sonoma: "6d15f7f09291ed56ba192bd80c7fda195154865485893579db152e113999bf4e"
16-
sha256 arm64_ventura: "6bc9494f01ea7397644b6c77085e634dc48c5f557ef82d3fb598671cd66a9984"
17-
sha256 arm64_monterey: "7c5a8ca44000ef1f51c60d165baaaee3d12ffe75fc6eb317e8f7be590a46e5a7"
18-
sha256 sonoma: "904885617ad5f8629101266eb5ceb70634192e3933d4577f7126fc2c2dd14df9"
19-
sha256 ventura: "32d3ab7c6f32f5291c394022051146fc8fb980afaa1226a2602436d3e2df5c78"
20-
sha256 monterey: "b48ff5fc791cad44d0276a5910d10a216daaa7e2d5db286517000f1e3b6801e4"
21-
sha256 x86_64_linux: "1d265348e67f8f8691f74219ba1b7b03a6ad1fcc8b99663225cca5a49b3d5ecc"
15+
sha256 arm64_sequoia: "9f2c4e1c7e33bf4520784a3e98aac04f4fe2b4deb187396562fd1f78fc37601f"
16+
sha256 arm64_sonoma: "2fcce8a4b857779f120f23b38866220e9ee00cf09c40846e2bde2252b7abf0f5"
17+
sha256 arm64_ventura: "03282d03c4090d9aac8e3002f1ea330ae63c553d5760bbe7af3ff9a2174a623b"
18+
sha256 sonoma: "2ef9fb0ea5b90140c65d0026d2039597be19b72b4fe8f70c66580bf4d81b2292"
19+
sha256 ventura: "e62c843535599e6fbef26f1bdd1b0446664cefbd68bb53dc4b3a93b59f65a549"
20+
sha256 x86_64_linux: "018c6e3799d3bf61352901915250d0f75db2e2f0257a4df5f2aca5781e7d7101"
2221
end
2322

2423
depends_on "meson" => :build

‎Formula/g/gdal.rb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ class Gdal < Formula
44
url "https://github.com/OSGeo/gdal/releases/download/v3.10.0/gdal-3.10.0.tar.gz"
55
sha256 "946ef444489bedbc1b04bd4c115d67ae8d3f3e4a5798d5a2f1cb2a11014105b2"
66
license "MIT"
7+
revision 1
78

89
livecheck do
910
url "https://download.osgeo.org/gdal/CURRENT/"
1011
regex(/href=.*?gdal[._-]v?(\d+(?:\.\d+)+)\.t/i)
1112
end
1213

1314
bottle do
14-
sha256 arm64_sequoia: "8907de338f31dbc154be503c5766e327cec157a5e070d228a66acc056359949a"
15-
sha256 arm64_sonoma: "43b957fca2fc27cf11ae5ce8217ab400271c2fa7c2e727b03a66b4e48bd167ea"
16-
sha256 arm64_ventura: "81ec39fd5a3cd9c7cea81ded7d4b7ef40c3a2e685d5c36f714f620429346db5b"
17-
sha256 sonoma: "0da956f75bc57ba3589a2afd42f4a1095661089030ffc3523a1c282dc210e231"
18-
sha256 ventura: "b11548220d01915bfee7e7deac35111c4b4522527651fe216bcf317e4f387d3c"
19-
sha256 x86_64_linux: "92e3b318e47ba393bda85c7f883993719da96e549e3057714f640baa590d4002"
15+
sha256 arm64_sequoia: "54aea694c1e1ba1c96ac4fd949d41387610e027144b521e126ee939ff71a5168"
16+
sha256 arm64_sonoma: "56bd79100e84c0edc8db1a0fadaafb3952b8128d2655f8273ee05de09e9c5933"
17+
sha256 arm64_ventura: "1b67abc3493575365ae867cc4884c15be2b457999260e378d0766db4840a9db8"
18+
sha256 sonoma: "8a86f6e489a1989a881809d230ed32359310eaa7c84282feb36fec00877b5896"
19+
sha256 ventura: "a207082e25441b7b434e494dd7fcd7d8a2a2be2f962c5815d1e100865aee86a1"
20+
sha256 x86_64_linux: "f9c0d060c170745d0a0c0af44b8ce0ef1d45ff0abc72076a31f3d7384f01add5"
2021
end
2122

2223
head do

‎Formula/p/pdfgrep.rb‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@ class Pdfgrep < Formula
44
url "https://pdfgrep.org/download/pdfgrep-2.2.0.tar.gz"
55
sha256 "0661e531e4c0ef097959aa1c9773796585db39c72c84a02ff87d2c3637c620cb"
66
license "GPL-2.0-only"
7+
revision 1
78

89
bottle do
9-
rebuild 1
10-
sha256 cellar: :any, arm64_sequoia: "3d659c7c01fe49631881b5b324c9951cd570ab8a1c57fd82515718245007bf33"
11-
sha256 cellar: :any, arm64_sonoma: "633fdf9703a8e5bf2e912cc6005566ae42bf2b54658b611f911967afd7d1db14"
12-
sha256 cellar: :any, arm64_ventura: "27acab326508534e95f2188d3c7bb6c4233fba992e1ff764099063498c4be597"
13-
sha256 cellar: :any, arm64_monterey: "881bdac5140488c24e2bbfd7943bb2c70438ab5eee974f702d62108c2dbd26cc"
14-
sha256 cellar: :any, sonoma: "d9c657ebf312c7e65b013f4e3dd2d056ddff7d8a25ff6bd34fc8ad90fdc6c28e"
15-
sha256 cellar: :any, ventura: "c3e85542c3a9556194e659652477bb90a04d487c68177849cbae3b71225576e2"
16-
sha256 cellar: :any, monterey: "3f6beec10ef5fefe10b2edbd79e5a29c2e4bc1f22441bf2e39a190da83e3c692"
17-
sha256 cellar: :any_skip_relocation, x86_64_linux: "2d612d28c6b3c3b38ddb2501561ab464eab78afce88d1fb2537f3aa266ee6778"
10+
sha256 cellar: :any, arm64_sequoia: "5fd50352b2273e2fe74cc1d743223ad274f9d5a8cc1f80a58995859c68a9f52e"
11+
sha256 cellar: :any, arm64_sonoma: "5356bb2f208f6f5824dda4506b77d74629939da845eefde2865083efdfe9e986"
12+
sha256 cellar: :any, arm64_ventura: "8bb0312620765b07ff82bf65c78f3fb50d5a24a933c8fde3e227f614c37aecc3"
13+
sha256 cellar: :any, sonoma: "d4996ec4f5eb3e90b4ba3c8ce8c442cbdbe00a8c7585e43ac766bf109b44f6d7"
14+
sha256 cellar: :any, ventura: "e0033f368c2694317ecbcfe49eaf4efbf88f1e97e31f83252d3131132e84c659"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "7350f888b534ac62216fc4c50935be77b4a8e47620e8b188d4098c8b024b333a"
1816
end
1917

2018
head do

‎Formula/p/pdftoipe.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ class Pdftoipe < Formula
1717
sha256 cellar: :any_skip_relocation, x86_64_linux: "8a3da5c3168fefc7e7899400b3a618b91072777ed35feed3b76a727a3d99964c"
1818
end
1919

20+
# Patches to build with newer poppler are ignored upstream
21+
# Ref: https://github.com/otfried/ipe-tools/pull/55
22+
disable! date: "2024-11-07", because: "does not build with latest poppler"
23+
2024
depends_on "pkg-config" => :build
2125
depends_on "poppler"
2226

‎Formula/p/poppler-qt5.rb‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
class PopplerQt5 < Formula
22
desc "PDF rendering library (based on the xpdf-3.0 code base)"
33
homepage "https://poppler.freedesktop.org/"
4-
url "https://poppler.freedesktop.org/poppler-24.04.0.tar.xz"
5-
sha256 "1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7"
4+
url "https://poppler.freedesktop.org/poppler-24.11.0.tar.xz"
5+
sha256 "7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58"
66
license "GPL-2.0-only"
7-
revision 1
87
head "https://gitlab.freedesktop.org/poppler/poppler.git", branch: "master"
98

109
livecheck do
1110
formula "poppler"
1211
end
1312

1413
bottle do
15-
sha256 arm64_sequoia: "8b5a420c83516ddfe6148a1b63b3016e1c6684a3ca7dc3599e8a639b8f2f7d09"
16-
sha256 arm64_sonoma: "68c70a13741b87792902219a6ba666354f4fdbbc7838a07f271ac77140d82fd1"
17-
sha256 arm64_ventura: "637369aae5fead971b1538a7a32d24f46fb9a44c63fb6125e97f2446e2e6f2f2"
18-
sha256 arm64_monterey: "fcb94b326dd715acc439f3a152e14e50765d9a6867224f75f55c3ac2fdaf5c12"
19-
sha256 sonoma: "8787f6c0ba49344cdd34326076456192dbfc0dbd1e7644d6577a5b4cb13dd188"
20-
sha256 ventura: "ba9b7e9780e37c0c77fa370b981206c47a2d440055d065a16a0928b233fa93ec"
21-
sha256 monterey: "97e1ada0094dd0805b385f6698286f346740ae88b99cf526e6505e62c80bdb59"
22-
sha256 x86_64_linux: "1b22d0fd6dacf9bff211a3d31b265dc543be80ff8f7bd3860fed52ebaba508e9"
14+
sha256 arm64_sequoia: "63ce9c2019a382ce59e93c709a6dfc3795495187a025fdd3f0a881cbb870a6fe"
15+
sha256 arm64_sonoma: "5e63d610385c0b51f303d9a7c9ea8874a01126cac0eb5197dc6f8a5060c6186d"
16+
sha256 arm64_ventura: "a0d1bea33ec613c93cf2ae349677a0f6ad11028acafa0f5eba48463a14edad94"
17+
sha256 sonoma: "f11d3e4680c6efe4da53f5d7690977995d5f6c39d0e3ed5fcbf43c6a8e5a694e"
18+
sha256 ventura: "0b48db981efc43241966ee56ad56bca3a4db3f15f97e7f8154a8d33efa612f96"
19+
sha256 x86_64_linux: "e03b339d3c70d7667abf88c5983bb3c3b01f6e1402735ccf0eb19008998dcbb8"
2320
end
2421

2522
keg_only "it conflicts with poppler"
@@ -73,14 +70,16 @@ def install
7370
-DCMAKE_INSTALL_RPATH=#{rpath}
7471
]
7572

76-
system "cmake", ".", *args
77-
system "make", "install"
78-
system "make", "clean"
79-
system "cmake", ".", "-DBUILD_SHARED_LIBS=OFF", *args
80-
system "make"
81-
lib.install "libpoppler.a"
82-
lib.install "cpp/libpoppler-cpp.a"
83-
lib.install "glib/libpoppler-glib.a"
73+
system "cmake", "-S", ".", "-B", "build_shared", *args
74+
system "cmake", "--build", "build_shared"
75+
system "cmake", "--install", "build_shared"
76+
77+
system "cmake", "-S", ".", "-B", "build_static", *args, "-DBUILD_SHARED_LIBS=OFF"
78+
system "cmake", "--build", "build_static"
79+
lib.install "build_static/libpoppler.a"
80+
lib.install "build_static/cpp/libpoppler-cpp.a"
81+
lib.install "build_static/glib/libpoppler-glib.a"
82+
8483
resource("font-data").stage do
8584
system "make", "install", "prefix=#{prefix}"
8685
end

‎Formula/p/poppler.rb‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
class Poppler < Formula
22
desc "PDF rendering library (based on the xpdf-3.0 code base)"
33
homepage "https://poppler.freedesktop.org/"
4-
url "https://poppler.freedesktop.org/poppler-24.04.0.tar.xz"
5-
sha256 "1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7"
4+
url "https://poppler.freedesktop.org/poppler-24.11.0.tar.xz"
5+
sha256 "7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58"
66
license "GPL-2.0-only"
7-
revision 1
87
head "https://gitlab.freedesktop.org/poppler/poppler.git", branch: "master"
98

109
livecheck do
@@ -13,14 +12,12 @@ class Poppler < Formula
1312
end
1413

1514
bottle do
16-
sha256 arm64_sequoia: "5d74f29c70add1be6fb3c7c3a9abbec589a6ca2f6df7e7676bb7fcee3ffdd50f"
17-
sha256 arm64_sonoma: "8b487935981de358c8be92fbf3325279d37f4ea15f5e00a1c061e7b534dbda12"
18-
sha256 arm64_ventura: "dad153bde1d968931cdce8acf850519bfb124053e14b7320a7bcfb71e42122e4"
19-
sha256 arm64_monterey: "aa50112c89e22500caf026bbc4a6dfd4bf4073cd21e6ec1d8fcda3f3d3fc175d"
20-
sha256 sonoma: "9bb5a73485ce08ad41882c384b403b041e69aa18cda57ad9cc0557c724e2d3c4"
21-
sha256 ventura: "d3aa8c09cd2a5848ee99ff138814553f3d6206a0c96ad216fb55e6968918422c"
22-
sha256 monterey: "c5e2890d19c2c3d42b951ea067fc5186d348f6c8c1862ba4e6f120fe96a4312d"
23-
sha256 x86_64_linux: "7b73544fa9db0d4264fb2a3c2816f50eac61c33a7a1a060ff92dfcbc7fd4783d"
15+
sha256 arm64_sequoia: "6159782cfe96f0a9cdaa09dea73bd572cb36f62529c6436a125a3e3c43f25534"
16+
sha256 arm64_sonoma: "ba6c8cc1318dba33f46ea34d9a5a964eb88c9d7347c6f1e1047882f3ac451165"
17+
sha256 arm64_ventura: "941c287bb21cef41aac63707ecd1850d8108c4f64a44e28c10708cc629bf3105"
18+
sha256 sonoma: "004dcd9b9264ee82e9f27fddbd521407f6138026ac17b6f05dc3e0e7ee32d939"
19+
sha256 ventura: "e43c781c519379165b6b59e0752901c973989117fe4ecaea2ceaa4fbb093b92c"
20+
sha256 x86_64_linux: "57b85ffdf23ab6e76f30bde71fab915f34f669223bb0b6b23913e5a8a1c0131b"
2421
end
2522

2623
depends_on "cmake" => :build

0 commit comments

Comments
 (0)