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

adobe-flash-plugin: update to 32.0.0.453. #26088

Merged
merged 1 commit into from Nov 21, 2020
Merged

adobe-flash-plugin: update to 32.0.0.453. #26088

merged 1 commit into from Nov 21, 2020

Conversation

ghost
Copy link

@ghost ghost commented Nov 2, 2020

No description provided.

@ghost ghost changed the title adobe-flash-plugin: update to 32.0.0.445. [WIP] adobe-flash-plugin: update to 32.0.0.445. Nov 2, 2020
@ericonr
Copy link
Member

ericonr commented Nov 9, 2020

Please rebase this PR in order to remove the merge commit.

Why is it WIP for now?

@ghost ghost closed this Nov 10, 2020
@ghost ghost deleted the adobe-flash-plugin branch November 10, 2020 01:03
@ghost ghost restored the adobe-flash-plugin branch November 10, 2020 01:04
@ericonr
Copy link
Member

ericonr commented Nov 10, 2020

You might want to reopen this PR, if you still want to pursue it.

@ghost
Copy link
Author

ghost commented Nov 10, 2020

Hmm... I think that it would be better if I close this PR, delete this specific branch (as I fucked up with the merging) and open a brand new branch to work from... It's a cleaner job 😞

@abenson
Copy link
Contributor

abenson commented Nov 10, 2020

If you rebase it'll fix the merge

@ghost ghost changed the title [WIP] adobe-flash-plugin: update to 32.0.0.445. adobe-flash-plugin: update to 32.0.0.445. Nov 10, 2020
@ghost ghost reopened this Nov 10, 2020
@ghost
Copy link
Author

ghost commented Nov 10, 2020

Alright, I've restored the PR to the original state (the "good" one).

@abenson
Copy link
Contributor

abenson commented Nov 10, 2020

Looks like you need to rebase on master, there's been a few updates to the package before yours.

 git remote add upstream git@github.com:void-linux/void-packages
 git pull upstream master --rebase --autostash

It'll complain of a conflict, edit srcpkgs/adobe-flash-plugin/template to be correct, then git add srcpkgs/adobe-flash-plugin/template and finish the rebase.

git rebase --continue

Then you can repush.

@ghost
Copy link
Author

ghost commented Nov 10, 2020

Done, now everything should work as expected. Thanks @abenson! 👍

@abenson
Copy link
Contributor

abenson commented Nov 10, 2020

https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_npapi_linux.i386.tar.gz: Not Found
=> ERROR: adobe-flash-plugin-32.0.0.445_1: failed to fetch flash_player_npapi_linux.i386.tar.gz.

@abenson
Copy link
Contributor

abenson commented Nov 10, 2020

Version should be 32.0.0.453 now

@ghost ghost changed the title adobe-flash-plugin: update to 32.0.0.445. adobe-flash-plugin: update to 32.0.0.453. Nov 10, 2020
@the-maldridge the-maldridge merged commit b7941bc into void-linux:master Nov 21, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants