Skip to content

Commit 98922ef

Browse files
BrewTestBotBrewTestBot
authored
Merge pull request #210345 from Homebrew/bump-qpdf-12.0.0
qpdf 12.0.0
2 parents e74de54 + 5855e93 commit 98922ef

File tree

5 files changed

+79
-38
lines changed

5 files changed

+79
-38
lines changed

‎Formula/i/img2pdf.rb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ class Img2pdf < Formula
66
url "https://files.pythonhosted.org/packages/c2/62/c7402ffe11d43e88dbab6b7255f16743f8b9cbb3e7d3405f95a677a98c47/img2pdf-0.6.0.tar.gz"
77
sha256 "85a89b8abdeef9ef033508aed0d9f1e84fd6d0130e864e2c523f948ec45365e1"
88
license "LGPL-3.0-or-later"
9+
revision 1
910

1011
bottle do
11-
sha256 cellar: :any, arm64_sequoia: "ef6a9b83380ed6d6e6db8160df56b009f26b2e223312cec548702091d3e57693"
12-
sha256 cellar: :any, arm64_sonoma: "3a0c43020785c35042b8a9add983733936d4abfb2e70060a74b037d2d0a4eff0"
13-
sha256 cellar: :any, arm64_ventura: "45ab8beffeb03e65bc7ab13150333bf33079bd17c647cd7488c0c68aec4f4564"
14-
sha256 cellar: :any, sonoma: "e858638a52e7b9bce79b9f62705851474f2f1e15727b4c3b8cf45705c0061208"
15-
sha256 cellar: :any, ventura: "31db47d692ae3532f265bd45aef2c367bafec135bcfd11131240932249344539"
16-
sha256 cellar: :any_skip_relocation, x86_64_linux: "3198d4086d1b9c495bdc30287f47d31b789a7abae8927e9f3e758f34035dc7c0"
12+
sha256 cellar: :any, arm64_sequoia: "a5ebd58206276d9220b4e2b458befe3868ab5d7ed2d177316242fdc1facb2daa"
13+
sha256 cellar: :any, arm64_sonoma: "90b252551ff71588ebdfcb59807a44c29d0f6a50e77b6beb8e66be6cb9bef8d7"
14+
sha256 cellar: :any, arm64_ventura: "8c4928259d71cd47b7a1ad76f4cfcd433efcd40fc78a74004bd9de958b3c1601"
15+
sha256 cellar: :any, sonoma: "73a809ba81e45f22251450ae5f7b9d1a998ca95c5906154e21e33706265447ae"
16+
sha256 cellar: :any, ventura: "79f3d0152ffb4d461166ae20ddacf08b84f7630eb36ad1cf0875fbb8bab91cab"
17+
sha256 cellar: :any_skip_relocation, x86_64_linux: "1f0d501f933a9c6d8c02c415e0c3c7931f6c301ff3d30ff4bda7f1910100e153"
1718
end
1819

1920
depends_on "pillow"

‎Formula/o/ocrmypdf.rb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ class Ocrmypdf < Formula
66
url "https://files.pythonhosted.org/packages/07/cf/d207aea8442a8e5a63b16faae89af2b9e3474d8d5925a5ea8c4f10f73fa9/ocrmypdf-16.10.0.tar.gz"
77
sha256 "d5b907a7b92951f1f3617f0f5ca002d866143d94fd168546a70e51756bf6412e"
88
license "MPL-2.0"
9+
revision 1
910

