[PR PATCH] adobe-flash-plugin: update to 32.0.0.414

[PR PATCH] adobe-flash-plugin: update to 32.0.0.414

[Generekalipsa]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

There is a new pull request by Generekalipsa against master on the void-packages repository

https://github.com/Generekalipsa/void-packages adobe-flash-plugin
https://github.com/void-linux/void-packages/pull/24392

adobe-flash-plugin: update to 32.0.0.414


A patch file from https://github.com/void-linux/void-packages/pull/24392.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adobe-flash-plugin-24392.patch --]
[-- Type: text/x-diff, Size: 1734 bytes --]

From 86204890da918e36ca15d3affd3e105dec0d4e32 Mon Sep 17 00:00:00 2001
From: Generekalipsa <68501178+Generekalipsa@users.noreply.github.com>
Date: Thu, 20 Aug 2020 12:20:32 +0200
Subject: [PATCH] adobe-flash-plugin: update to 32.0.0.414

---
 srcpkgs/adobe-flash-plugin/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 5b6ef9d8c02..3e735c5a2f2 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=32.0.0.403
+version=32.0.0.414
 revision=1
 depends="curl hicolor-icon-theme desktop-file-utils"
 short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
@@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	 ${_url}/flash_player_npapi_linux.x86_64.tar.gz
 	 ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
 	checksum="
-	 f48ae94a723d36ecbc9019cb65ded295de93352047993d262b5c4776874f5fdd
-	 b347c7208cfb601caf1dc793a73a8f4ad87aacd4b609ab289bfc9bad2f697f48"
+	 0369f481c97769e0c1b594a539240a2af6590fd4eed900762558d7f3a227e059
+	 bd2291db7f64017dd89ac404996f9ad21723822d96b9f4efa0ddab63a1e041f3"
 else
 	distfiles="
 	 ${_url}/flash_player_npapi_linux.i386.tar.gz
 	 ${_url}/flash_player_ppapi_linux.i386.tar.gz"
 	checksum="
-	 42fa19ab7268b27bc919f9f78f0d974fae1d7aa0dde4bb01d72b92c43c1059ac
-	 8ba5f3bc41fd7c12c18d472d876cd84158238c2b8dffe1f236d3c80ef3d4735d"
+	 16feea0ef5dbe93cc9d531f83ef73ea1c40b4677ca8951abe3487c6c3fb4cd3a
+	 a3137daf8cd942ca3c998fe473b3b25b6b708e3f70c24997938a8e100c72d8f6"
 fi
 distfiles+=" ${_eula}"
 checksum+=" ${_eulacksum}"

Re: adobe-flash-plugin: update to 32.0.0.414

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24392#issuecomment-677836377

Comment:
Please don't duplicate and close PRs, it adds extra noise and complicates tracking the evolution of requests.

To squash commits in #24379 you could have done, in your local git repo (assuming `upstream` is a remote reference to https://github.com/void-linux/void-packages and `origin` is a remote reference to your personal fork):
```
git switch adobe-flash-plugin
git pull --rebase upstream master
git rebase --interactive upstream/master
```
This will open an editor to allow you to modify the history of commits you've made on top of `upstream/master`. Leave the first `pick` line alone, and change the `pick` references of every other commit to `squash`, then save and quit the editor. A new editor instance will open asking you to edit the commit message for the new squashed message, which you can change as needed, save and quit. The result should be a new, single commit representing a composite of all the changes you made. Finally, `git push -f origin adobe-flash-plugin` will force-push your new history to the branch tracked in the PR.

Alternatively, you could have created a new local branch from `upstream/master`, made the commit however you saw fit, and then done `git push -f origin adobe-flash-plugin` to replace the contents of your remote branch with the new, simplified history.

Re: [PR PATCH] [Closed]: adobe-flash-plugin: update to 32.0.0.414

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

There's a closed pull request on the void-packages repository

adobe-flash-plugin: update to 32.0.0.414
https://github.com/void-linux/void-packages/pull/24392

Description:

Re: adobe-flash-plugin: update to 32.0.0.414

[Generekalipsa]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by Generekalipsa on void-packages repository

https://github.com/void-linux/void-packages/pull/24392#issuecomment-677840777

Comment:
Sorry, the first one was just a mess and I wanted to start from scratch with commit. It was my first pull request so I made a couple mistakes. Thanks for advice.