diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/firefox/PKGBUILD | 61 | ||||
| -rw-r--r-- | extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch | 17 | ||||
| -rw-r--r-- | extra/imagemagick6/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/linux-pae/PKGBUILD | 4 |
4 files changed, 63 insertions, 30 deletions
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index a0a94a98..5087c006 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -3,4 +3,65 @@ eval "$( sed ' /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk ' + declare -f prepare | \ + sed ' + $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" + ' )" +for ((i=0; i<${#source[@]}; i++)); do + infos=$( + printf '%s\n' "${source[${i}]}" | \ + sed -n ' + s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^?#]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@ + T + p + ' + ) + if [ -n "${infos}" ]; then + source[${i}]=$( + type="${infos%% *}" + infos="${infos#* }" + if [ -n "${infos%% *}" ]; then + prefix="${infos%% *}" + else + prefix='' + fi + infos="${infos#* }" + repo="${infos%% *}" + repo64=$( + printf '%s' "${repo}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + infos="${infos#* }" + if [ "${infos%% *}" = '?signed' ]; then + key_check=$( + printf '&valid_keys=' + printf '%s,' "${validpgpkeys[@]}" | \ + sed 's/,$//' + ) + else + key_check='' + fi + infos="${infos#* }" + if [ -z "${prefix}" ]; then + prefix="${repo%.git}" + prefix="${prefix##*/}" + fi + prefix_64=$( + printf '%s/' "${prefix}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + + printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \ + "${prefix}" \ + "${pkgver}" \ + "${type}" \ + "${prefix_64}" \ + "${repo64}" \ + "${key_check}" \ + "${infos}" + ) + fi +done diff --git a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch b/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch deleted file mode 100644 index 57e22254..00000000 --- a/extra/imagemagick6/ImageMagick-6.9.10-11-bug17.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rauN ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h ---- ImageMagick-6.9.10-11/Magick++/lib/Magick++/Color.h 2018-08-28 14:31:12.000000000 +0200 -+++ ImageMagick-6.9.10-11-bug17-patch/Magick++/lib/Magick++/Color.h 2018-09-01 15:14:05.133038562 +0200 -@@ -122,11 +122,12 @@ - { - return (static_cast<double>(quantum_)/QuantumRange); - } --#endif -+#else - static double scaleQuantumToDouble(const double quantum_) - { - return (quantum_/QuantumRange); - } -+#endif - - protected: - diff --git a/extra/imagemagick6/PKGBUILD b/extra/imagemagick6/PKGBUILD deleted file mode 100644 index c16dae59..00000000 --- a/extra/imagemagick6/PKGBUILD +++ /dev/null @@ -1,11 +0,0 @@ -# see https://github.com/ImageMagick/ImageMagick6/issues/17 - -source+=('ImageMagick-6.9.10-11-bug17.patch') -sha256sums+=('59592dba2feebf4457e0d79e95bd212f41a6e6bbec0ed7d3aaf43328047e9c96') - -eval "$( - declare -f prepare | \ - sed ' - /patch/ a patch -Np1 -i ../ImageMagick-6.9.10-11-bug17.patch - ' -)" diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 83773abd..a067b90e 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-pae # Build stock -ARCH kernel -pkgver='4.18.11' +pkgver='4.18.12' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,7 +24,7 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('36d319f5a6caf5dd6ab2a4802b800799b56ef5963d742f2d147fabadf4822c8c' +sha256sums=('846a5ad9cbe576f66aeeb188c9bd45d14eee0783aebfc4ea853dac09a7159fc5' 'SKIP' 'e8884986b8b50a560ba6b4be383955b97c98e4cb148aa2bc2387a4869e020bb3' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' |