1011
bottle do
11-
sha256 cellar: :any, arm64_sequoia: "7dc0816282934a40bfc6d6151bd20916f5230369d76b7541980aa0e997fba59e"
12-
sha256 cellar: :any, arm64_sonoma: "3482046886175ed9f4b196b013a9e44a3d8ced91b6893035b3a1b6f057a42290"
13-
sha256 cellar: :any, arm64_ventura: "8d32eb8324f557eecf2c4f5fd70a6dd4523599648dc77c2a16f3082329f7ad16"
14-
sha256 cellar: :any, sonoma: "8a9d0b027c9bf343357844bdb3ce496ade94534f57565f356cf76a8cea796d5b"
15-
sha256 cellar: :any, ventura: "55b4854a0affc3f2af2ed48ef73f463cb14b5b24dd06e964458af607b16c13b2"
16-
sha256 cellar: :any_skip_relocation, x86_64_linux: "c6b3fff271ac8746adbb7d7aab41922b6958583729e117127a45f35742ebe90a"
12+
sha256 cellar: :any, arm64_sequoia: "1188e0366cb4c5b43be5f16b247257b9096b73eb9a3335736f1c26a66da142d1"
13+
sha256 cellar: :any, arm64_sonoma: "1985541922050ae776a9e64e76792a4babe548cf3f3cc46c458fe22364004d88"
14+
sha256 cellar: :any, arm64_ventura: "bb0092ad31c407c37a6a660b6263c5b489166efd8de5aa65f0a7026d46f4aa97"
15+
sha256 cellar: :any, sonoma: "734b8231f66bdbd5d2fdbeccd7545a1345cdd4c3bcd4afd6686f7a48749ba862"
16+
sha256 cellar: :any, ventura: "2f2275dfaa08ceaac5932e9deec3d84f335ad31d3d3c9435c9f17c36e1543a6a"
17+
sha256 cellar: :any_skip_relocation, x86_64_linux: "af7782bb4b312000ce9fbb4863a37f286c44061010a86a7a81825771a29c1275"
1718
end
1819

1920
depends_on "pkgconf" => :build

‎Formula/p/paperjam.rb‎

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,32 @@ class Paperjam < Formula
44
url "https://mj.ucw.cz/download/linux/paperjam-1.2.1.tar.gz"
55
sha256 "bd38ed3539011f07e8443b21985bb5cd97c656e12d9363571f925d039124839b"
66
license "GPL-2.0-or-later"
7+
revision 1
78

89
livecheck do
910
url :homepage
1011
regex(/href=.*?paperjam[._-]v?(\d+(?:\.\d+)+)\.t/i)
1112
end
1213

1314
bottle do
14-
sha256 cellar: :any, arm64_sequoia: "1173139f00d87d9853a76d10a2c05b0ab451e5d5388582cf3d10291d8b70a66e"
15-
sha256 cellar: :any, arm64_sonoma: "39c2d7a60e6ccc75a168b7e0be8696b91a033fd360d426403ab50e20df7043ee"
16-
sha256 cellar: :any, arm64_ventura: "e879f41bf1c0ef0f824e302e2515b921fe9009de00de18c2ba2035c259b2f90c"
17-
sha256 cellar: :any, sonoma: "a6d35687e6f83ac011a32b169878d55656477a5db46531a5d9a80e46ffafa303"
18-
sha256 cellar: :any, ventura: "7823de97267e2efebc6efaba7ae5c4448269d79c98ab613c6115c1d033cfce5e"
19-
sha256 cellar: :any_skip_relocation, x86_64_linux: "ecb416231708d36a49ec9dd59319a9cf9ae1443d3c962f16b8b4d514d3b12d7d"
15+
sha256 cellar: :any, arm64_sequoia: "271b0d2b33c3f06f81fac58248a81a95eef0bcc36929230e2bad7b4d38ff34db"
16+
sha256 cellar: :any, arm64_sonoma: "4df949ea647a2056ea7d7ab0ea2d298f45da5643ae92c25aaac80aad7e1301c7"
17+
sha256 cellar: :any, arm64_ventura: "1fd3b138f16296ab6107a43387eb5ea3b54e5dac2358b7b5b6e8bc6c7951f512"
18+
sha256 cellar: :any, sonoma: "0d6af7df1e10f96f42f56cf222c6bfb35d384ed547f1b8b0e11352906a5af41c"
19+
sha256 cellar: :any, ventura: "2fc406ca453bf24ade3b65111f80bb3fd0b1a761c316ee48540ed8341afc6d63"
20+
sha256 cellar: :any_skip_relocation, x86_64_linux: "05712c9aeabd27e0ca3dd38ce377228044e31bccb7ee9bfb0a218b239f4838be"
2021
end
2122

2223
depends_on "asciidoc" => :build
2324
depends_on "docbook-xsl" => :build
2425
depends_on "libpaper"
2526
depends_on "qpdf"
27+
2628
uses_from_macos "libxslt"
2729

