Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libmupdf] Update mupdf to 1.22.1 #31880

Merged
merged 6 commits into from
Jun 12, 2023

Conversation

simon987
Copy link
Contributor

@simon987 simon987 commented Jun 8, 2023

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

The use-if-instead-of-ifdef-in-writer.patch was added by me in #20328, but it has since been committed upstream in ArtifexSoftware/mupdf@305adc250bffaf so I removed it.

@jimwang118 jimwang118 added the category:port-update The issue is with a library, which is requesting update new revision label Jun 8, 2023
ports/libmupdf/vcpkg.json Outdated Show resolved Hide resolved
ports/libmupdf/vcpkg.json Show resolved Hide resolved
@jimwang118
Copy link
Contributor

Note: I will be converting your PR to draft status. The above suggested changes are only recommendations. If you are willing to adopt them, please click "ready for review" after making the modifications. If you do not wish to make any changes, please click "ready for review" directly. That way, I can be aware that you've responded since you can't modify the tags.

@jimwang118 jimwang118 marked this pull request as draft June 8, 2023 02:41
simon987 and others added 2 commits June 8, 2023 08:05
Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
@simon987 simon987 marked this pull request as ready for review June 8, 2023 12:05
@simon987
Copy link
Contributor Author

simon987 commented Jun 8, 2023

@jimwang118 it seems that after removing the port-version line, the vcpkg/versions/l-/libmupdf.json file reverted to version 0:

"versions": [
    {
      "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188",
      "version": "1.22.1",
      "port-version": 0
    },
    {
      "git-tree": "4764feb3f9edca039e2e5847eebdeacc06ef2a70",
      "version": "1.22.1",
      "port-version": 2
    },
    {
      "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959",
      "version": "1.19.0-rc2",
      "port-version": 1
    },
    ...

@jimwang118
Copy link
Contributor

@jimwang118 it seems that after removing the port-version line, the vcpkg/versions/l-/libmupdf.json file reverted to version 0:

"versions": [
    {
      "git-tree": "c1684ff15eed2c86ba792de4e92d21b2ea58c188",
      "version": "1.22.1",
      "port-version": 0
    },
    {
      "git-tree": "4764feb3f9edca039e2e5847eebdeacc06ef2a70",
      "version": "1.22.1",
      "port-version": 2
    },
    {
      "git-tree": "9ca3ac09949f15d339ff747bb36f8593ff087959",
      "version": "1.19.0-rc2",
      "port-version": 1
    },
    ...

Yes, delete the port-version in the vcpkg.json file after each version update, and then run the command ./vcpkg x-add-version [portname] to generate the port-version in the vcpkg/versions/l-/libmupdf.json file The value is 0. This is correct.

@jimwang118
Copy link
Contributor

You need to re-run the command ./vcpkg x-add-version [portname] --overwrite-version command to generate the vcpkg/versions/l-/libmupdf.json file and CI will end normally after submitting again.

@simon987
Copy link
Contributor Author

simon987 commented Jun 9, 2023

The value is 0. This is correct.

Ah okay!

versions/l-/libmupdf.json Outdated Show resolved Hide resolved
@jimwang118 jimwang118 marked this pull request as draft June 9, 2023 06:14
Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
@simon987 simon987 marked this pull request as ready for review June 10, 2023 01:24
@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Jun 12, 2023
@vicroms vicroms merged commit 8ca0f46 into microsoft:master Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants