diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:03:45 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:03:45 +0100 |
| commit | fbbbee85e67e67ceb9de12ecab5eee00692959d6 (patch) | |
| tree | 17cde7cdca7f495a782d9f95052b6e73ab658331 | |
| parent | c2b2f00057bd52e54fcdc4ff92f8421e651ce815 (diff) | |
| parent | 2a30eba45bb7672693d456ff23ca35cb7a27a5be (diff) | |
| download | packages-fbbbee85e67e67ceb9de12ecab5eee00692959d6.tar.xz | |
Merge branch 'master' into i486
| -rw-r--r-- | community/botan/PKGBUILD | 7 | ||||
| -rw-r--r-- | community/vtk/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/gpm/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/linux/PKGBUILD | 3 | ||||
| -rw-r--r-- | extra/linux-pae/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-pae/config | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD index ef400383..937eee9b 100644 --- a/community/botan/PKGBUILD +++ b/community/botan/PKGBUILD @@ -1 +1,6 @@ -eval "$(declare -f build | sed "s|python.*;|\0\n sed -i 's@-O3@-O2@g' Makefile;|")" +eval "$( + declare -f build | \ + sed ' + s,/configure\.py ,\0--cpu=i686 , + ' +)" diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD deleted file mode 100644 index 6c7a97bd..00000000 --- a/community/vtk/PKGBUILD +++ /dev/null @@ -1,2 +0,0 @@ -# temporary checksum fix for downloaded patch file -sha512sums[3]='20a68b5b0821984fcd58638b12b00db875907f990a68147d7a7867431aaa6bfe1334deaefae4c64adce2dc845ae317167a5cf1d19ebed285d32b6e214e6d7068' diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index e480b7cb..242ad34e 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,5 +1,5 @@ source+=('gpm-1.20.7-glibc-2.26-1.patch') -sha1sums+=('af8c743dce0189abe46f53a084a060334b4d5ed8') +sha256sums+=('fc916df0f7060083ae48d8fe9949e68552f219cb11ee9f5b245a599a5b0cc6a8') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index ecabd417..a0447e94 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -10,6 +10,9 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do fi done +makedepends=(${makedepends[@]/graphviz/}) +makedepends_i686=(graphviz) + eval "$( declare -f prepare | \ sed ' diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 2220cd5b..29ac4b14 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.14' +pkgver='4.18.15' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,9 +24,9 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('36c6d1360db9eab40270db6d292c259dd34d3dc06049d64afe3e4cfafb8562d3' +sha256sums=('8fc351514d2f3acb528cd9f915bfad5b5a07354b4c90831cafd11713a0562933' 'SKIP' - 'efd2fa313d1c457dfc4244c4c55261cb1bf361af242665539ce5308bc1791477' + '1d38d19532d73dc3a6f426effdaf43a10f996f8c9fc5a0bb7fd0f45af27b9609' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' diff --git a/extra/linux-pae/config b/extra/linux-pae/config index 89bb9a32..139f87cb 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.14-1 Kernel Configuration +# Linux/x86 4.18.15-1 Kernel Configuration # # |