30+
# notified the upstream about the patch
31+
patch :DATA
32+
2833
def install
2934
ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog"
3035
ENV.append "LDLIBS", "-liconv" if OS.mac?
@@ -37,3 +42,42 @@ def install
3742
assert_path_exists testpath/"output.pdf"
3843
end
3944
end
45+
46+
__END__
47+
diff --git a/pdf-tools.cc b/pdf-tools.cc
48+
index 0d74ca3..23d5ee4 100644
49+
--- a/pdf-tools.cc
50+
+++ b/pdf-tools.cc
51+
@@ -7,6 +7,7 @@
52+
#include <cstdio>
53+
#include <cstdlib>
54+
#include <cstring>
55+
+#include <memory>
56+
57+
#include <iconv.h>
58+
59+
@@ -229,7 +230,7 @@ QPDFObjectHandle page_to_xobject(QPDF *out, QPDFObjectHandle page)
60+
}
61+
62+
vector<QPDFObjectHandle> contents = page.getPageContents();
63+
- auto ph = PointerHolder<QPDFObjectHandle::StreamDataProvider>(new CombineFromContents_Provider(contents));
64+
+ auto ph = std::shared_ptr<QPDFObjectHandle::StreamDataProvider>(new CombineFromContents_Provider(contents));
65+
xo_stream.replaceStreamData(ph, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull());
66+
return xo_stream;
67+
}
68+
diff --git a/pdf.cc b/pdf.cc
69+
index 9f8dc12..41a158b 100644
70+
--- a/pdf.cc
71+
+++ b/pdf.cc
72+
@@ -185,7 +185,11 @@ static void make_info_dict()
73+
{
74+
const string to_copy[] = { "/Title", "/Author", "/Subject", "/Keywords", "/Creator", "/CreationDate" };
75+
for (string key: to_copy)
76+
- info.replaceOrRemoveKey(key, orig_info.getKey(key));
77+
+ {
78+
+ QPDFObjectHandle value = orig_info.getKey(key);
79+
+ if (!value.isNull())
80+
+ info.replaceKey(key, value);
81+
+ }
82+
}
83+
}

‎Formula/p/pdftilecut.rb‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@ class Pdftilecut < Formula
44
url "https://github.com/oxplot/pdftilecut/archive/refs/tags/v0.6.tar.gz"
55
sha256 "fd2383ee0d0acfa56cf6e80ac62881bd6dda4555adcd7f5a397339e7d3eca9ac"
66
license "BSD-3-Clause"
7-
revision 1
7+
revision 2
88

99
bottle do
10-
sha256 cellar: :any, arm64_sequoia: "3cbcdc3069541bb3a18e8fa0b9bf4931740bcd8f50febda125bc4b0765d2ab6b"
11-
sha256 cellar: :any, arm64_sonoma: "5df716228987bac9092a9b4e82ecc40fba715e987125fc8b21004f77e0b227ea"
12-
sha256 cellar: :any, arm64_ventura: "d96b83fed8d3cacfbf13526f6be72a4b6ac8602dcfe73248b9e60cdfda3f9d45"
13-
sha256 cellar: :any, arm64_monterey: "d8c459893d9b12984b346151d7828373281c6d69d26e4a60408b0b74712b4df9"
14-
sha256 cellar: :any, arm64_big_sur: "a0d25973d0b0900b2e6eba4e4044d8b737bcf7facb00d948ea6d0bc0b41d0da7"
15-
sha256 cellar: :any, sonoma: "3057301dfded911ccb198da86d3d67c7282e9482571708ae8897340dfda56f99"
16-
sha256 cellar: :any, ventura: "369c7092b2e7592280e70b4d541dc0ff5de5eba9837d1f6972ca6eb2c089f5f3"
17-
sha256 cellar: :any, monterey: "f3c41dc7753dabb9490068cab06ed59371ebf80a191bd6e653226febce0c8630"
18-
sha256 cellar: :any, big_sur: "2bd8e248aab7550cbad72405e4ccc05b692fe8ccf99736076fd881212e315664"
19-
sha256 cellar: :any, catalina: "23256aed8e1c3c2951ee5853b79e4c3d9eee84002680a6f7b24dc0c686fb0117"
20-
sha256 cellar: :any_skip_relocation, x86_64_linux: "6e750163fd2c39d4aac21c23952e8de9f28065d512d7da752690f96e9303de0f"
10+
sha256 cellar: :any, arm64_sequoia: "a0233594179a8bdeb42d430dfe1384c716fff5d1062b8e00be0e0a3012778730"
11+
sha256 cellar: :any, arm64_sonoma: "11b292ad9ba8f2e3ff99e3df455bf4558e854f95fd49c58dce4e5d3c1ac2f81f"
12+
sha256 cellar: :any, arm64_ventura: "954e44ab18431e84903ee37a9e08730458c0fc2ff3be83bb71bf54ad8aa5184f"
13+
sha256 cellar: :any, sonoma: "02a045c5f5f1ea061b661c5f34fc9f557fa12a8a2ac47ba9ca5c240c0fe60433"
14+
sha256 cellar: :any, ventura: "c76c17100539c6ba2aee77fd1cfad42a9464d15fd2e41edc51419308a85a1f41"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "ad6f8074acd3375047c5419afcd65722aae5949982d6611e95becfa6ee0cfc37"
2116
end
2217

