Merge branch 'master' into i486

8 files changed, 9 insertions, 128 deletions

diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD
index 2eb35f20..5d99a981 100644
--- a/extra/flashplugin/PKGBUILD
+++ b/extra/flashplugin/PKGBUILD
@@ -1,4 +1,4 @@
 # bring back the i686 specific stuff
 source=("${source[@]//x86_64/i386}")
-sha256sums=('aa919124f1a3c7fe5cd290f95e540c526d911bc65c7efcdcfc3ffda131e7387a'
-            'ff51c3a0b7abdd5be3fc7bef36fd8f8edf8b983b8985ee743b1d99721fd7920a')
+sha256sums=('81a4a004b92162ec51dfbc8b8ad999c936ba057d6f1ec691623502913e072770'
+            '34b9e0214d5c871bea5f9a9d105c812e923b135638fb7383a279c07592da801e')
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 49a3cf2d..800e87e1 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.19.1'
+pkgver='4.19.2'
 _srcname=linux-${pkgver}
 pkgrel='1'
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('64d637c65c0b210659ff1719bcc9e34c5576fc3a4df9aa67087fa00bc2e08829'
+sha256sums=('c10c7f81019bd782ea77a25725f6d53e9affa4a0cfd3985c161f3a2a22f2df73'
             'SKIP'
-            '757489db94f7d1417cfc92c56fc9de738567881c199b401e0f55ba2b846357f8'
+            'a81f127e6b378a73a6b77532bfcfdef5524ce2daacbeab2af8798314dbad7d20'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index b42c6d4a..53711f15 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.1-1 Kernel Configuration
+# Linux/x86 4.19.2-1 Kernel Configuration
 #
 
 #
@@ -9314,7 +9314,6 @@ CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
diff --git a/extra/nvidia-390xx/PKGBUILD b/extra/nvidia-390xx/PKGBUILD
index 78ee510b..584e8b7c 100644
--- a/extra/nvidia-390xx/PKGBUILD
+++ b/extra/nvidia-390xx/PKGBUILD
@@ -5,7 +5,7 @@ for ((i=${#source[@]}; i>0; i--)); do
 done
 
 source[${i}]="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-sha256sums[${i}]='1445d22b987daca15bf313b39d08aca4cec71dd473f1d20eb00b0b08df08a3f9'
+sha256sums[${i}]='5c29c5f9d80a07ea71219c6323fe5fc9b7577847b970f23161685d4b890b9966'
 _pkg="NVIDIA-Linux-x86-${pkgver}"
 
 eval "$(
diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD
index 56066847..26837912 100644
--- a/extra/qt5-webengine/PKGBUILD
+++ b/extra/qt5-webengine/PKGBUILD
@@ -23,7 +23,7 @@ sha256sums+=('f1d810bf237ea3ce85803eb4665273b2d2bfa8a2a19521d5fa05568cec5d8cba')
 eval "$(
   declare -f prepare | \
     sed '
-      /ffmpeg4.patch/ a patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
+      $ i cd "$srcdir/${_pkgfqn}/src/3rdparty"; patch -Np0 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
     '
 )"
 
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
deleted file mode 100644
index 0034df83..00000000
--- a/extra/sbcl/PKGBUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-source+=('x86-linux-os.patch')
-sha256sums+=('3ba738c461a8836171b424b5881ad5aaa63071f54bc5d207e72cae4c1be3738a')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ../x86-linux-os.patch
-}
diff --git a/extra/sbcl/x86-linux-os.patch b/extra/sbcl/x86-linux-os.patch
deleted file mode 100644
index c1fd12b7..00000000
--- a/extra/sbcl/x86-linux-os.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- sbcl-1.4.10/src/runtime/x86-linux-os.c.orig	2018-09-07 03:07:10.927918139 +0000
-+++ sbcl-1.4.10/src/runtime/x86-linux-os.c	2018-09-07 03:05:10.471896471 +0000
-@@ -45,73 +45,43 @@
- #include <linux/version.h>
- #include "thread.h"             /* dynamic_values_bytes */
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
--#define user_desc  modify_ldt_ldt_s
--#endif
--
--static inline int modify_ldt(int func, void *ptr, unsigned long bytecount)
-+static inline int set_thread_area(struct user_desc *u_info)
- {
--  return syscall(SYS_modify_ldt, func, ptr, bytecount);
-+    return syscall(SYS_set_thread_area, u_info);
- }
- 
- #include "validate.h"
- size_t os_vm_page_size;
- 
--u32 local_ldt_copy[LDT_ENTRIES*LDT_ENTRY_SIZE/sizeof(u32)];
--
--/* This is never actually called, but it's great for calling from gdb when
-- * users have thread-related problems that maintainers can't duplicate */
--
--void debug_get_ldt()
--{
--    int n=modify_ldt (0, local_ldt_copy, sizeof local_ldt_copy);
--    printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
--}
--
--#ifdef LISP_FEATURE_SB_THREAD
--pthread_mutex_t modify_ldt_lock = PTHREAD_MUTEX_INITIALIZER;
--#endif
--
- int arch_os_thread_init(struct thread *thread) {
-     stack_t sigstack;
- #ifdef LISP_FEATURE_SB_THREAD
--    struct user_desc ldt_entry = {
--        1, 0, 0, /* index, address, length filled in later */
--        1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
-+    struct user_desc desc = {
-+        0, (unsigned long) thread, dynamic_values_bytes,
-+        1, 0, 0, 1, 0, 1
-     };
--    int n;
--    thread_mutex_lock(&modify_ldt_lock);
--    n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy);
--    /* get next free ldt entry */
--
--    if(n) {
--        u32 *p;
--        for(n=0,p=local_ldt_copy;*p;p+=LDT_ENTRY_SIZE/sizeof(u32))
--            n++;
--    }
--    ldt_entry.entry_number=n;
--    ldt_entry.base_addr=(unsigned long) thread;
--    ldt_entry.limit=dynamic_values_bytes;
--    ldt_entry.limit_in_pages=0;
--    if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
--        thread_mutex_unlock(&modify_ldt_lock);
--        /* modify_ldt call failed: something magical is not happening */
-+
-+    static int entry_number = -1;
-+
-+    desc.entry_number = entry_number;
-+
-+    if (set_thread_area(&desc) != 0) {
-         return 0;
-     }
-+
-+    entry_number = desc.entry_number;
-+
-     __asm__ __volatile__ ("movw %w0, %%fs" : : "q"
--                          ((n << 3) /* selector number */
--                           + (1 << 2) /* TI set = LDT */
--                           + 3)); /* privilege level */
--    thread->tls_cookie=n;
--    pthread_mutex_unlock(&modify_ldt_lock);
-+                          ((entry_number << 3) + 3));
- 
--    if(n<0) return 0;
-+    if(entry_number < 0) return 0;
- #ifdef LISP_FEATURE_GCC_TLS
-     current_thread = thread;
- #else
-     pthread_setspecific(specials,thread);
- #endif
- #endif
-+
- #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
-     /* Signal handlers are run on the control stack, so if it is exhausted
-      * we had better use an alternate stack for whatever signal tells us
-@@ -136,17 +106,7 @@
-  */
- 
- int arch_os_thread_cleanup(struct thread *thread) {
--    struct user_desc ldt_entry = {
--        0, 0, 0,
--        0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0
--    };
--    int result;
--
--    ldt_entry.entry_number=thread->tls_cookie;
--    thread_mutex_lock(&modify_ldt_lock);
--    result = modify_ldt(1, &ldt_entry, sizeof (ldt_entry));
--    thread_mutex_unlock(&modify_ldt_lock);
--    return result;
-+    return 1;
- }
- 
- 
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
new file mode 100644
index 00000000..af68d686
--- /dev/null
+++ b/extra/swt/PKGBUILD
@@ -0,0 +1 @@
+source=(${source[@]/x86_64/x86})