* [PR PATCH] adobe-flash-plugin: update to 32.0.0.414
@ 2020-08-20 18:37 Generekalipsa
2020-08-20 18:48 ` ahesford
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Generekalipsa @ 2020-08-20 18:37 UTC (permalink / raw)
To: ml
[-- 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}"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: adobe-flash-plugin: update to 32.0.0.414
2020-08-20 18:37 [PR PATCH] adobe-flash-plugin: update to 32.0.0.414 Generekalipsa
@ 2020-08-20 18:48 ` ahesford
2020-08-20 18:52 ` [PR PATCH] [Closed]: " ahesford
2020-08-20 18:57 ` Generekalipsa
2 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2020-08-20 18:48 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: adobe-flash-plugin: update to 32.0.0.414
2020-08-20 18:37 [PR PATCH] adobe-flash-plugin: update to 32.0.0.414 Generekalipsa
2020-08-20 18:48 ` ahesford
@ 2020-08-20 18:52 ` ahesford
2020-08-20 18:57 ` Generekalipsa
2 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2020-08-20 18:52 UTC (permalink / raw)
To: ml
[-- 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:
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: adobe-flash-plugin: update to 32.0.0.414
2020-08-20 18:37 [PR PATCH] adobe-flash-plugin: update to 32.0.0.414 Generekalipsa
2020-08-20 18:48 ` ahesford
2020-08-20 18:52 ` [PR PATCH] [Closed]: " ahesford
@ 2020-08-20 18:57 ` Generekalipsa
2 siblings, 0 replies; 5+ messages in thread
From: Generekalipsa @ 2020-08-20 18:57 UTC (permalink / raw)
To: ml
[-- 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PR PATCH] adobe-flash-plugin: Update to 32.0.0.414
@ 2020-08-20 10:36 Generekalipsa
0 siblings, 0 replies; 5+ messages in thread
From: Generekalipsa @ 2020-08-20 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
There is a new pull request by Generekalipsa against master on the void-packages repository
https://github.com/Generekalipsa/void-packages master
https://github.com/void-linux/void-packages/pull/24379
adobe-flash-plugin: Update to 32.0.0.414
A patch file from https://github.com/void-linux/void-packages/pull/24379.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-24379.patch --]
[-- Type: text/x-diff, Size: 7777 bytes --]
From 4fb5ce8da9d1e4f493294c35b82c092c95398248 Mon Sep 17 00:00:00 2001
From: Generekalipsa <68501178+Generekalipsa@users.noreply.github.com>
Date: Thu, 20 Aug 2020 12:17:22 +0200
Subject: [PATCH 1/3] Add files via upload
---
template | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
create mode 100644 template
diff --git a/template b/template
new file mode 100644
index 00000000000..3e735c5a2f2
--- /dev/null
+++ b/template
@@ -0,0 +1,64 @@
+# Template file for 'adobe-flash-plugin'
+pkgname=adobe-flash-plugin
+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"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:Adobe License (non free)"
+homepage="https://www.adobe.com"
+repository="nonfree"
+
+restricted=yes
+create_wrksrc=yes
+archs="i686 x86_64"
+nopie=yes
+
+# The EULA file
+_eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf"
+_eulacksum=5a0a95eb4082b6db7182188ce119f3829184b238b0a91293322c2a51a2b41fc1
+_url=https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ distfiles="
+ ${_url}/flash_player_npapi_linux.x86_64.tar.gz
+ ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
+ checksum="
+ 0369f481c97769e0c1b594a539240a2af6590fd4eed900762558d7f3a227e059
+ bd2291db7f64017dd89ac404996f9ad21723822d96b9f4efa0ddab63a1e041f3"
+else
+ distfiles="
+ ${_url}/flash_player_npapi_linux.i386.tar.gz
+ ${_url}/flash_player_ppapi_linux.i386.tar.gz"
+ checksum="
+ 16feea0ef5dbe93cc9d531f83ef73ea1c40b4677ca8951abe3487c6c3fb4cd3a
+ a3137daf8cd942ca3c998fe473b3b25b6b708e3f70c24997938a8e100c72d8f6"
+fi
+distfiles+=" ${_eula}"
+checksum+=" ${_eulacksum}"
+skip_extraction="${_eula##*/}"
+
+do_install() {
+ vinstall libflashplayer.so 755 usr/lib/mozilla/plugins
+ #vinstall usr/lib/kde4/kcm_adobe_flash_player.so 755 usr/lib/kde4
+ vbin usr/bin/flash-player-properties
+ for i in 16x16 22x22 24x24 32x32 48x48; do
+ vinstall usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
+ 644 usr/share/icons/hicolor/${i}/apps
+ done
+ vinstall usr/share/applications/flash-player-properties.desktop 644 \
+ usr/share/applications
+ vinstall usr/share/kde4/services/kcm_adobe_flash_player.desktop 644 \
+ usr/share/kde4/services
+ vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_eula##*/}" LICENSE.pdf
+}
+
+adobe-flash-plugin-ppapi_package() {
+ short_desc="Adobe Flash Player plugin for Chromium-based browsers"
+ pkg_install() {
+ vinstall libpepflashplayer.so 755 usr/lib/chromium/PepperFlash
+ vinstall manifest.json 644 usr/lib/chromium/PepperFlash
+ vinstall ${FILESDIR}/flash-plugin-ppapi.sh 644 etc/profile.d
+ vsed -e "s/@VERSION@/${version}/g" -i ${PKGDESTDIR}/etc/profile.d/flash-plugin-ppapi.sh
+ vlicense "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_eula##*/}" LICENSE.pdf
+ }
+}
From 2b4d88e05722379ec2859411bdf8e9dd3c1982ae Mon Sep 17 00:00:00 2001
From: Generekalipsa <68501178+Generekalipsa@users.noreply.github.com>
Date: Thu, 20 Aug 2020 12:19:03 +0200
Subject: [PATCH 2/3] Delete template
---
template | 64 --------------------------------------------------------
1 file changed, 64 deletions(-)
delete mode 100644 template
diff --git a/template b/template
deleted file mode 100644
index 3e735c5a2f2..00000000000
--- a/template
+++ /dev/null
@@ -1,64 +0,0 @@
-# Template file for 'adobe-flash-plugin'
-pkgname=adobe-flash-plugin
-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"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom:Adobe License (non free)"
-homepage="https://www.adobe.com"
-repository="nonfree"
-
-restricted=yes
-create_wrksrc=yes
-archs="i686 x86_64"
-nopie=yes
-
-# The EULA file
-_eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf"
-_eulacksum=5a0a95eb4082b6db7182188ce119f3829184b238b0a91293322c2a51a2b41fc1
-_url=https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- distfiles="
- ${_url}/flash_player_npapi_linux.x86_64.tar.gz
- ${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
- checksum="
- 0369f481c97769e0c1b594a539240a2af6590fd4eed900762558d7f3a227e059
- bd2291db7f64017dd89ac404996f9ad21723822d96b9f4efa0ddab63a1e041f3"
-else
- distfiles="
- ${_url}/flash_player_npapi_linux.i386.tar.gz
- ${_url}/flash_player_ppapi_linux.i386.tar.gz"
- checksum="
- 16feea0ef5dbe93cc9d531f83ef73ea1c40b4677ca8951abe3487c6c3fb4cd3a
- a3137daf8cd942ca3c998fe473b3b25b6b708e3f70c24997938a8e100c72d8f6"
-fi
-distfiles+=" ${_eula}"
-checksum+=" ${_eulacksum}"
-skip_extraction="${_eula##*/}"
-
-do_install() {
- vinstall libflashplayer.so 755 usr/lib/mozilla/plugins
- #vinstall usr/lib/kde4/kcm_adobe_flash_player.so 755 usr/lib/kde4
- vbin usr/bin/flash-player-properties
- for i in 16x16 22x22 24x24 32x32 48x48; do
- vinstall usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
- 644 usr/share/icons/hicolor/${i}/apps
- done
- vinstall usr/share/applications/flash-player-properties.desktop 644 \
- usr/share/applications
- vinstall usr/share/kde4/services/kcm_adobe_flash_player.desktop 644 \
- usr/share/kde4/services
- vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_eula##*/}" LICENSE.pdf
-}
-
-adobe-flash-plugin-ppapi_package() {
- short_desc="Adobe Flash Player plugin for Chromium-based browsers"
- pkg_install() {
- vinstall libpepflashplayer.so 755 usr/lib/chromium/PepperFlash
- vinstall manifest.json 644 usr/lib/chromium/PepperFlash
- vinstall ${FILESDIR}/flash-plugin-ppapi.sh 644 etc/profile.d
- vsed -e "s/@VERSION@/${version}/g" -i ${PKGDESTDIR}/etc/profile.d/flash-plugin-ppapi.sh
- vlicense "${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/${_eula##*/}" LICENSE.pdf
- }
-}
From 8179d292850071dddc0d2d61c0f636b949a07a1a 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 3/3] Add files via upload
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}"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-20 18:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20 18:37 [PR PATCH] adobe-flash-plugin: update to 32.0.0.414 Generekalipsa
2020-08-20 18:48 ` ahesford
2020-08-20 18:52 ` [PR PATCH] [Closed]: " ahesford
2020-08-20 18:57 ` Generekalipsa
-- strict thread matches above, loose matches on Subject: below --
2020-08-20 10:36 [PR PATCH] adobe-flash-plugin: Update " Generekalipsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).