From ca60d0e911b5679c526fa73dd4358744ff594df1 Mon Sep 17 00:00:00 2001 From: make-file <76424010+make-file@users.noreply.github.com> Date: Mon, 21 Dec 2020 09:09:37 +0000 Subject: [PATCH 1/3] enlightenment: update to 0.24.2 --- srcpkgs/enlightenment/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 9937e24f0f9..db9c886dc92 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,7 +1,7 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.24.1 -revision=2 +version=0.24.2 +revision=1 build_style=meson configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false $(vopt_bool wayland wl)" @@ -16,7 +16,7 @@ maintainer="q66 " license="BSD-2-Clause" homepage="http://enlightenment.org" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09 +checksum=be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 lib32disabled=yes build_options="wayland" build_options_default="wayland" From d2e152b042cf00ee9ae233ac41d7ec47fe6520d2 Mon Sep 17 00:00:00 2001 From: make-file <76424010+make-file@users.noreply.github.com> Date: Mon, 21 Dec 2020 09:17:12 +0000 Subject: [PATCH 2/3] enlightenment: update to 0.24.2 since enlightenment 0.24.2 signal.h is included inside e_util_suid.h --- .../enlightenment/patches/musl-signal_h.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 srcpkgs/enlightenment/patches/musl-signal_h.patch diff --git a/srcpkgs/enlightenment/patches/musl-signal_h.patch b/srcpkgs/enlightenment/patches/musl-signal_h.patch deleted file mode 100644 index 290c473d63b..00000000000 --- a/srcpkgs/enlightenment/patches/musl-signal_h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cb7e05c703331dd38613dad8304ed49581853abe Mon Sep 17 00:00:00 2001 -From: q66 -Date: Wed, 10 Jun 2020 21:12:43 +0200 -Subject: [PATCH] e_util_suid: need signal.h - ---- - src/bin/e_util_suid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/bin/e_util_suid.h src/bin/e_util_suid.h -index e09091146..be961a520 100644 ---- src/bin/e_util_suid.h -+++ src/bin/e_util_suid.h -@@ -28,6 +28,7 @@ - #endif - #include - #include -+#include - #ifdef HAVE_PRCTL - # include - #elif defined(HAVE_PROCCTL) --- -2.27.0 - From 6aca882e2e9f79521291dc7f3557c32853a13c6a Mon Sep 17 00:00:00 2001 From: make-file <76424010+make-file@users.noreply.github.com> Date: Mon, 21 Dec 2020 16:41:58 +0000 Subject: [PATCH 3/3] adobe-flash-plugin: update to 32.0.0.465 last updates before getting abandoned. --- srcpkgs/adobe-flash-plugin/template | 68 ++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 3c2d29c7db5..8ff12073f33 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,10 +1,10 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=32.0.0.453 +version=32.0.0.465 revision=1 depends="curl hicolor-icon-theme desktop-file-utils" short_desc="Adobe Flash Player plugin for Netscape compatible browsers" -maintainer="Orphaned " +maintainer="mkf " license="custom:Adobe License (non free)" homepage="https://www.adobe.com" repository="nonfree" @@ -19,46 +19,46 @@ _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/Platf _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=" - 587fe7027ef410e6833a9428b61ea28d4047bce6e8ed4bff3127cb9e08723e37 - cab3d2b3a02b1348d991259a7602ffb1d12ec1912984a68bcab0f7ccdf27a9f7" + distfiles=" + ${_url}/flash_player_npapi_linux.x86_64.tar.gz + ${_url}/flash_player_ppapi_linux.x86_64.tar.gz" + checksum=" + a90f2edb98231896331c61a81017f390e180015f90193865e3295319cf636c35 + 99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d" else - distfiles=" - ${_url}/flash_player_npapi_linux.i386.tar.gz - ${_url}/flash_player_ppapi_linux.i386.tar.gz" - checksum=" - 4151cdbba10488978aa2baae19ec147012e17d79c59a6bb40453e35435571df8 - 88f71944d5c08d1b36446c9c865fc82bcb89d55cd148f62afee8dd928943caf6" + distfiles=" + ${_url}/flash_player_npapi_linux.i386.tar.gz + ${_url}/flash_player_ppapi_linux.i386.tar.gz" + checksum=" + 27b7210d09514d661c34752d29cbc0b6c09968b8d197d21fedc14fd3c49a0bd6 + d32ad3eb24f22cd11cb83910a72880c98f69ea1ec0f3ce6beb31812e166f0f62" 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 + 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 - } + 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 + } }