2318
depends_on "go" => :build

‎Formula/q/qpdf.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
class Qpdf < Formula
22
desc "Tools for and transforming and inspecting PDF files"
33
homepage "https://github.com/qpdf/qpdf"
4-
url "https://github.com/qpdf/qpdf/releases/download/v11.10.1/qpdf-11.10.1.tar.gz"
5-
sha256 "defca435cf57d26f8a0619864841aa21f5469fddc6eb5662f62d8443021c069d"
4+
url "https://github.com/qpdf/qpdf/releases/download/v12.0.0/qpdf-12.0.0.tar.gz"
5+
sha256 "7380fe9d5b612a6c912cbf3a5875d9e27c20db6c559ebca51360da5125f351b8"
66
license "Apache-2.0"
77

88
bottle do
9-
sha256 cellar: :any, arm64_sequoia: "1e038e1c17d7593c41d5971eff18e7510d1efafc3b60839467c2550079a65d30"
10-
sha256 cellar: :any, arm64_sonoma: "18d4d89c87492f32ed836f306097cf06f093e7b221d505a815878647001be4d2"
11-
sha256 cellar: :any, arm64_ventura: "2300bcf8a73a671839b72555c67953d1b36d2af87c4e75459279edf2e337e8a7"
12-
sha256 cellar: :any, sonoma: "dd1ee4a66287745cbc12abc120425d98b56f7efa80be7e70b1ca996a20b0ff8e"
13-
sha256 cellar: :any, ventura: "f4d84d400a1378795f947c42993f0fe58b24d2dd2523a7f9d39a1da2880470a6"
14-
sha256 cellar: :any_skip_relocation, x86_64_linux: "33ba8bd0a4b41646a4bd54a51e1cc93a6de3827061846d16e44434a7975b4d20"
9+
sha256 cellar: :any, arm64_sequoia: "3dbff64de52b5d5ed9e8c226480cd9ab0ccd6a02eab7ce58ff0a2b9d30fb095e"
10+
sha256 cellar: :any, arm64_sonoma: "a383846cf9a02dbede64283084f87f3f609cf399ae094218f2165a8ebcb7fc43"
11+
sha256 cellar: :any, arm64_ventura: "7683c68e9c32e24e6ade2ef3dd874573c84460718ae4d6938f9a8b6b7f422bff"
12+
sha256 cellar: :any, sonoma: "f6bcf73cb90386ceda5252824f5b9711e43a0eebc73a39fbe38d6502a518089c"
13+
sha256 cellar: :any, ventura: "25a7234671a5dab044eca1514ee2ea0bc2851472fae626f8d1d0b52964dc7d4f"
14+
sha256 cellar: :any_skip_relocation, x86_64_linux: "d3891c559f8b47d57a026336015f5ad73a91ac2a8f71a0e11e65e09f30dc79c1"
1515
end
1616

1717
depends_on "cmake" => :build

0 commit comments

Comments
 (0)