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

8328999: Update GIFlib to 5.2.2 #571

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Aug 29, 2024

This updates the in-tree giflib to 5.2.2. The actual code changes are a clean backport, but the license file changes needed adapting from the giflib.md file in 11u and later to the THIRD_PARTY_README file in 8u (now only one copy following JDK-8338144)

8u is also missing JDK-8225487 which I've included as part of this patch. This updates the license to credit openbsd-reallocarray.c and is updated further by 8238999. I also included changes made by the 5.2.1 update which were missed because 8225487 was missing.

In gif_lib.h, I have restored the workaround for a missing stdbool.h on Windows only. This is needed to build on Visual Studio 2010.

The giflib.md changes include some odd changes, replacing the giflib VCS URL with just tree/README. I've raised 8339271 to correct this and will look at backporting that as a follow-up.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8225487 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8328999 needs maintainer approval

Issues

  • JDK-8328999: Update GIFlib to 5.2.2 (Bug - P3)
  • JDK-8225487: giflib legal file is missing attribution for openbsd-reallocarray.c. (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/571/head:pull/571
$ git checkout pull/571

Update a local copy of the PR:
$ git checkout pull/571
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/571/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 571

View PR using the GUI difftool:
$ git pr show -t 571

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/571.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 29, 2024

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 29, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport bc8aeb6496b7e86d1f616d4c1b7c26f172c1dd8a 8328999: Update GIFlib to 5.2.2 Aug 29, 2024
@openjdk
Copy link

openjdk bot commented Aug 29, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Aug 29, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 29, 2024

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 26, 2024

@gnu-andrew This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@gnu-andrew
Copy link
Member Author

/issue add JDK-8225487

@openjdk
Copy link

openjdk bot commented Oct 10, 2024

@gnu-andrew
Adding additional issue to issue list: 8225487: giflib legal file is missing attribution for openbsd-reallocarray.c..

@gnu-andrew
Copy link
Member Author

I've restored the workaround for stdbool.h which was present in gif_lib.h but removed in this patch on later JDK versions. This is still needed on Windows with VS2010.

@gnu-andrew
Copy link
Member Author

I've restored the workaround for stdbool.h which was present in gif_lib.h but removed in this patch on later JDK versions. This is still needed on Windows with VS2010.

And now, of course, it fails to download VS2010.

@zzambers
Copy link
Contributor

I've restored the workaround for stdbool.h which was present in gif_lib.h but removed in this patch on later JDK versions. This is still needed on Windows with VS2010.

And now, of course, it fails to download VS2010.

There was an attack on archive.org, causing outage. Seems VS2010 download is now working again.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@openjdk
Copy link

openjdk bot commented Oct 24, 2024

⚠️ @gnu-andrew This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@gnu-andrew
Copy link
Member Author

I've restored the workaround for stdbool.h which was present in gif_lib.h but removed in this patch on later JDK versions. This is still needed on Windows with VS2010.

And now, of course, it fails to download VS2010.

There was an attack on archive.org, causing outage. Seems VS2010 download is now working again.

Yes, thanks, I was watching their Twitter feed on this. I'll merge with latest and see if we can get a VS2010 build now.

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 26, 2024

@gnu-andrew This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@gnu-andrew
Copy link
Member Author

Ugh, still seeing VS2010 build errors. Will take a look tomorrow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants