diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 3ef0146ba6..450bc9d0c0 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/mupdf - REF 61b63d734a7b9df618f6b45dda2466aed442f7f0 # 1.19.0-rc2 - SHA512 16661c012e18ac72b24c46caf5c02515c29a05e0a8dcf95076eff3a1f2e87c225245037480ed37068858fe6e04ff4a404f69877599b208ab9265d054ec117820 + REF "${VERSION}" + SHA512 8109630f4dba31ff05458b69626c99ab36ddd47be42c03dd1f3962bf2be5d520be97a1c7e97a72307faa57a96c1ff50e8e3a593c519e47e5eb71897e7e373825 HEAD_REF master PATCHES dont-generate-extract-3rd-party-things.patch - use-if-instead-of-ifdef-in-writer.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch b/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch deleted file mode 100644 index 25dff59600..0000000000 --- a/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/source/fitz/writer.c -+++ b/source/fitz/writer.c -@@ -169,7 +169,7 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f - format = strrchr(path, '.'); - while (format) - { --#ifdef FZ_ENABLE_OCR_OUTPUT -+#if FZ_ENABLE_OCR_OUTPUT - if (is_extension(format, "ocr")) - return fz_new_pdfocr_writer(ctx, path, options); - #endif -@@ -219,11 +219,11 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f - if (is_extension(format, "stext.json")) - return fz_new_text_writer(ctx, "stext.json", path, options); - --#ifdef FZ_ENABLE_ODT_OUTPUT -+#if FZ_ENABLE_ODT_OUTPUT - if (is_extension(format, "odt")) - return fz_new_odt_writer(ctx, path, options); - #endif --#ifdef FZ_ENABLE_DOCX_OUTPUT -+#if FZ_ENABLE_DOCX_OUTPUT - if (is_extension(format, "docx")) - return fz_new_docx_writer(ctx, path, options); - #endif -@@ -267,11 +267,11 @@ fz_new_document_writer_with_output(fz_context *ctx, fz_output *out, const char * - if (is_extension(format, "stext.json")) - return fz_new_text_writer_with_output(ctx, "stext.json", out, options); - --#ifdef FZ_ENABLE_ODT_OUTPUT -+#if FZ_ENABLE_ODT_OUTPUT - if (is_extension(format, "odt")) - return fz_new_odt_writer_with_output(ctx, out, options); - #endif --#ifdef FZ_ENABLE_DOCX_OUTPUT -+#if FZ_ENABLE_DOCX_OUTPUT - if (is_extension(format, "docx")) - return fz_new_docx_writer_with_output(ctx, out, options); - #endif diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index d6c2cd4913..5aa9dac50a 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libmupdf", - "version": "1.19.0-rc2", - "port-version": 1, + "version": "1.22.1", "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", + "license": "AGPL-3.0-only", "supports": "!osx", "dependencies": [ "curl", diff --git a/versions/baseline.json b/versions/baseline.json index 6ea2c9886a..7355bce7b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4305,8 +4305,8 @@ "port-version": 0 }, "libmupdf": { - "baseline": "1.19.0-rc2", - "port-version": 1 + "baseline": "1.22.1", + "port-version": 0 }, "libmysql": { "baseline": "8.0.32", diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 67e2b7dc0e..585c4b5dd4 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188", + "version": "1.22.1", + "port-version": 0 + }, { "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959", "version": "1.19.0-rc2",