img2pdf: update to 0.4.1.

srcpkgs/img2pdf/patches/disableicc.patch

@@ -1,11 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -5320,7 +5320,7 @@ def test_png_palette8(tmp_path_factory,
- )
- def test_png_icc(tmp_path_factory, png_icc_img, png_icc_pdf):
-     tmpdir = tmp_path_factory.mktemp("png_icc")
--    compare_ghostscript(tmpdir, png_icc_img, png_icc_pdf, icc=True)
-+    # compare_ghostscript(tmpdir, png_icc_img, png_icc_pdf, icc=True)
-     # compare_poppler(tmpdir, png_icc_img, png_icc_pdf)
-     # compare_mupdf(tmpdir, png_icc_img, png_icc_pdf)
-     # compare_pdfimages_png(tmpdir, png_icc_img, png_icc_pdf)

srcpkgs/img2pdf/patches/endianess-endianness.patch

@@ -1,245 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -863,7 +863,7 @@ def jpg_img(tmp_path_factory, tmp_normal
-     assert "resolution" not in identify[0]["image"]
-     assert identify[0]["image"].get("units") == "Undefined", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") == "Undefined", str(identify)
-+    assert identify[0]["image"].get("endianness") == "Undefined", str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-@@ -2219,7 +2219,7 @@ def tiff_float_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2275,7 +2275,7 @@ def tiff_cmyk8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
-     assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2335,7 +2335,7 @@ def tiff_cmyk16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "CMYK", str(identify)
-     assert identify[0]["image"].get("type") == "ColorSeparation", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2385,7 +2385,7 @@ def tiff_rgb8_img(tmp_path_factory, tmp_
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2436,7 +2436,7 @@ def tiff_rgb12_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 12, str(identify)
-@@ -2487,7 +2487,7 @@ def tiff_rgb14_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 14, str(identify)
-@@ -2538,7 +2538,7 @@ def tiff_rgb16_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2589,7 +2589,7 @@ def tiff_rgba8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2640,7 +2640,7 @@ def tiff_rgba16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColorAlpha", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2689,7 +2689,7 @@ def tiff_gray1_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -2739,7 +2739,7 @@ def tiff_gray2_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 2, str(identify)
-@@ -2789,7 +2789,7 @@ def tiff_gray4_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 4, str(identify)
-@@ -2839,7 +2839,7 @@ def tiff_gray8_img(tmp_path_factory, tmp
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2889,7 +2889,7 @@ def tiff_gray16_img(tmp_path_factory, tm
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Grayscale", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 16, str(identify)
-@@ -2943,7 +2943,7 @@ def tiff_multipage_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -2986,7 +2986,7 @@ def tiff_multipage_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "TrueColor", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3036,7 +3036,7 @@ def tiff_palette1_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3087,7 +3087,7 @@ def tiff_palette2_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3138,7 +3138,7 @@ def tiff_palette4_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3189,7 +3189,7 @@ def tiff_palette8_img(tmp_path_factory,
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "sRGB", str(identify)
-     assert identify[0]["image"].get("type") == "Palette", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 8, str(identify)
-@@ -3253,7 +3253,7 @@ def tiff_ccitt_lsb_m2l_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3334,7 +3334,7 @@ def tiff_ccitt_msb_m2l_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in [
-+    assert identify[0]["image"].get("endianness") in [
-         "Undefined",
-         "MSB",
-     ]  # FIXME: should be MSB
-@@ -3416,7 +3416,7 @@ def tiff_ccitt_msb_l2m_white_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in [
-+    assert identify[0]["image"].get("endianness") in [
-         "Undefined",
-         "MSB",
-     ]  # FIXME: should be MSB
-@@ -3503,7 +3503,7 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_pat
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3593,7 +3593,7 @@ def tiff_ccitt_nometa1_img(tmp_path_fact
-     }, str(identify)
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("depth") == 1, str(identify)
-@@ -3677,7 +3677,7 @@ def tiff_ccitt_nometa2_img(tmp_path_fact
-     }, str(identify)
-     assert identify[0]["image"].get("units") == "PixelsPerInch", str(identify)
-     assert identify[0]["image"].get("type") == "Bilevel", str(identify)
--    assert identify[0]["image"].get("endianess") in ["Undefined", "LSB",], str(
-+    assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
-     assert identify[0]["image"].get("colorspace") == "Gray", str(identify)

srcpkgs/img2pdf/patches/fix_color_profile_path.patch

@@ -1,49 +1,35 @@
---- a/src/img2pdf.py
+--- src/img2pdf.py
-+++ b/src/img2pdf.py
++++ src/img2pdf.py
-@@ -3308,10 +3308,10 @@ RGB.""",
+@@ -3439,10 +3439,10 @@ RGB.""",
      outargs.add_argument(
          "--pdfa",
          nargs="?",
 -        const="/usr/share/color/icc/sRGB.icc",
 +        const="/usr/share/color/icc/colord/sRGB.icc",
          default=None,
-         help="Output a PDF/A-1b complient document. By default, this will "
+         help="Output a PDF/A-1b compliant document. By default, this will "
 -        "embed /usr/share/color/icc/sRGB.icc as the color profile.",
 +        "embed /usr/share/color/icc/colord/sRGB.icc as the color profile.",
      )
  
      sizeargs = parser.add_argument_group(
---- a/src/img2pdf_test.py
+--- src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
++++ src/img2pdf_test.py
-@@ -312,7 +312,7 @@ def compare_ghostscript(tmpdir, img, pdf, gsdevice="png16m", exact=True, icc=Fal
+@@ -304,7 +304,7 @@ def compare(im1, im2, exact, icc, cmyk):
-                     "AE",
+     else:
+         iccargs = []
+         if icc:
+-            iccargs = ["-profile", "/usr/share/color/icc/sRGB.icc"]
++            iccargs = ["-profile", "/usr/share/color/icc/colord/sRGB.icc"]
+         psnr = subprocess.run(
+             ["compare"]
+             + iccargs
+@@ -424,7 +424,7 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False):
+                     "PSNR",
                      "(",
                      "-profile",
 -                    "/usr/share/color/icc/ghostscript/srgb.icc",
-+                    "/usr/share/color/icc/colord/sRGS.icc",
++                    "/usr/share/color/icc/colord/sRGB.icc",
                      "-depth",
                      "8",
                      str(img),
-@@ -667,11 +667,11 @@ def tmp_icc_png(tmp_path_factory, alpha):
-         str(tmp_icc_png),
-         8,
-         2,
--        iccp="/usr/share/color/icc/sRGB.icc",
-+        iccp="/usr/share/color/icc/colord/sRGB.icc",
-     )
-     assert (
-         hashlib.md5(tmp_icc_png.read_bytes()).hexdigest()
--        == "d09865464626a87b4e7f398e1f914cca"
-+        == "b20cad5586ef280995bbf9afd30d2257"
-     )
-     yield tmp_icc_png
-     tmp_icc_png.unlink()
-@@ -4272,7 +4272,7 @@ def png_icc_pdf(tmp_path_factory, tmp_icc_png, request):
-         assert p.pages[0].Resources.XObject.Im0.ColorSpace[1].Alternate == "/DeviceRGB"
-         assert (
-             p.pages[0].Resources.XObject.Im0.ColorSpace[1].read_bytes()
--            == pathlib.Path("/usr/share/color/icc/sRGB.icc").read_bytes()
-+            == pathlib.Path("/usr/share/color/icc/colord/sRGB.icc").read_bytes()
-         )
-         assert p.pages[0].Resources.XObject.Im0.DecodeParms.BitsPerComponent == 8
-         assert p.pages[0].Resources.XObject.Im0.DecodeParms.Colors == 3

srcpkgs/img2pdf/patches/imdepth.patch

@@ -1,22 +0,0 @@
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -2439,7 +2439,8 @@ def tiff_rgb12_img(tmp_path_factory, tmp
-     assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
--    assert identify[0]["image"].get("depth") == 12, str(identify)
-+    assert identify[0]["image"].get("depth") == 16, str(identify)
-+    assert identify[0]["image"].get("baseDepth") == 12, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-         "width": 60,
-         "height": 60,
-@@ -2490,7 +2491,8 @@ def tiff_rgb14_img(tmp_path_factory, tmp
-     assert identify[0]["image"].get("endianness") in ["Undefined", "LSB",], str(
-         identify
-     )  # FIXME: should be LSB
--    assert identify[0]["image"].get("depth") == 14, str(identify)
-+    assert identify[0]["image"].get("depth") == 16, str(identify)
-+    assert identify[0]["image"].get("baseDepth") == 14, str(identify)
-     assert identify[0]["image"].get("pageGeometry") == {
-         "width": 60,
-         "height": 60,

srcpkgs/img2pdf/template

@@ -1,6 +1,6 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
@@ -11,5 +11,4 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9
+checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552
-patch_args="-Np1"