[PR PATCH] mariadb: update to 10.5.9.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] mariadb: update to 10.5.9.
@ 2021-04-11  4:28 Veganizer
  2021-04-11  5:13 ` ericonr
                   ` (48 more replies)
  0 siblings, 49 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  4:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]

There is a new pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34675 bytes --]

From e82bb457244fd7f9a475f746e6c166a363a95584 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  92 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 113 insertions(+), 617 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..33bf146a9b29 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,45 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +48,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +59,8 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmysqld.so"
+		vmove "usr/lib/libmysqlclient*.so"
 	}
 }
 libmariadbclient-devel_package() {
@@ -97,7 +73,7 @@ libmariadbclient-devel_package() {
 		vmove usr/share/man/man1/mysql_config.1
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libmariadb*.so"
 	}
 }
 mariadb-client_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
@ 2021-04-11  5:13 ` ericonr
  2021-04-11  5:47 ` Veganizer
                   ` (47 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: ericonr @ 2021-04-11  5:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817249408

Comment:
Might make it easier to help to share the relevant parts of 

```
2021-04-11T04:31:52.2089340Z See also "/builddir/mariadb-10.5.9/build/CMakeFiles/CMakeOutput.log".
2021-04-11T04:31:52.2090601Z See also "/builddir/mariadb-10.5.9/build/CMakeFiles/CMakeError.log".
```

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
  2021-04-11  5:13 ` ericonr
@ 2021-04-11  5:47 ` Veganizer
  2021-04-11  5:51 ` Veganizer
                   ` (46 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  5:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]

New comment by Veganizer on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817253436

Comment:
```bash
Determining if the function floor exists failed with the following output:
Change Dir: /builddir/mariadb-10.5.9/build/CMakeFiles/CMakeTmp

Run Build Command(s):/usr/bin/ninja cmTC_d867c && [1/2] Building C object CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o
<command-line>: warning: conflicting types for built-in function 'floor'; expected 'double(double)' [-Wbuiltin-declaration-mismatch]
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS'
    7 |   CHECK_FUNCTION_EXISTS(void);
      |   ^~~~~~~~~~~~~~~~~~~~~
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:1:1: note: 'floor' is declared in header '<math.h>'
  +++ |+#include <math.h>
    1 | #ifdef CHECK_FUNCTION_EXISTS
[2/2] Linking C executable cmTC_d867c
FAILED: cmTC_d867c 
: && /builddir/.xbps-mariadb/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -moutline-atomics -DCHECK_FUNCTION_EXISTS=floor -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-gnu/usr/lib   -rdynamic CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o -o cmTC_d867c   && :
/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o: in function `main':
CheckFunctionExists.c:(.text.startup+0x14): undefined reference to `floor'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
```
This for example.

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
  2021-04-11  5:13 ` ericonr
  2021-04-11  5:47 ` Veganizer
@ 2021-04-11  5:51 ` Veganizer
  2021-04-11  5:59 ` Veganizer
                   ` (45 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  5:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2191 bytes --]

New comment by Veganizer on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817253436

Comment:
```bash
Determining if the function floor exists failed with the following output:
Change Dir: /builddir/mariadb-10.5.9/build/CMakeFiles/CMakeTmp

Run Build Command(s):/usr/bin/ninja cmTC_d867c && [1/2] Building C object CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o
<command-line>: warning: conflicting types for built-in function 'floor'; expected 'double(double)' [-Wbuiltin-declaration-mismatch]
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS'
    7 |   CHECK_FUNCTION_EXISTS(void);
      |   ^~~~~~~~~~~~~~~~~~~~~
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:1:1: note: 'floor' is declared in header '<math.h>'
  +++ |+#include <math.h>
    1 | #ifdef CHECK_FUNCTION_EXISTS
[2/2] Linking C executable cmTC_d867c
FAILED: cmTC_d867c 
: && /builddir/.xbps-mariadb/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -moutline-atomics -DCHECK_FUNCTION_EXISTS=floor -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-gnu/usr/lib   -rdynamic CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o -o cmTC_d867c   && :
/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o: in function `main':
CheckFunctionExists.c:(.text.startup+0x14): undefined reference to `floor'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
```
This for example.

I mean there are a lot of `subcommand failed` but is this stopping the compiler? There are some optional dependency checks too, which are resulting in errors.

Following error it gots in the end: 
```bash
=> ERROR: mariadb-10.5.9_2: do_configure: 'CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:67
````

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (2 preceding siblings ...)
  2021-04-11  5:51 ` Veganizer
@ 2021-04-11  5:59 ` Veganizer
  2021-04-11  6:04 ` Veganizer
                   ` (44 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  5:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2253 bytes --]

New comment by Veganizer on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817253436

Comment:
```bash
Determining if the function floor exists failed with the following output:
Change Dir: /builddir/mariadb-10.5.9/build/CMakeFiles/CMakeTmp

Run Build Command(s):/usr/bin/ninja cmTC_d867c && [1/2] Building C object CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o
<command-line>: warning: conflicting types for built-in function 'floor'; expected 'double(double)' [-Wbuiltin-declaration-mismatch]
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS'
    7 |   CHECK_FUNCTION_EXISTS(void);
      |   ^~~~~~~~~~~~~~~~~~~~~
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:1:1: note: 'floor' is declared in header '<math.h>'
  +++ |+#include <math.h>
    1 | #ifdef CHECK_FUNCTION_EXISTS
[2/2] Linking C executable cmTC_d867c
FAILED: cmTC_d867c 
: && /builddir/.xbps-mariadb/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -moutline-atomics -DCHECK_FUNCTION_EXISTS=floor -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-gnu/usr/lib   -rdynamic CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o -o cmTC_d867c   && :
/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o: in function `main':
CheckFunctionExists.c:(.text.startup+0x14): undefined reference to `floor'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
```
This for example.

I mean there are a lot of `subcommand failed` but is this stopping the compiler? There are some optional dependency checks too, which are resulting in errors.

Full CMakeError.log is here: https://pastebin.com/bpNsufyY

Following error it gots in the end: 
```bash
=> ERROR: mariadb-10.5.9_2: do_configure: 'CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:67
````

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (3 preceding siblings ...)
  2021-04-11  5:59 ` Veganizer
@ 2021-04-11  6:04 ` Veganizer
  2021-04-11  6:16 ` [PR PATCH] [Updated] " Veganizer
                   ` (43 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  6:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2290 bytes --]

New comment by Veganizer on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817253436

Comment:
```bash
Determining if the function floor exists failed with the following output:
Change Dir: /builddir/mariadb-10.5.9/build/CMakeFiles/CMakeTmp

Run Build Command(s):/usr/bin/ninja cmTC_d867c && [1/2] Building C object CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o
<command-line>: warning: conflicting types for built-in function 'floor'; expected 'double(double)' [-Wbuiltin-declaration-mismatch]
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS'
    7 |   CHECK_FUNCTION_EXISTS(void);
      |   ^~~~~~~~~~~~~~~~~~~~~
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:1:1: note: 'floor' is declared in header '<math.h>'
  +++ |+#include <math.h>
    1 | #ifdef CHECK_FUNCTION_EXISTS
[2/2] Linking C executable cmTC_d867c
FAILED: cmTC_d867c 
: && /builddir/.xbps-mariadb/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -moutline-atomics -DCHECK_FUNCTION_EXISTS=floor -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-gnu/usr/lib   -rdynamic CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o -o cmTC_d867c   && :
/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o: in function `main':
CheckFunctionExists.c:(.text.startup+0x14): undefined reference to `floor'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
```
This for example.

I mean there are a lot of `subcommand failed` but is this stopping the compiler? There are some optional dependency checks too, which are resulting in errors.

Full CMakeError.log is here: https://gist.github.com/Veganizer/33ffe4401b28c2d7ac33d5605de99744

Following error it gots in the end: 
```bash
=> ERROR: mariadb-10.5.9_2: do_configure: 'CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:67
````

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (4 preceding siblings ...)
  2021-04-11  6:04 ` Veganizer
@ 2021-04-11  6:16 ` Veganizer
  2021-04-11  6:21 ` Veganizer
                   ` (42 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  6:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 35132 bytes --]

From 4643aaa5adf0b66200402541134833ee43fe4152 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/files/mysqld/log/run          |   0
 srcpkgs/mariadb/files/mysqld/run              |   0
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 112 insertions(+), 616 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 mode change 100755 => 100644 srcpkgs/mariadb/files/mysqld/log/run
 mode change 100755 => 100644 srcpkgs/mariadb/files/mysqld/run
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/files/mysqld/log/run b/srcpkgs/mariadb/files/mysqld/log/run
old mode 100755
new mode 100644
diff --git a/srcpkgs/mariadb/files/mysqld/run b/srcpkgs/mariadb/files/mysqld/run
old mode 100755
new mode 100644
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..d3ba1e5d8442 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,45 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
+version=10.5.9
 revision=2
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +48,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +59,8 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmysqld.so"
+		vmove "usr/lib/libmysqlclient*.so"
 	}
 }
 libmariadbclient-devel_package() {
@@ -97,7 +73,7 @@ libmariadbclient-devel_package() {
 		vmove usr/share/man/man1/mysql_config.1
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libmariadb*.so"
 	}
 }
 mariadb-client_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (5 preceding siblings ...)
  2021-04-11  6:16 ` [PR PATCH] [Updated] " Veganizer
@ 2021-04-11  6:21 ` Veganizer
  2021-04-11  6:26 ` Veganizer
                   ` (41 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  6:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34662 bytes --]

From 22ae7614fa825591a504a873b12e502757bcf554 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 112 insertions(+), 616 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..d3ba1e5d8442 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,45 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
+version=10.5.9
 revision=2
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +48,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +59,8 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmysqld.so"
+		vmove "usr/lib/libmysqlclient*.so"
 	}
 }
 libmariadbclient-devel_package() {
@@ -97,7 +73,7 @@ libmariadbclient-devel_package() {
 		vmove usr/share/man/man1/mysql_config.1
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libmariadb*.so"
 	}
 }
 mariadb-client_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (6 preceding siblings ...)
  2021-04-11  6:21 ` Veganizer
@ 2021-04-11  6:26 ` Veganizer
  2021-04-11  7:12 ` Veganizer
                   ` (40 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  6:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34684 bytes --]

From 10b78c9b78588c844d4bd67ef3503025610fd641 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 113 insertions(+), 616 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..ffc5fa8f7032 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
+version=10.5.9
 revision=2
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,8 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmysqld.so"
+		vmove "usr/lib/libmysqlclient*.so"
 	}
 }
 libmariadbclient-devel_package() {
@@ -97,7 +74,7 @@ libmariadbclient-devel_package() {
 		vmove usr/share/man/man1/mysql_config.1
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libmariadb*.so"
 	}
 }
 mariadb-client_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (7 preceding siblings ...)
  2021-04-11  6:26 ` Veganizer
@ 2021-04-11  7:12 ` Veganizer
  2021-04-11  8:57 ` Veganizer
                   ` (39 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  7:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34696 bytes --]

From 2a7513485e344737c9bde4c91b5a80c233c4bc41 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  93 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 114 insertions(+), 617 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..72c71e64821f 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,8 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmysqld.so"
+		vmove "usr/lib/libmysqlclient*.so"
 	}
 }
 libmariadbclient-devel_package() {
@@ -97,7 +74,7 @@ libmariadbclient-devel_package() {
 		vmove usr/share/man/man1/mysql_config.1
 		vmove usr/include
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libmariadb*.so"
 	}
 }
 mariadb-client_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (8 preceding siblings ...)
  2021-04-11  7:12 ` Veganizer
@ 2021-04-11  8:57 ` Veganizer
  2021-04-11  9:17 ` Veganizer
                   ` (38 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  8:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34532 bytes --]

From 4dda5b3fc25f0d140330d9008fe3368309668c8b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  94 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 118 insertions(+), 614 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..4b948415061c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,15 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+
+	# care for backward compatibility of packages and create symlinks
+	ln -s libmysqld.so ${DESTDIR}/usr/lib/libmysqld.so.18
+	ln -s libmysqlclient.so ${DESTDIR}/usr/lib/libmysqlclient.so.18
+	ln -s libmysqlclient.so ${DESTDIR}/usr/lib/libmysqlclient.so.18.0.0
+	ln -s libmysqlclient.so ${DESTDIR}/usr/lib/libmysqlclient_r.so.18
+	ln -s libmysqlclient.so ${DESTDIR}/usr/lib/libmysqlclient_r.so.18.0.0
 
 	vsv mysqld
 }
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (9 preceding siblings ...)
  2021-04-11  8:57 ` Veganizer
@ 2021-04-11  9:17 ` Veganizer
  2021-04-11  9:19 ` [PR REVIEW] " Johnnynator
                   ` (37 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34350 bytes --]

From 466c0cad685cc665f2d2f356798160d4d3d6a782 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  93 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 117 insertions(+), 614 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..15c6f1d65392 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,14 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+
+	# care for backward compatibility of packages and create symlinks
+	ln -s libmysqld.so ${DESTDIR}/usr/lib/libmysqld.so.18
+	for dest in libmysqlclient{,_r}.so.{18,18.0.0}; do
+		ln -s libmysqlclient.so $dest;
+	done
 
 	vsv mysqld
 }
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR REVIEW] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (10 preceding siblings ...)
  2021-04-11  9:17 ` Veganizer
@ 2021-04-11  9:19 ` Johnnynator
  2021-04-11  9:19 ` [PR PATCH] [Updated] " Veganizer
                   ` (36 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-11  9:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#discussion_r611157880

Comment:
```suggestion
	vmkdir usr/lib/security
```

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (11 preceding siblings ...)
  2021-04-11  9:19 ` [PR REVIEW] " Johnnynator
@ 2021-04-11  9:19 ` Veganizer
  2021-04-11  9:22 ` Veganizer
                   ` (35 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34349 bytes --]

From 6b909fcbe1f6b5df5e8f883e755522e1b9e1900a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  93 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 117 insertions(+), 614 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..1b97d8d504e2 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,14 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	mkdir -p ${DESTDIR}/usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+
+	# care for backward compatibility of packages and create symlinks
+	ln -s libmysqld.so ${DESTDIR}/usr/lib/libmysqld.so.18
+	for dest in libmysqlclient{,_r}.so.{18,18.0.0}; do
+		ln -s libmysqlclient.so $dest
+	done
 
 	vsv mysqld
 }
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (12 preceding siblings ...)
  2021-04-11  9:19 ` [PR PATCH] [Updated] " Veganizer
@ 2021-04-11  9:22 ` Veganizer
  2021-04-11  9:26 ` Veganizer
                   ` (34 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34336 bytes --]

From b21e0f48eab53a8d3478078a2c28c9ead5809433 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  93 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 117 insertions(+), 614 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..ea75765b9769 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,14 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+
+	# care for backward compatibility of packages and create symlinks
+	ln -s libmysqld.so ${DESTDIR}/usr/lib/libmysqld.so.18
+	for dest in libmysqlclient{,_r}.so.{18,18.0.0}; do
+		ln -s libmysqlclient.so $dest
+	done
 
 	vsv mysqld
 }
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (13 preceding siblings ...)
  2021-04-11  9:22 ` Veganizer
@ 2021-04-11  9:26 ` Veganizer
  2021-04-11  9:44 ` Veganizer
                   ` (33 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 34355 bytes --]

From 66244cc18e5c9007585b6ee3dcd69f5056b4f5b2 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  93 +++----
 srcpkgs/mariadb/update                        |   2 -
 15 files changed, 117 insertions(+), 614 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..e1fab41e6ba8 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,14 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+
+	# care for backward compatibility of packages and create symlinks
+	ln -s libmysqld.so ${DESTDIR}/usr/lib/libmysqld.so.18
+	for dest in libmysqlclient{,_r}.so.{18,18.0.0}; do
+		ln -s libmysqlclient.so ${DESTDIR}/usr/lib/$dest
+	done
 
 	vsv mysqld
 }
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (14 preceding siblings ...)
  2021-04-11  9:26 ` Veganizer
@ 2021-04-11  9:44 ` Veganizer
  2021-04-11  9:58 ` Veganizer
                   ` (32 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 36252 bytes --]

From f6b47b9183264630c23d4da7778545b9751adad2 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 16 files changed, 114 insertions(+), 622 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..556ad47c8e0e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (15 preceding siblings ...)
  2021-04-11  9:44 ` Veganizer
@ 2021-04-11  9:58 ` Veganizer
  2021-04-11 10:41 ` Veganizer
                   ` (31 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11  9:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 48858 bytes --]

From 44caa00510c1c2b36bcf939e8df6b64b386240d8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  17 --
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 141 insertions(+), 649 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/fix-cross.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
deleted file mode 100644
index 24605dae8851..000000000000
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
--IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..556ad47c8e0e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (16 preceding siblings ...)
  2021-04-11  9:58 ` Veganizer
@ 2021-04-11 10:41 ` Veganizer
  2021-04-11 10:45 ` Veganizer
                   ` (30 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 10:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 49193 bytes --]

From 33b174d6c493541ac19e86ea4c7ad8cfb8971c8b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  22 +-
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 153 insertions(+), 643 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..2f6b48ab6b56 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,17 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 12:37:57.744484333 +0200
+@@ -397,10 +397,10 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
 -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
 -  INCLUDE(${IMPORT_EXECUTABLES})
 -ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
++#IF(CMAKE_CROSSCOMPILING)
++#  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
++#  INCLUDE(${IMPORT_EXECUTABLES})
++#ENDIF()
+
  #
  # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7e23799a45d 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,47 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +50,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +61,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (17 preceding siblings ...)
  2021-04-11 10:41 ` Veganizer
@ 2021-04-11 10:45 ` Veganizer
  2021-04-11 11:07 ` Veganizer
                   ` (29 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 10:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 49173 bytes --]

From fe1afe82efe4cdadeac4ae3e98927864ad032ca2 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  22 +-
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 152 insertions(+), 643 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..2f6b48ab6b56 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,17 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 12:37:57.744484333 +0200
+@@ -397,10 +397,10 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
 -  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
 -  INCLUDE(${IMPORT_EXECUTABLES})
 -ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
++#IF(CMAKE_CROSSCOMPILING)
++#  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
++#  INCLUDE(${IMPORT_EXECUTABLES})
++#ENDIF()
+
  #
  # Setup maintainer mode options. Platform checks are
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..556ad47c8e0e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (18 preceding siblings ...)
  2021-04-11 10:45 ` Veganizer
@ 2021-04-11 11:07 ` Veganizer
  2021-04-11 11:26 ` Veganizer
                   ` (28 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 11:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 49416 bytes --]

From 730409a69d09afafc9eecc84b980f5cc88024cf4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  35 +--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 160 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..df7fe9b28c94 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,20 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(FALSE)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(TRUE)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..556ad47c8e0e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (19 preceding siblings ...)
  2021-04-11 11:07 ` Veganizer
@ 2021-04-11 11:26 ` Veganizer
  2021-04-11 11:36 ` Veganizer
                   ` (27 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 11:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 49529 bytes --]

From f1209368ee69f431bb611eb09d369cab8b6fe41d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  35 +--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 160 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..b4feed0ff84b 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,20 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT (CMAKE_CROSSCOMPILING AND NOT CMAKE_CROSSCOMPILING_EMULATOR))
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..556ad47c8e0e 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,46 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +49,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +60,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (20 preceding siblings ...)
  2021-04-11 11:26 ` Veganizer
@ 2021-04-11 11:36 ` Veganizer
  2021-04-11 12:00 ` Veganizer
                   ` (26 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 11:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 49558 bytes --]

From 8d100e9339b567b64fd46cf776ec37395572ec81 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       |  35 +--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 161 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..a1b884f1b791 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,20 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7e23799a45d 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,47 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +50,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +61,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (21 preceding siblings ...)
  2021-04-11 11:36 ` Veganizer
@ 2021-04-11 12:00 ` Veganizer
  2021-04-11 12:04 ` Veganizer
                   ` (25 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 12:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 52669 bytes --]

From e8bc58d425d251917a12822bd9599d80e6db152a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 112 ++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 238 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..c5c77d5e28e7 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,97 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7e23799a45d 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,47 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +50,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +61,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (22 preceding siblings ...)
  2021-04-11 12:00 ` Veganizer
@ 2021-04-11 12:04 ` Veganizer
  2021-04-11 12:15 ` Veganizer
                   ` (24 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 12:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 53113 bytes --]

From eb30f144cb8f41cf11a9a3af7a175d92d88855b1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 124 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 250 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..f515c5ddb747 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,109 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7e23799a45d 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,47 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +50,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +61,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (23 preceding siblings ...)
  2021-04-11 12:04 ` Veganizer
@ 2021-04-11 12:15 ` Veganizer
  2021-04-11 13:07 ` Veganizer
                   ` (23 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 12:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 53538 bytes --]

From df67c6c1b1552d6007e6fe0c19718869f6ef79ef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 262 insertions(+), 648 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..4a3dadb13005 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient.10.5.9_1
+libmariadbd.so.19 libmariadbclient.10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7e23799a45d 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,47 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +50,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +61,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (24 preceding siblings ...)
  2021-04-11 12:15 ` Veganizer
@ 2021-04-11 13:07 ` Veganizer
  2021-04-11 13:09 ` Veganizer
                   ` (22 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 53622 bytes --]

From 3a76a42de46e7b977534ea3fe4d06479bb26fa9f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 264 insertions(+), 646 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..a7ec834dbad1 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,51 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		configure_args += "-DPLUGIN_ROCKSDB=NO"
 	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {
@@ -72,8 +54,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +65,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (25 preceding siblings ...)
  2021-04-11 13:07 ` Veganizer
@ 2021-04-11 13:09 ` Veganizer
  2021-04-11 13:10 ` Veganizer
                   ` (21 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 53623 bytes --]

From 784c08d28c85d11f4e072e7248523c1f48273052 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 264 insertions(+), 646 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..8c0ddb174005 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,51 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		configure_args += " -DPLUGIN_ROCKSDB=NO"
 	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {
@@ -72,8 +54,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +65,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (26 preceding siblings ...)
  2021-04-11 13:09 ` Veganizer
@ 2021-04-11 13:10 ` Veganizer
  2021-04-11 13:23 ` Veganizer
                   ` (20 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 53621 bytes --]

From 78228d7669c93fd1e87b49abbe5b0147f0a8ee3e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 43 files changed, 264 insertions(+), 646 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..6c748211e391 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,51 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		configure_args+=" -DPLUGIN_ROCKSDB=NO"
 	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {
@@ -72,8 +54,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +65,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (27 preceding siblings ...)
  2021-04-11 13:10 ` Veganizer
@ 2021-04-11 13:23 ` Veganizer
  2021-04-11 13:30 ` Veganizer
                   ` (19 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 56120 bytes --]

From 7a6ac32c881ad5225b787010a6a0611b3f8383e0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11-atomics.patch     |  74 +++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 44 files changed, 336 insertions(+), 647 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/c11-atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11-atomics.patch b/srcpkgs/mariadb/patches/c11-atomics.patch
new file mode 100644
index 000000000000..cb8f995a668c
--- /dev/null
+++ b/srcpkgs/mariadb/patches/c11-atomics.patch
@@ -0,0 +1,74 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- a/mysys/CMakeLists.txt
++++ b/mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- a/sql/CMakeLists.txt
++++ b/sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (28 preceding siblings ...)
  2021-04-11 13:23 ` Veganizer
@ 2021-04-11 13:30 ` Veganizer
  2021-04-11 13:41 ` Veganizer
                   ` (18 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 56108 bytes --]

From fa6c3c1790cc1d0584addc852312cf41208bf144 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11-atomics.patch     |  74 +++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 44 files changed, 336 insertions(+), 647 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/c11-atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11-atomics.patch b/srcpkgs/mariadb/patches/c11-atomics.patch
new file mode 100644
index 000000000000..2aabc2d6220f
--- /dev/null
+++ b/srcpkgs/mariadb/patches/c11-atomics.patch
@@ -0,0 +1,74 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (29 preceding siblings ...)
  2021-04-11 13:30 ` Veganizer
@ 2021-04-11 13:41 ` Veganizer
  2021-04-11 16:06 ` Veganizer
                   ` (17 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 13:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 56140 bytes --]

From 85b206ca73ccc2363d0bd33b5b73118abcf9a6ba Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/c11-atomics.patch     |  74 +++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  91 +++----
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 44 files changed, 337 insertions(+), 647 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/c11-atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/c11-atomics.patch b/srcpkgs/mariadb/patches/c11-atomics.patch
new file mode 100644
index 000000000000..2aabc2d6220f
--- /dev/null
+++ b/srcpkgs/mariadb/patches/c11-atomics.patch
@@ -0,0 +1,74 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..c602815adbbf 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,49 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON
+ -DATOMIC_EXTRA_LIBS=-latomic"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +52,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +63,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (30 preceding siblings ...)
  2021-04-11 13:41 ` Veganizer
@ 2021-04-11 16:06 ` Veganizer
  2021-04-11 16:17 ` Veganizer
                   ` (16 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 16:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


Cross compiling isn't working in the moment. Maybe you can help me to fix it? I don't like the hacking way in the old package. A new way would be very recommended.


[skip_ci]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 57722 bytes --]

From d5c9fee5885cbe5d43ad8fe34f1701406bf6e9a1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Sun, 11 Apr 2021 05:48:59 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/FreeRADIUS/template                   |   2 +-
 srcpkgs/apr-util/template                     |   2 +-
 srcpkgs/bacula-common/template                |   2 +-
 srcpkgs/collectd/template                     |   2 +-
 srcpkgs/coturn/template                       |   2 +-
 srcpkgs/cyrus-sasl/template                   |   2 +-
 srcpkgs/dovecot/template                      |   2 +-
 srcpkgs/gnunet/template                       |   2 +-
 srcpkgs/icinga2/template                      |   2 +-
 srcpkgs/kdb/template                          |   2 +-
 srcpkgs/kodi/template                         |   2 +-
 srcpkgs/libgda/template                       |   2 +-
 srcpkgs/libreoffice/template                  |   2 +-
 srcpkgs/lua54-luadbi/template                 |   2 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 srcpkgs/monitoring-plugins/template           |   2 +-
 srcpkgs/mysql++/template                      |   2 +-
 srcpkgs/opensmtpd-extras/template             |   2 +-
 srcpkgs/perl-DBD-mysql/template               |   2 +-
 srcpkgs/postfix/template                      |   2 +-
 srcpkgs/python3-mysqlclient/template          |   2 +-
 srcpkgs/qt5/template                          |   2 +-
 srcpkgs/redland/template                      |   2 +-
 srcpkgs/rsyslog/template                      |   2 +-
 srcpkgs/slurm-wlm/template                    |   2 +-
 srcpkgs/sysbench/template                     |   2 +-
 srcpkgs/thc-hydra/template                    |   2 +-
 srcpkgs/zabbix/template                       |   2 +-
 44 files changed, 370 insertions(+), 647 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"
diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (31 preceding siblings ...)
  2021-04-11 16:06 ` Veganizer
@ 2021-04-11 16:17 ` Veganizer
  2021-04-12  7:12 ` [PR PATCH] [Updated] " Veganizer
                   ` (15 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-11 16:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by Veganizer on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-817332769

Comment:
fixed crosscompiling now. :-)

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (32 preceding siblings ...)
  2021-04-11 16:17 ` Veganizer
@ 2021-04-12  7:12 ` Veganizer
  2021-04-12  7:15 ` Veganizer
                   ` (14 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-12  7:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 22341 bytes --]

From ff21f4ce8749244bd4974cbcdf40788332e5248a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 .../files/musl-disable-failing-test.patch     |  28 ++++
 .../mariadb/files/musl-have-stacktrace.patch  |  19 +++
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++++++++
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++++++++++---
 srcpkgs/mariadb/template                      |  90 +++++-------
 7 files changed, 358 insertions(+), 78 deletions(-)
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 create mode 100644 srcpkgs/mariadb/files/musl-have-stacktrace.patch
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/files/musl-have-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
new file mode 100644
index 000000000000..4d87f57ddc9e
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -0,0 +1,19 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+
+ char b_bss[10];
+
++#ifndef HAVE_STACKTRACE
++int  my_safe_print_str(const char* val, size_t max_len)
++{
++  printf("%*s\n", (int) max_len, val);
++  return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+   char b_stack[10];
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (33 preceding siblings ...)
  2021-04-12  7:12 ` [PR PATCH] [Updated] " Veganizer
@ 2021-04-12  7:15 ` Veganizer
  2021-04-12  7:34 ` Veganizer
                   ` (13 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-12  7:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 45116 bytes --]

From 73a9d0e059e90298a22f8065fe78ebb0d2ec3071 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (34 preceding siblings ...)
  2021-04-12  7:15 ` Veganizer
@ 2021-04-12  7:34 ` Veganizer
  2021-04-13  7:12 ` Johnnynator
                   ` (12 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-12  7:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 64534 bytes --]

From 73a9d0e059e90298a22f8065fe78ebb0d2ec3071 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From aa89eada1c83a4f850fa63e49289c651e763c1cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 879952f011c346867a1a7ea728a73b7167592980 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From a90a3eea77567d66b00a42c095992a495d772a65 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From a6b25af7e62ca46b809e647dca8464fdc8c3d65a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 15baa237aa8f60fb6a4b12ef6a7c160d34e2d512 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 1b00b281959c3575ba747309d2306a9cc72f1f3b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:51 +0200
Subject: [PATCH 07/28] cyrus-sasl: rebuild against mariadb-10.5.9.

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From ff4bab0f3404f64c3b29ed48cceb9c9731e0a6ac Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 08/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From b1da2f7753be8053bcf7fa148e1ba6b7bc5bd081 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 09/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 1781b867891962d9e3aaed02d15de5cf31223feb Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 10/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 1de6cb9e8c856e74ec6be2e94e1aa9cc1c212f5e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 11/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 1f27cd22414017ef6989551c26eed4416151e17f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 12/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From 0a9f69cac532c850d1e2dd18da47ae1b020c86aa Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 13/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 8943595339f4afcdf0809fe1c833c13db1ecc9ca Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 14/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 2d138b5d5e3bce7d349399d4b285cdad4e057e8c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 15/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From bb8dfb0aef913737a6c4b19e159d43bf3252616a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 16/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 665d380003729f6c035da29b587ac92a76745539 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 17/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 26402e6a30ab3a55b98271709499179c81eee6ef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 18/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 90a726be3f807c32c91e509fc4bb8492dedb7a88 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 19/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 58e9a47172bb620e549a2d4955ecb41ec421891c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 20/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From fcaa38c6f9e0f8cd1561eeb1da16e02a97ac1b12 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 21/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 86338a570aeb7ae819b29b41c5d9513e8bea86f8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 22/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From cc60373a86e8595731756a5eee5aab72d671c646 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 23/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From aa0d6c9d20b6c40981847180c57f747fe0c735ea Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 24/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From ce6302b9187073fd2fa2de144b8b46b55709b8a9 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 25/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 9cdf2b4d278f52bfe046721e0b7ad389b14afc98 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 26/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From d25fbabd8aa8b56dc7e5cc66e90ec150f0d78704 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 27/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From b6bfa3f39a9fa7e799f600fc38e3305302cf95ab Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 28/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (35 preceding siblings ...)
  2021-04-12  7:34 ` Veganizer
@ 2021-04-13  7:12 ` Johnnynator
  2021-04-13  9:37 ` Johnnynator
                   ` (11 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-13  7:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3872 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-818500038

Comment:
```
CMake Deprecation Warning at cmake/modules/SetKDbCMakePolicies.cmake:12 (cmake_policy):
  The OLD behavior for policy CMP0059 will be removed from a future version
  of CMake.

  The cmake-policies(7) manual explains that the OLD behaviors of all
  policies are deprecated and that a policy should be set to OLD only under
  specific short-term circumstances.  Projects should be ported to the NEW
  behavior and not rely on setting a policy to OLD.
Call Stack (most recent call first):
  CMakeLists.txt:4 (include)


-- The C compiler identification is GNU 10.2.1
-- The CXX compiler identification is GNU 10.2.1
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Warning (dev) at cmake/modules/KDbAddSimpleOption.cmake:29 (option):
  Policy CMP0077 is not set: option() honors normal variables.  Run "cmake
  --help-policy CMP0077" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.

  For compatibility with older versions of CMake, option is clearing the
  normal variable 'BUILD_COVERAGE'.
Call Stack (most recent call first):
  cmake/modules/KDbAddTests.cmake:35 (simple_option)
  CMakeLists.txt:10 (kdb_add_tests)
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Installing in the same prefix as Qt, adopting their path scheme.
-- Looking for __GLIBC__
-- Looking for __GLIBC__ - found
-- Performing Test _OFFT_IS_64BIT
-- Performing Test _OFFT_IS_64BIT - Success
-- Performing Test HAVE_DATE_TIME
-- Performing Test HAVE_DATE_TIME - Success
-- Found KF5CoreAddons: /usr/aarch64-linux-gnu/usr/lib64/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found version "5.81.0") 
-- Found KF5: success (found suitable version "5.81.0", minimum required is "5.16.0") found components: CoreAddons 
-- Found the following ICU libraries:
--   i18n (required)
--   uc (required)
-- Found ICU: /usr/aarch64-linux-gnu/usr/include (found version "67.1") 
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Found PythonInterp: /usr/aarch64-linux-gnu/usr/bin/python2 (Required is at least version "2.6") 
-- Creating shared data class in KDbConnectionData.h from KDbConnectionData.shared.h
-- Creating shared data class in KDbObject.h from KDbObject.shared.h
-- Creating shared data class in KDbQuerySchemaParameter.h from KDbQuerySchemaParameter.shared.h
-- Creating shared data class in KDbResult.h from KDbResult.shared.h
-- Creating shared data class in KDbSelectStatementOptions.h from KDbSelectStatementOptions.shared.h
-- Creating shared data class in KDbVersionInfo.h from KDbVersionInfo.shared.h
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY - Success
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY - Success
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR - Success
CMake Error at cmake/modules/KDbGenerateHeaders.cmake:170 (message):
  Could not find "/builddir/kdb-3.2.0/build/src/KDbConnectionData.h"
Call Stack (most recent call first):
  src/CMakeLists.txt:402 (ecm_generate_headers)
```
It seems like kdb-3.2.0 fails to build for aarch64 cross (and maybe more)

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (36 preceding siblings ...)
  2021-04-13  7:12 ` Johnnynator
@ 2021-04-13  9:37 ` Johnnynator
  2021-04-13  9:37 ` Johnnynator
                   ` (10 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-13  9:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3953 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-818500038

Comment:
```
CMake Deprecation Warning at cmake/modules/SetKDbCMakePolicies.cmake:12 (cmake_policy):
  The OLD behavior for policy CMP0059 will be removed from a future version
  of CMake.

  The cmake-policies(7) manual explains that the OLD behaviors of all
  policies are deprecated and that a policy should be set to OLD only under
  specific short-term circumstances.  Projects should be ported to the NEW
  behavior and not rely on setting a policy to OLD.
Call Stack (most recent call first):
  CMakeLists.txt:4 (include)


-- The C compiler identification is GNU 10.2.1
-- The CXX compiler identification is GNU 10.2.1
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Warning (dev) at cmake/modules/KDbAddSimpleOption.cmake:29 (option):
  Policy CMP0077 is not set: option() honors normal variables.  Run "cmake
  --help-policy CMP0077" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.

  For compatibility with older versions of CMake, option is clearing the
  normal variable 'BUILD_COVERAGE'.
Call Stack (most recent call first):
  cmake/modules/KDbAddTests.cmake:35 (simple_option)
  CMakeLists.txt:10 (kdb_add_tests)
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Installing in the same prefix as Qt, adopting their path scheme.
-- Looking for __GLIBC__
-- Looking for __GLIBC__ - found
-- Performing Test _OFFT_IS_64BIT
-- Performing Test _OFFT_IS_64BIT - Success
-- Performing Test HAVE_DATE_TIME
-- Performing Test HAVE_DATE_TIME - Success
-- Found KF5CoreAddons: /usr/aarch64-linux-gnu/usr/lib64/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found version "5.81.0") 
-- Found KF5: success (found suitable version "5.81.0", minimum required is "5.16.0") found components: CoreAddons 
-- Found the following ICU libraries:
--   i18n (required)
--   uc (required)
-- Found ICU: /usr/aarch64-linux-gnu/usr/include (found version "67.1") 
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Found PythonInterp: /usr/aarch64-linux-gnu/usr/bin/python2 (Required is at least version "2.6") 
-- Creating shared data class in KDbConnectionData.h from KDbConnectionData.shared.h
-- Creating shared data class in KDbObject.h from KDbObject.shared.h
-- Creating shared data class in KDbQuerySchemaParameter.h from KDbQuerySchemaParameter.shared.h
-- Creating shared data class in KDbResult.h from KDbResult.shared.h
-- Creating shared data class in KDbSelectStatementOptions.h from KDbSelectStatementOptions.shared.h
-- Creating shared data class in KDbVersionInfo.h from KDbVersionInfo.shared.h
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY - Success
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY - Success
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR - Success
CMake Error at cmake/modules/KDbGenerateHeaders.cmake:170 (message):
  Could not find "/builddir/kdb-3.2.0/build/src/KDbConnectionData.h"
Call Stack (most recent call first):
  src/CMakeLists.txt:402 (ecm_generate_headers)
```
It seems like kdb-3.2.0 fails to build for aarch64 cross (and maybe more)

Edit: Dunno what happened there, it didn't fail like that on subsequent runs.

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (37 preceding siblings ...)
  2021-04-13  9:37 ` Johnnynator
@ 2021-04-13  9:37 ` Johnnynator
  2021-04-13 16:44 ` [PR PATCH] [Updated] " Veganizer
                   ` (9 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-13  9:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3976 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#issuecomment-818500038

Comment:
```
CMake Deprecation Warning at cmake/modules/SetKDbCMakePolicies.cmake:12 (cmake_policy):
  The OLD behavior for policy CMP0059 will be removed from a future version
  of CMake.

  The cmake-policies(7) manual explains that the OLD behaviors of all
  policies are deprecated and that a policy should be set to OLD only under
  specific short-term circumstances.  Projects should be ported to the NEW
  behavior and not rely on setting a policy to OLD.
Call Stack (most recent call first):
  CMakeLists.txt:4 (include)


-- The C compiler identification is GNU 10.2.1
-- The CXX compiler identification is GNU 10.2.1
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /builddir/.xbps-kdb/wrappers/aarch64-linux-gnu-c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Warning (dev) at cmake/modules/KDbAddSimpleOption.cmake:29 (option):
  Policy CMP0077 is not set: option() honors normal variables.  Run "cmake
  --help-policy CMP0077" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.

  For compatibility with older versions of CMake, option is clearing the
  normal variable 'BUILD_COVERAGE'.
Call Stack (most recent call first):
  cmake/modules/KDbAddTests.cmake:35 (simple_option)
  CMakeLists.txt:10 (kdb_add_tests)
This warning is for project developers.  Use -Wno-dev to suppress it.

-- Installing in the same prefix as Qt, adopting their path scheme.
-- Looking for __GLIBC__
-- Looking for __GLIBC__ - found
-- Performing Test _OFFT_IS_64BIT
-- Performing Test _OFFT_IS_64BIT - Success
-- Performing Test HAVE_DATE_TIME
-- Performing Test HAVE_DATE_TIME - Success
-- Found KF5CoreAddons: /usr/aarch64-linux-gnu/usr/lib64/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found version "5.81.0") 
-- Found KF5: success (found suitable version "5.81.0", minimum required is "5.16.0") found components: CoreAddons 
-- Found the following ICU libraries:
--   i18n (required)
--   uc (required)
-- Found ICU: /usr/aarch64-linux-gnu/usr/include (found version "67.1") 
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Found PythonInterp: /usr/aarch64-linux-gnu/usr/bin/python2 (Required is at least version "2.6") 
-- Creating shared data class in KDbConnectionData.h from KDbConnectionData.shared.h
-- Creating shared data class in KDbObject.h from KDbObject.shared.h
-- Creating shared data class in KDbQuerySchemaParameter.h from KDbQuerySchemaParameter.shared.h
-- Creating shared data class in KDbResult.h from KDbResult.shared.h
-- Creating shared data class in KDbSelectStatementOptions.h from KDbSelectStatementOptions.shared.h
-- Creating shared data class in KDbVersionInfo.h from KDbVersionInfo.shared.h
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_VISIBILITY - Success
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY
-- Performing Test COMPILER_HAS_HIDDEN_INLINE_VISIBILITY - Success
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR
-- Performing Test COMPILER_HAS_DEPRECATED_ATTR - Success
CMake Error at cmake/modules/KDbGenerateHeaders.cmake:170 (message):
  Could not find "/builddir/kdb-3.2.0/build/src/KDbConnectionData.h"
Call Stack (most recent call first):
  src/CMakeLists.txt:402 (ecm_generate_headers)
```
It seems like kdb-3.2.0 fails to build for aarch64 cross (and maybe more)

Edit: Dunno what happened there, it didn't fail like that on subsequent runs. Should be fine for now

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (38 preceding siblings ...)
  2021-04-13  9:37 ` Johnnynator
@ 2021-04-13 16:44 ` Veganizer
  2021-04-13 16:56 ` Veganizer
                   ` (8 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-13 16:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 1324647 bytes --]

From 73a9d0e059e90298a22f8065fe78ebb0d2ec3071 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 001/386] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From aa89eada1c83a4f850fa63e49289c651e763c1cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 002/386] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 879952f011c346867a1a7ea728a73b7167592980 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 003/386] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From a90a3eea77567d66b00a42c095992a495d772a65 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 004/386] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From a6b25af7e62ca46b809e647dca8464fdc8c3d65a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 005/386] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 15baa237aa8f60fb6a4b12ef6a7c160d34e2d512 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 006/386] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 1b00b281959c3575ba747309d2306a9cc72f1f3b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:51 +0200
Subject: [PATCH 007/386] cyrus-sasl: rebuild against mariadb-10.5.9.

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From ff4bab0f3404f64c3b29ed48cceb9c9731e0a6ac Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 008/386] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From b1da2f7753be8053bcf7fa148e1ba6b7bc5bd081 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 009/386] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 1781b867891962d9e3aaed02d15de5cf31223feb Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 010/386] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 1de6cb9e8c856e74ec6be2e94e1aa9cc1c212f5e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 011/386] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 1f27cd22414017ef6989551c26eed4416151e17f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 012/386] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From 0a9f69cac532c850d1e2dd18da47ae1b020c86aa Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 013/386] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 8943595339f4afcdf0809fe1c833c13db1ecc9ca Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 014/386] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 2d138b5d5e3bce7d349399d4b285cdad4e057e8c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 015/386] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From bb8dfb0aef913737a6c4b19e159d43bf3252616a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 016/386] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 665d380003729f6c035da29b587ac92a76745539 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 017/386] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 26402e6a30ab3a55b98271709499179c81eee6ef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 018/386] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 90a726be3f807c32c91e509fc4bb8492dedb7a88 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 019/386] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 58e9a47172bb620e549a2d4955ecb41ec421891c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 020/386] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From fcaa38c6f9e0f8cd1561eeb1da16e02a97ac1b12 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 021/386] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 86338a570aeb7ae819b29b41c5d9513e8bea86f8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 022/386] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From cc60373a86e8595731756a5eee5aab72d671c646 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 023/386] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From aa0d6c9d20b6c40981847180c57f747fe0c735ea Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 024/386] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From ce6302b9187073fd2fa2de144b8b46b55709b8a9 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 025/386] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 9cdf2b4d278f52bfe046721e0b7ad389b14afc98 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 026/386] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From d25fbabd8aa8b56dc7e5cc66e90ec150f0d78704 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 027/386] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From b6bfa3f39a9fa7e799f600fc38e3305302cf95ab Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 028/386] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 6d408b0f31beaf4df52abe1220a0bfbf2f91fcbf Mon Sep 17 00:00:00 2001
From: claris <share@claris>
Date: Wed, 7 Apr 2021 23:48:00 -0700
Subject: [PATCH 029/386] OpenRCT2: update to 0.3.3, tweak template

- Add CC-BY-SA-4.0 license declaration (see
  <https://github.com/OpenRCT2/title-sequences/issues/3>)
- Remove unused `jansson-devel` makedep
- Explicitly disable unused dependency options when configuring
- Add missing make target `g2` (packs some data into a file, was previously
  being invoked as a dependency of `install`)
- Remove useless and incorrect mkdir line from `post_extract`
- Remove INSTALL.msg, add explicit zenity dep instead
---
 srcpkgs/OpenRCT2/INSTALL.msg |  5 -----
 srcpkgs/OpenRCT2/template    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/OpenRCT2/INSTALL.msg

diff --git a/srcpkgs/OpenRCT2/INSTALL.msg b/srcpkgs/OpenRCT2/INSTALL.msg
deleted file mode 100644
index 70817138b9d2..000000000000
--- a/srcpkgs/OpenRCT2/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-You must install a package that provides either the zenity or kdialog binaries:
-
-- zenity
-- qarma
-- kdialog
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index b8ea8849863e..c5256b65287e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,32 +2,36 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-_objects_version=1.0.18
+_objects_version=1.0.21
 _titles_version=0.1.2c
-version=0.3.2
-revision=3
+version=0.3.3
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
  -DDOWNLOAD_TITLE_SEQUENCES=0
  -DDOWNLOAD_OBJECTS=0
+ -DDISABLE_DISCORD_RPC=1
+ -DDISABLE_GOOGLE_BENCHMARK=1
  $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
  $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
+make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
+depends="zenity"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://openrct2.io"
 # use title-sequences.zip to match CMakeLists instruction
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
- bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+checksum="71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2
+ b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip"
 
@@ -55,7 +59,6 @@ pre_configure() {
 
 post_extract() {
 	_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
-	mkdir -p data/object data/title
 	unzip -qd data/object "${_srcdir}/objects.zip"
 	unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
 

From 4f67c55f0c4e4bb64f9df6b45a30b00cd3af5c86 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:35:05 -0500
Subject: [PATCH 030/386] mongo-c-driver: update to 1.17.5.

---
 srcpkgs/mongo-c-driver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 3557648f8164..aaad9e75bce3 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,7 +1,7 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.17.4
-revision=2
+version=1.17.5
+revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=9ec8fe7fb54d636886fa823460658ccf660e3d82520d10810fb7c9d302ac974f
+checksum=4b15b7e73a8b0621493e4368dc2de8a74af381823ae8f391da3d75d227ba16be
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 7977f5756f8fcbf85e945bae9d7bee6ddeda5eaa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:32:30 -0500
Subject: [PATCH 031/386] delta: update to 0.7.1.

---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index be4b95ac2aea..250d68bccdbb 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.6.0
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=27259c3d305edee5f49a3a992e7d739cab400f478a675b7388fef85a2724217c
+checksum=f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227
 
 post_install() {
 	vlicense LICENSE

From aede019d97101197aa09c4ae9af1afbd75180808 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:41:02 -0500
Subject: [PATCH 032/386] python3-oletools: update to 0.56.1.

---
 srcpkgs/python3-oletools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 9da4f8d26cf5..73293a1f82d6 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.56
-revision=2
+version=0.56.1
+revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
+checkdepends="python3-pip python3-wheel $depends"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9d76d449f1edb1d74996ebf8b117371b5cdde436cfa595b3ff3989ec8d026106
+checksum=827cc577e253d946d5616e0a18062ed6aa837368fc19912c06e7d4c7ed502f77
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 21a94bf2561cbb3b47ed99028720b45f98d63125 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Apr 2021 12:46:49 +0200
Subject: [PATCH 033/386] scite: update to 5.0.1.

---
 srcpkgs/scite/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 11234338dd0e..e56284d0f4f7 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,7 +1,7 @@
 # Template file for 'scite'
 pkgname=scite
-version=4.4.6
-revision=2
+version=5.0.1
+revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel lua53-devel"
@@ -10,13 +10,16 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=1c2e6eee6c8aa2e52983d9713a4b1c97d06c376324a3ec8932adfcb9e55d16d1
+checksum=6d5d7b9caa895a3b72245e4b7459a678b9325d497c28bc92bc92f21fd65329b7
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile
 }
 
 do_build() {
+	make ${makejobs} -C lexilla/src \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1
 	make ${makejobs} -C scintilla/gtk \
 		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
 		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1

From ab7a85b92bd569e6a2509f3bb68ca234cb0f2b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 08:14:42 +0700
Subject: [PATCH 034/386] build-helper/qmake: respect {C,CXX,LD}FLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As of it's now, package built with build-helper/qmake natively won't
pick our CFLAGS CXXFLAGS and LDFLAGS. The result could be seen in no
debug symbol in djview.

Furthermore, cross build won't pick our hardening flags.

Let's force qmake pick our flags by using the same method as
build-style/qmake.
---
 common/build-helper/qmake.sh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index 9603cf5baae9..d2a38703b300 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -65,14 +65,36 @@ _EOF
 	# create the qmake-wrapper here because it only
 	# makes sense together with the qmake build-helper
 	# and not to interfere with e.g. the qmake build-style
+	#
+	# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
+	# - Cross Build:
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	#   + hardening flags will be picked up from environment variables
+	# - Native Build:
+	#   + hardening flags will be picked up first (Makefile, qt.conf?)
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	# Maybe there're better workaround, I don't know.
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf"
+exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+	QMAKE_CFLAGS+="\${CFLAGS}" \\
+	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+	QMAKE_LFLAGS+="\${LDFLAGS}"
 _EOF
 else
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath
+exec /usr/lib/qt5/bin/qmake \
+	"\$@" \
+	PREFIX=/usr \
+	QT_INSTALL_PREFIX=/usr \
+	LIB=/usr/lib \
+	QMAKE_CC=$CC QMAKE_CXX=$CXX \
+	QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+	QMAKE_CFLAGS+="${CFLAGS}" \
+	QMAKE_CXXFLAGS+="${CXXFLAGS}" \
+	QMAKE_LFLAGS+="${LDFLAGS}" \
+	CONFIG+=no_qt_rpath
 _EOF
 fi
 chmod 755 ${XBPS_WRAPPERDIR}/qmake

From a570ca9382451db5e41c910d278eb244120a5186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 08:17:30 +0700
Subject: [PATCH 035/386] djview: fix dbg package

---
 srcpkgs/djview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index a6af3f0188d1..76a0d1cc4103 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,11 +1,11 @@
 # Template file for 'djview'
 pkgname=djview
 version=4.12
-revision=2
+revision=3
 wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
-configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
+configure_args="ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"

From a02bb3a5dc019eb336076e618e62912a59cd0762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 22:31:49 +0700
Subject: [PATCH 036/386] abGate: clean up template

- qt5-devel isn't required in hostmakedepends
- Don't rename distfiles
---
 srcpkgs/abGate/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index f772f49e796a..d4fff83840b1 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -11,10 +11,6 @@ short_desc="LV2 Noise Gate plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://abgate.sourceforge.net/"
-distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz"
+distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz"
 checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
 CXXFLAGS="-fPIC"

From 9d876314ce73d071be020e75b85b9e3b685122fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 22:48:56 +0700
Subject: [PATCH 037/386] smplayer: fix dbg package

---
 srcpkgs/smplayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index a92e285d3c92..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
 version=21.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"

From 566c0dd7bbd1fdb6bba9f48316cdd94dc683cf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Apr 2021 23:01:55 +0700
Subject: [PATCH 038/386] qjackctl: update checksum

---
 srcpkgs/qjackctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 688de6749167..8bcba9039fd7 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ca443646daae21c13a6bec11160fe15639ea19c919d4a5607b1d1918dddd60bc
+checksum=867c088ed819f61d2eb1e550d4bb8f6330d8f247ab99843a584d81825f1a5d24
 
 build_options="jack_session"
 build_options_default="jack_session"

From e03992e17bf84adc4d8a72168f57c889bbe75f1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 22:40:01 +0300
Subject: [PATCH 039/386] growlight: update to 1.2.32.

---
 srcpkgs/growlight/patches/doctest-2.4.6.patch | 74 -------------------
 srcpkgs/growlight/template                    |  4 +-
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/growlight/patches/doctest-2.4.6.patch

diff --git a/srcpkgs/growlight/patches/doctest-2.4.6.patch b/srcpkgs/growlight/patches/doctest-2.4.6.patch
deleted file mode 100644
index c307ea9d5ef4..000000000000
--- a/srcpkgs/growlight/patches/doctest-2.4.6.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: growlight-1.2.31/tests/gpt.cpp
-===================================================================
---- growlight-1.2.31.orig/tests/gpt.cpp
-+++ growlight-1.2.31/tests/gpt.cpp
-@@ -6,6 +6,9 @@
- 
- #define UUID "\x5E\x86\x90\xEF\xD0\x30\x03\x46\x99\x3D\x54\x6E\xB0\xE7\x1B\x0D"
- 
-+template <typename T>
-+T xnormalise(T value) { return value; }
-+
- TEST_CASE("GPT") {
- 
-   // First eight bytes must be "EFI PART"
-@@ -19,14 +22,14 @@ TEST_CASE("GPT") {
-   SUBCASE("Revision") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(0x00010000 == head.revision);
-+    CHECK(0x00010000 == xnormalise(head.revision));
-   }
- 
-   // Bytes 0xc--0xf must be >= 92, should be the logical block size
-   SUBCASE("HeaderSize") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(92 == head.headsize);
-+    CHECK(92 == xnormalise(head.headsize));
-   }
- 
-   // Bytes 0x18--0x1f are the sector of the GPT primary, usually 1
-@@ -34,8 +37,8 @@ TEST_CASE("GPT") {
-   SUBCASE("GPTLBAs") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 100000, 34, nullptr));
--    CHECK(1 == head.lba);
--    CHECK(100000 == head.backuplba);
-+    CHECK(1 == xnormalise(head.lba));
-+    CHECK(100000 == xnormalise(head.backuplba));
-   }
- 
-   // Verify the 16-byte UUID is as specified
-@@ -61,17 +64,17 @@ TEST_CASE("GPT") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, UUID));
-     // partition entry size must be a positive multiple of 128 (usually 128)
--    CHECK(0 < head.partsize);
-+    CHECK(0 < xnormalise(head.partsize));
-     CHECK(0 == (head.partsize % 128));
-     // number of partition entries, usually 128 (MINIMUM_GPT_ENTRIES)
--    CHECK(128 <= head.partcount);
-+    CHECK(128 <= xnormalise(head.partcount));
-     auto entries = new gpt_entry[head.partcount];
-     memset(entries, 0, sizeof(*entries) * head.partcount);
-     CHECK(0 == update_crc(&head, entries));
-     // FIXME fix on big-endian!
--    WARN(2006165414 == head.crc);
--    CHECK(0 == head.reserved);
--    CHECK(2874462854 == head.partcrc);
-+    WARN(2006165414 == xnormalise(head.crc));
-+    CHECK(0 == xnormalise(head.reserved));
-+    CHECK(2874462854 == xnormalise(head.partcrc));
-     delete[] entries;
-   }
- 
-@@ -85,7 +88,7 @@ TEST_CASE("GPT") {
-     memset(sector, 0xff, sizeof(sector));
-     gpt_header* head = reinterpret_cast<gpt_header*>(sector);
-     CHECK(0 == initialize_gpt(head, sizeof(sector), 4194287, 34, nullptr));
--    CHECK(92 == head->headsize);
-+    CHECK(92 == xnormalise(head->headsize));
-     for(size_t idx = 92 ; idx < sizeof(sector) ; ++idx){
-       CHECK(0 == sector[idx]);
-     }
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index f47402c51221..4456db1f8185 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.31
+version=1.2.32
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=25cf643d99be88d299756ccb2933868641abecbc26793f5d87cfae93a461e2d6
+checksum=f15357602d04e10a34d5d3f0d83a66a328638ce40c7b20ffaeac68459318edf2
 patch_args=-Np1
 
 build_options="man zfs"

From 65e9a1cb1047a5f5ffaadd8c336593abcee721f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 11:58:59 -0300
Subject: [PATCH 040/386] python3-oletools: don't use pip/wheel in
 checkdepends.

python3-pip was necessary because the 'python3 setup.py test' command
was trying to install the oletools package itself:

    error: Command '['/usr/bin/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpjxhh802n', '--quiet', 'oletools>=0.54']' returned non-zero exit status 1.

Switching to pytest as the test runner fixes this.
---
 srcpkgs/python3-oletools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 73293a1f82d6..a8eede0d38cb 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
-checkdepends="python3-pip python3-wheel $depends"
+checkdepends="$depends python3-pytest"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From a5496ebf832c7d4e91533e93a7ad078f487071dc Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Tue, 6 Apr 2021 17:25:47 +0200
Subject: [PATCH 041/386] pipewire: update to 0.3.25

* fix README.voidlinux going in pipewire-doc
* disable SDL2 dep, only used in some examples we don't even ship
* rm INSTALL.msg, configs should be stable now (also mark them in xbps)
* ncursesw.patch is now upstream
---
 srcpkgs/pipewire/INSTALL.msg                  |  3 --
 srcpkgs/pipewire/files/README.voidlinux       |  2 +
 ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 +++++++++++++++++++
 srcpkgs/pipewire/patches/ncursesw.patch       | 11 ----
 srcpkgs/pipewire/template                     | 18 ++++---
 5 files changed, 64 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
 delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
deleted file mode 100644
index 8475a2465b7b..000000000000
--- a/srcpkgs/pipewire/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING: pipewire frequently changes the config file format. If
-you edited /etc/pipewire/pipewire.conf you must recreate it from
-/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 7bcb761273b0..0c3d167f0aef 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -5,3 +5,5 @@ Optional dependencies:
 * `libjack-pipewire` for jack replacement
 * `libspa-bluetooth` for bluetooth support
 * `libspa-jack` for running pipewire and jack side-by-side
+* `libspa-v4l2` for video camera support
+* `rtkit` for realtime priority acquisition
diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
new file mode 100644
index 000000000000..a033bb5fee7f
--- /dev/null
+++ b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
@@ -0,0 +1,52 @@
+From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 9 Apr 2021 11:55:55 +0200
+Subject: [PATCH] media-session: log info when loading monitor fails
+
+Log info in all monitor plugins instead of an error.
+---
+ src/examples/media-session/alsa-monitor.c  | 1 +
+ src/examples/media-session/bluez-monitor.c | 2 +-
+ src/examples/media-session/v4l2-monitor.c  | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
+index d97a45a66..72696b772 100644
+--- src/examples/media-session/alsa-monitor.c
++++ src/examples/media-session/alsa-monitor.c
+@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c
+index 9481d4472..5a4f30d48 100644
+--- src/examples/media-session/bluez-monitor.c
++++ src/examples/media-session/bluez-monitor.c
+@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
+-		pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
++		pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
+ 		goto out_free;
+ 	}
+ 	if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
+diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c
+index ecb75d085..2b2a92ef3 100644
+--- src/examples/media-session/v4l2-monitor.c
++++ src/examples/media-session/v4l2-monitor.c
+@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
deleted file mode 100644
index 09b8f071c41c..000000000000
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
-+++ meson.build	2021-02-18 14:39:53.808039159 +0100
-@@ -311,7 +311,7 @@
- pthread_lib = dependency('threads')
- dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
--ncurses_dep = dependency('ncurses', required : false)
-+ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
- 
- if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9ab2c72fb8f7..3536c294cb35 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,15 +1,15 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.24
-revision=2
+version=0.3.25
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel"
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+ libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
+ libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -17,8 +17,10 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f
-conf_files="/etc/pipewire/pipewire.conf"
+checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
+
+build_options="sdl2"
 
 replaces="libpulseaudio-pipewire>=0"
 
@@ -154,6 +156,6 @@ libjack-pipewire_package() {
 pipewire-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share/doc
+		vmove usr/share/doc/pipewire/html
 	}
 }

From 43c3724dee79b2153eab779a3ade631a825f7750 Mon Sep 17 00:00:00 2001
From: "Jiang Meng Liao (Faerryn)" <alexandre.liao@gmail.com>
Date: Thu, 8 Apr 2021 23:29:27 -0400
Subject: [PATCH 042/386] MultiMC: added qt5-svg as dependency for proper
 rendering of icons

---
 srcpkgs/MultiMC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 162472b00022..6f19fc623d0a 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
 version=0.6.12
-revision=1
+revision=2
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
@@ -10,7 +10,7 @@ build_style=cmake
 configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
 hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
-depends="virtual?java-environment"
+depends="virtual?java-environment qt5-svg"
 short_desc="Instanced Minecraft client"
 maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"

From e7178a611d1917ad5d2ceb70d3cd0d786df674ac Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 9 Apr 2021 11:40:53 +0300
Subject: [PATCH 043/386] speedtest-cli: update to 2.1.3

---
 srcpkgs/speedtest-cli/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index f797d3666805..a188bbcffc1a 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,14 +1,17 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
-version=2.1.2
-revision=3
+version=2.1.3
+revision=1
 build_style=python3-module
-pycompile_module="speedtest.py"
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Command line bandwidth test using speedtest.net"
 maintainer="Aaron Marcher <info@nulltime.net>"
 license="Apache-2.0"
 homepage="https://github.com/sivel/speedtest-cli"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a877142eec0ee8dda86519c36fe789480ed6fa603b016b620affd77fbf79b0d9
+checksum=45e3ca21c3ce3c339646100de18db8a26a27d240c29f1c9e07b6c13995a969be
+
+post_install() {
+	vman speedtest-cli.1
+}

From c8e44a7abd9dded0bd0d5aa12bb0f69604d02ddb Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Fri, 9 Apr 2021 15:10:22 +0200
Subject: [PATCH 044/386] miniserve: update to 0.13.0.

---
 srcpkgs/miniserve/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index e9c93967478a..9a04ae8d2b29 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,14 +1,15 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.10.4
+version=0.13.0
 revision=1
 build_style=cargo
+checkdepends="curl"
 short_desc="CLI tool to serve files and dirs over HTTP"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=03b8549258deb17759d69ad73047429f8420e3eab7588af086caf14e47c96332
+checksum=3578fd2dfe8dbebecd15b1e82cfb6d6656fed5e54ae4fccc4e7a6879b61dd1e1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 920ae765d42e36a763a7cd59cea4245da80b6b8c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 23:27:37 +0300
Subject: [PATCH 045/386] dnsmasq: update to 2.85.

Closes: #30097 [via git-merge-pr]
---
 srcpkgs/dnsmasq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index b680b2ad7fae..afa763bd1ab6 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.84
+version=2.85
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
 distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36
+checksum=f36b93ecac9397c15f461de9b1689ee5a2ed6b5135db0085916233053ff3f886
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 

From 5fcb1b4256036ca7b583ba9cd1a48cd4395d1f66 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 046/386] gnome-desktop: update to 40.0

---
 srcpkgs/gnome-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 3d0b295d4094b9379342222cde0e6e43b86ae7fc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 047/386] gsettings-desktop-schemas: update to 40.0

---
 srcpkgs/gsettings-desktop-schemas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 76c4b0e08108..9aa049052172 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 666f26103954068c8dc89ee822ac74f8235c3fec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 048/386] gtk4: update to 4.2.0

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 33c3772d4d673d328840d0fd963b21a2c62ddb63 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 049/386] gnome-shell: update to 40.0

---
 srcpkgs/gnome-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 19425ea5158c2074a1bd4178ef398efdc92e00fc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 050/386] gnome-settings-daemon: update to 40.0

---
 srcpkgs/gnome-settings-daemon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ecc62cf27782..824529fa11db 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From 005a2dde13e0035475b0be9e4474c39422caec34 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 051/386] gnome-session: update to 40.beta

---
 srcpkgs/gnome-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 4f5c77ef900d8020a2af1b1ee573bce96bc78b70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 052/386] gdm: update to 40.0

---
 srcpkgs/gdm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
-checksum=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From d563a057cfc2910c16ce01aa8996b31da4d6d595 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 053/386] libgweather: update to 40.0

---
 srcpkgs/libgweather/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From 87c51fdafaf0de8ebb704f816016d638794f528b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 054/386] gnome-control-center: update to 40.0

---
 srcpkgs/gnome-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 2d27b7841415a63893fdca78e7b66f0513ed96c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 055/386] mutter: update to 40.0

---
 common/shlibs           | 13 ++++---------
 srcpkgs/mutter/template | 16 ++++++++--------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 45470e61661d..3de3beefd5cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2918,15 +2918,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 70df3b8cf4be..99bcd13e784f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,9 +19,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 4725181f5bc2c652643766e2c43e8bff386f1e0c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 056/386] adwaita-icon-theme: update to 40.rc.

---
 srcpkgs/adwaita-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 8ddcde9b7873..2ce6e203025c 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=3.38.0
+version=40.rc
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From f37a9f9984b3166fedcdcfd84ed7e2ddedf8d663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 057/386] at-spi2-core: update to 2.40.0.

---
 srcpkgs/at-spi2-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 74e607012012..e1c601f5d816 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.38.0
+version=2.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 6d56c8047b70677c40c46b919ee9c523399fcaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 058/386] dconf: update to 0.40.0, fix tests.

---
 srcpkgs/dconf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,17 +1,18 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From ebd753d8030fad24440a0d4a8a76c2e9afbb7e3a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 059/386] gcr: update to 3.40.0.

---
 srcpkgs/gcr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From d5316f952ff948b263511fe485675269a94292bd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 060/386] gobject-introspection: update to 1.68.0

also fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,13 +13,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 97a3074c5ad5b229bdf7cfee5e2bdac2adb692f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 061/386] gjs: update to 1.68.0.

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   5 +-
 5 files changed, 388 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,8 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 72a52f455bde45243be1b0494c608db3d4a04e67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 062/386] glib: update to 2.68.0.

* disable broken tests on musl

* add backport fix.
---
 common/shlibs                                 |  10 +-
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  28 +++-
 srcpkgs/glib/template                         |   6 +-
 srcpkgs/glib/update                           |   1 +
 5 files changed, 160 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 3de3beefd5cb..3e262983eb1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +28,24 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +53,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +61,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From c7f79eb3be3ca4e64a418fcbe9bbc08824ac0ba3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 063/386] glib-networking: update to 2.68.0.

---
 srcpkgs/glib-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 96f312cff4d8..fdb7fbfe8d1a 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.66.0
+version=2.68.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From e93efabe9b8428073c79989b8bfa0128ef046de8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 064/386] gnome-backgrounds: update to 40.rc.

---
 srcpkgs/gnome-backgrounds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From 6a1e02ca921107c990230f42970e44f335d0ffc0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 065/386] gnome-initial-setup: update to 40.0.

---
 srcpkgs/gnome-initial-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From 8a425cca1013cd3c58133f04ce00897f05ba12aa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 066/386] evolution-data-server: update to 3.40.0.

---
 common/shlibs                          | 4 ++--
 srcpkgs/evolution-data-server/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e262983eb1a..66f4c7c67dab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -601,9 +601,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 593280ae759d966965ec1bebda09fd6a987a731a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 067/386] evolution: update to 3.40.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 66f4c7c67dab..f6410b689142 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -612,6 +612,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 7a4be07b34fb60752176e3a88258fadd79556786 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 068/386] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From aa729c90d1e0c9d3ca990bb8f9a1bce754168701 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 069/386] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 316d660fb4a03818359878de7b5f8c888a55579c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 070/386] evolution-ews: update to 3.40.0.

---
 srcpkgs/evolution-ews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 0dbf88881d9aef053329a48e300d9499343975a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 071/386] bijiben: update to 40.0.

---
 srcpkgs/bijiben/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From f7e38b8e374bc8103dd24cac076c8c700d1d3a63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 072/386] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From f459da4be85b1a771d4c13965cf5a7fd1c6c9766 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 073/386] folks: update to 0.14.0.

---
 srcpkgs/folks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From ad5f932032528f4af986bee847152755627648e7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 074/386] gnome-calendar: update to 40.0.

---
 srcpkgs/gnome-calendar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
  libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From d6e7295ef9de7df055a4e14fc6a48b1ebed643ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 075/386] gnome-contacts: update to 40.0.

---
 srcpkgs/gnome-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 61b8fa9421db0ca8008a5f6cbf764de67ae171d2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 076/386] gnome-todo: update to 3.28.1.

---
 srcpkgs/gnome-todo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 799e2f8d46f4f9240bb7295454961eb1cd1e4d8a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 077/386] gnome-panel: update to 3.40.0.

---
 srcpkgs/gnome-panel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From dae65fe129f0fc58a62b6a43a822511662e49dd9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 078/386] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From b4cb4e0fb2fd9bf97139af4031e2d7fc4105f43f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 079/386] gnome-user-docs: update to 40.0.

---
 srcpkgs/gnome-user-docs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index a4ab3218bd75..8edb370dc144 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From af0d62717087376c434bea51d87eebf15304c30a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 080/386] libgdata: update to 0.18.1.

---
 srcpkgs/libgdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From ad3be19ffedcd0e6d13cfe9c02740a87f59e4035 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 081/386] gvfs: update to 1.48.0.

---
 srcpkgs/gvfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 7269c5b867ec6221b85be998ce1e630ecd68a90b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 082/386] nautilus: update to 40.0.

---
 srcpkgs/nautilus/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
-distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From ee8861baa46c4a60977ac799ad700f5b5d616676 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 083/386] yelp-xsl: update to 40.0.

---
 srcpkgs/yelp-xsl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 88899d2ed720..3feefeb7a097 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 46fbefaf5b304ca3daff388c3ef88847bd0ffe4b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 084/386] yelp-tools: update to 40.0.

---
 srcpkgs/yelp-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 601f15c1ac039a94526ac03ec78cc17520dfbfea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 085/386] yelp: update to 40.0.

---
 srcpkgs/yelp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From 11cb9e2b9e70e49975400759e73f93e34667f36e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 086/386] gnome-shell-extensions: update to 40.0.

---
 srcpkgs/gnome-shell-extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 4ea740326654..ba043950982e 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 1ef98333c21c67b2a84f95d680c7964b13e73ad4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 087/386] eog: update to 40.0.

---
 srcpkgs/eog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From bf76a1aa961096ed6bd82ff749fe2d523ee24574 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 088/386] eog-plugins: update to 3.26.7.

---
 srcpkgs/eog-plugins/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
-python_version=2 #unverified
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
+python_version=3
 lib32disabled=yes

From 5d88d8ea3eafcfb86da8d8544062cb9c3dd16c68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 089/386] evince: update to 40.1.

---
 srcpkgs/evince/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 311f7b0405b96dc3bd989d3e07ddf71d8ccbf90c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 090/386] tepl: update to 6.00.0.

---
 common/shlibs         | 2 +-
 srcpkgs/tepl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f6410b689142..874bd3ba6053 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3447,7 +3447,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From 0c41499d35dc36dd83bce96ad6fc878be4fd9962 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 091/386] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

From 8012c4b05a2f97f115a0bf7bd1395291d5f2e580 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 092/386] gedit: update to 40.0.

---
 common/shlibs          | 2 +-
 srcpkgs/gedit/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 874bd3ba6053..db975d7164c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3566,7 +3566,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..8ec2ec020a9b 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,8 +17,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 9801d2dec438bcb039e031fe3d7a9bba3a6f03a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 093/386] gedit-plugins: update to 40.0.

---
 srcpkgs/gedit-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From 7e3a1d524e35fcf0e15942b8039a966785d7ef9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 094/386] gnome-disk-utility: update to 40.0.

---
 srcpkgs/gnome-disk-utility/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 7d5edf04c8ec107935f8eb61232581a0f931b501 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 095/386] baobab: update to 40.0.

---
 srcpkgs/baobab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 55d9421ade7e27f6defbf4e9040690c42aafa6f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 096/386] gnome-calculator: update to 40.0.

---
 srcpkgs/gnome-calculator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
 makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel"
+ libmpc-devel libsoup-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 7ce78531bdf2634343292da4fa99335d5dd08f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 097/386] gnome-characters: update to 40.0.

---
 srcpkgs/gnome-characters/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 5c26f6a0078cc7c02b177d0df0f8b53bf0d7e332 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 098/386] gnome-clocks: update to 40.0.

---
 srcpkgs/gnome-clocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From d014dc81cf6505d03ddc43c23465acea2015e14c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 099/386] gnome-font-viewer: update to 40.0.

---
 srcpkgs/gnome-font-viewer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From 3320ae58572e86ff7c863e347a9d08ab07904965 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 100/386] gnome-maps: update to 40.0.

---
 srcpkgs/gnome-maps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From c524423640b76efbb421ad9b6c5bb5db4900b395 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 101/386] gnome-music: update to 40.0.

---
 srcpkgs/gnome-music/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From 38083ce107a82b08a21f79a2ed187e94f4776137 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 102/386] gnome-screenshot: update to 40.0.

---
 srcpkgs/gnome-screenshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 0ee28f2cb777522722c2921ce6cd45515c8e5a25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 103/386] gnome-system-monitor: update to 40.0.

---
 srcpkgs/gnome-system-monitor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 8e4b7f8eb6cf9083b039fc433bd60589f529c8a5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 104/386] vte3: update to 0.63.91.

---
 srcpkgs/vte3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 5be591b9f300c80945c8d499f680aa46578ecd39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 105/386] gnome-terminal: update to 3.40.0.

---
 srcpkgs/gnome-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 303ad85bdb18..4430ac709829 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From c95d0a6c2609ddcaf001a22e7a0c29850bbff6b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 106/386] gnome-tweaks: update to 40.0.

---
 srcpkgs/gnome-tweaks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 119fc963fbc43ae7fcf122562a762e87c7d8b829 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 107/386] gnome-weather: update to 40.0.

---
 srcpkgs/gnome-weather/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
 depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 12bcb837931b0f26541423b4170bfd048d453707 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 108/386] gspell: update to 1.8.4.

---
 srcpkgs/gspell/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -9,17 +9,22 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6402892b3a234a65f9e7304bb586521375a034f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 109/386] orca: update to 40.0.

---
 srcpkgs/orca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From bd3989fc18ff5eb134a49fbebafb5b4b9a04c360 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 110/386] simple-scan: update to 40.0.

---
 srcpkgs/simple-scan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From ad48f2ebc1bc5dcf6e8d3f5a4d749ec831aad4b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 111/386] gnome-builder: update to 3.40.0.

---
 srcpkgs/gnome-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
 changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From c615f5094f502ee3724d41a0fcad897c2f5f8588 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 112/386] libvirt-glib: update to 4.0.0.

* make gtk doc a build_option to fix cross. Default is off.
---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 +++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 22 +++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,23 +1,23 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
-hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
- python-devel $(vopt_if vala vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From b45bbd190f433c06f5104b9a8e5f132a1570fb44 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 113/386] gnome-sound-recorder: update to 40.0.

---
 srcpkgs/gnome-sound-recorder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From b426e4c91c4414a97c6695f8f9e704d27cd26635 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 114/386] gnome-dictionary: update to 40.0.

---
 srcpkgs/gnome-dictionary/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From 0753bccee603c94c1b771311040e5e89fd633fb7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 115/386] gnome-boxes: update to 40.0.

---
 srcpkgs/gnome-boxes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..86f01ea8432f 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -8,13 +8,13 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
- tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From b375e61883ee0262f0f6b72e81438bb8a0ea5541 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 116/386] epiphany: update to 40.0.

---
 srcpkgs/epiphany/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From e8f5cc3207b471ab8847251d707773f8bc9c1827 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 117/386] gnome-books: update to 40.0.

---
 srcpkgs/gnome-books/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
  gettext appstream-glib desktop-file-utils"
-makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel tracker-devel
- gnome-desktop-devel evince-devel libgepub-devel"
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
+ gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
+checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130

From 40cee3622c4108c70eff7b096f904edf3fc53804 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 118/386] gnome-bluetooth: update to 3.34.5.

* fix tests
---
 srcpkgs/gnome-bluetooth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.3
+version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -10,12 +10,13 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
 
 build_options="gir"
 build_options_default="gir"

From 539be8bb43e4759eb8adbbaccdff987f239c58f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 119/386] gnome-usage: update to 3.38.1.

---
 srcpkgs/gnome-usage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index 5ece1950473b..d57dd57a1c82 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-usage'
 pkgname=gnome-usage
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala gettext"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Usage"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57
+checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393

From 756e29e9bdbc0760c37cbf4d946d2d13e8b40f42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 120/386] gnote: update to 40.0.

---
 srcpkgs/gnote/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 0ed64fd9239b..e2e25c08375f 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
 # Template file for 'gnote'
 pkgname=gnote
-version=3.38.1
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gnote"
 distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9
+checksum=e224caf8bb433dec9a2258ea2f8739afabde577210e7fb17596614569f7d0b3b
 lib32disabled=yes

From f578ff6b5e9dc3b80217af6a6ff02c473a1499af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 121/386] gtk+3: update to 3.24.28.

---
 srcpkgs/gtk+3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 03f4a90c4992..60c6459b24b5 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.26
+version=3.24.28
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -28,7 +28,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9
+checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

From 7a801e75233302d514caa2807c4e6ac6e052479d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 122/386] gtkmm: update to 3.24.4.

---
 srcpkgs/gtkmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 8efe5d72596d..d3beee8a20aa 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.3
+version=3.24.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config mm-common gdk-pixbuf"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
+checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743
 
 do_check() {
 	xvfb-run ninja -C build test

From 77ccdc5f5388d567c3951662a675d1ef6f626b8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 123/386] gtranslator: update to 40.0.

---
 srcpkgs/gtranslator/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index f9f9d0e3bc13..9f5b702461df 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,15 +1,16 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
  gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel"
+ libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
+ libhandy1-devel"
 short_desc="GNOME translation making program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gtranslator"
 distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635
+checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834

From 9cb2147009303e0379cb0061e472a42b051be1d8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 124/386] jsonrpc-glib: update to 3.38.0.

---
 srcpkgs/jsonrpc-glib/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.32.0
-revision=2
+version=3.38.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-32/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=bc60aa36c8bdc9c701ad490508445633a9f3973ae0bd5bdd0633d5f6ffeea6eb
+checksum=dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82
 
 build_options="gir vala"
 build_options_default="gir vala"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From 97ae6419492f7d6d246bd3ea94d97b234094e79d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 125/386] libdazzle: update to 3.40.0.

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 9b807be94745..334e0f6a5433 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f
+checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5
 
 build_options="gir"
 build_options_default="gir"

From fe259e15f8631ed38e12200d12c93b05517f3b49 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 126/386] libmanette: update to 0.2.6.

---
 srcpkgs/libmanette/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index c05dff01bf1c..cdf3888ac140 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.5
+version=0.2.6
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
+checksum=63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From c7a9bf79e276bcded6c9895c8dcfe856531b1fcb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 127/386] libgudev: update to 236.

---
 srcpkgs/libgudev/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 7f95c3ee2db9..47d1b8fc365d 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,20 +1,21 @@
 # Template file for 'libgudev'
 pkgname=libgudev
-version=233
+version=236
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-umockdev"
-hostmakedepends="pkg-config glib-devel"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvala=$(vopt_if vala enabled disabled)"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://wiki.gnome.org/Projects/libgudev"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03
+checksum=e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524
 
-build_options="gir"
+build_options="gir vala"
 build_options_default="gir"
 
 replaces="eudev-libgudev>=0"
@@ -27,6 +28,9 @@ libgudev-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi

From d65cee7e50b18168c883e2c625e639ae97729697 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 128/386] metacity: update to 3.40.0.

---
 srcpkgs/metacity/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 643ee4396b95..51904e577fbb 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,6 +1,6 @@
 # Template file for 'metacity'
 pkgname=metacity
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/metacity"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81193121b0d85dc93fef5701c00d0caf5313d10d9b19008403a4286cb04e11ac
+checksum=224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5

From 5908fd4b68f35369f9b4adcc6538c0299f5ddc6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 129/386] retro-gtk: update to 1.0.2.

---
 srcpkgs/retro-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 04ad9cf051b0..6fbb483b6e51 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=1.0.0
+version=1.0.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5c7437a768125a6f627d063ed890e9328d4108db52a6d5aa10e52d2f25bb88db
+checksum=7118b0b5f9c1f2f0bc742faf8689eb48b44833efada0f6dbce990ec9783bcbd2
 
 build_options="gir"
 build_options_default="gir"

From cbabb484feb7bed500b6a33e539460ed621630cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 130/386] libpeas: update to 1.30.0.

* fix tests
---
 srcpkgs/libpeas/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.26.0
-revision=2
+version=1.30.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376
+checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From a96672a6c53c3865cfb6880e4c7e4ce10df7cf70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 131/386] libgexiv2: update to 0.12.2.

---
 srcpkgs/libgexiv2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index d1e5e2f53046..41b9138d7f4e 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgexiv2'
 pkgname=libgexiv2
-version=0.12.1
+version=0.12.2
 revision=1
 wrksrc="${pkgname/lib/}-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gexiv2"
 distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz"
-checksum=8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77
+checksum=2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c
 
 build_options="gir vala"
 build_options_default="gir vala"

From 6d1835aea189d70aa4c2dca6a399b61cda7f4022 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 132/386] gnome-getting-started-docs: remove, no longer part of
 gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

From 5f0b3fc078fb7dea6bc8a941109074a0602a8166 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 133/386] removed-packaes: add gnome-getting-started-docs

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From d3d4e080db8609a10741a2c153b9a14d2e90073e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 134/386] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From ef4b2bd0ee5a70e3507a9bc111d36d8c8d69b48b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 135/386] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..fedf6b594530 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=3.40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.5
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From cb7ed6f8ca8dfd8200575f53181bcba590e41497 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 136/386] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 92 +++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,71 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=3.40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-books>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
+ gnote>=40.0
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From a640e6941fb8300a27ea63fe052fd6f77630ff5b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 137/386] planner: update to 2.6.9.

---
 srcpkgs/planner/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
+version=2.6.9
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From ba65101b97cea3cc9567ed82ee13cc5023e2cc4d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 138/386] giggle: doesn't need vte290.

---
 srcpkgs/giggle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cceb8b2676b45b296967b104cf412331a152a5e2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 139/386] common/xbps-src: update-check checks new gnome
 upstream sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 490e2230440a5e385bd75b05c2cf65501ff51ea5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 140/386] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From ac73fbfade3c51a271418cb8f9cbd368a580e1ab Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Fri, 9 Apr 2021 05:02:00 +0200
Subject: [PATCH 141/386] New package: Converseen-0.9.9.0.

---
 srcpkgs/Converseen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/Converseen/template

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
new file mode 100644
index 000000000000..7117f14e87a9
--- /dev/null
+++ b/srcpkgs/Converseen/template
@@ -0,0 +1,14 @@
+# Template file for 'Converseen'
+pkgname=Converseen
+version=0.9.9.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"
+depends="ghostscript openexr hicolor-icon-theme"
+short_desc="Free batch image processor"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Faster3ck/Converseen"
+distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
+checksum=627f2578dd0ec6629118bb781d7a876b41e9319641f711bd18cb9c2221b3ac38

From 7dd45834dcbb9366d41f95efecfcc5c1874d222d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Apr 2021 20:54:13 +0200
Subject: [PATCH 142/386] budgie-desktop: build against mutter-40.0

---
 srcpkgs/budgie-desktop/patches/mutter-8.patch | 12593 ++++++++++++++++
 srcpkgs/budgie-desktop/template               |     2 +-
 2 files changed, 12594 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/budgie-desktop/patches/mutter-8.patch

diff --git a/srcpkgs/budgie-desktop/patches/mutter-8.patch b/srcpkgs/budgie-desktop/patches/mutter-8.patch
new file mode 100644
index 000000000000..8d1754d9067b
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/mutter-8.patch
@@ -0,0 +1,12593 @@
+From 0383b5ef679d6ad4555c69bfa8a087e2f61b8679 Mon Sep 17 00:00:00 2001
+From: David Mohammed <fossfreedom@users.noreply.github.com>
+Date: Wed, 3 Mar 2021 15:55:03 +0000
+Subject: [PATCH] Compile with mutter-8 (GNOME 40 beta) (#2094)
+
+* Compile with mutter-8 (GNOME 40 alpha)
+
+* Fix vapigen warnings for 6,7 & 8 alpha
+
+* Add get_settings to custom vapi
+
+* Bypass shim compilation failure
+Note the FixMe - this needs resolving otherwise keyboard shortcuts
+and changing keyboard shortcuts will not work
+
+* Resolve shim FIXME
+
+* Regenerate vapi with mutter.40-beta
+---
+ src/wm/meson.build                |   24 +-
+ src/wm/shim.vala                  |    4 +
+ vapi/Clutter-7.metadata           |   62 +-
+ vapi/Clutter-8.metadata           |  187 +
+ vapi/Meta-7.metadata              |    8 +
+ vapi/Meta-8.metadata              |   85 +
+ vapi/generate-mutter-vapi.sh      |    2 +-
+ vapi/libmutter-7-custom.vala      |    7 +
+ vapi/libmutter-7.vapi             |   30 +-
+ vapi/libmutter-8-custom.vala      |   14 +
+ vapi/libmutter-8.deps             |    6 +
+ vapi/libmutter-8.vapi             | 1535 ++++++
+ vapi/mutter-clutter-7-custom.vala |   42 +
+ vapi/mutter-clutter-7.deps        |    1 +
+ vapi/mutter-clutter-7.vapi        |  322 +-
+ vapi/mutter-clutter-8-custom.vala |   42 +
+ vapi/mutter-clutter-8.deps        |    5 +
+ vapi/mutter-clutter-8.vapi        | 8279 +++++++++++++++++++++++++++++
+ vapi/mutter-cogl-7.vapi           |    6 +
+ vapi/mutter-cogl-8-custom.vala    |  119 +
+ vapi/mutter-cogl-8.deps           |    1 +
+ vapi/mutter-cogl-8.vapi           | 1091 ++++
+ 22 files changed, 11691 insertions(+), 181 deletions(-)
+ create mode 100644 vapi/Clutter-8.metadata
+ create mode 100644 vapi/Meta-8.metadata
+ create mode 100644 vapi/libmutter-8-custom.vala
+ create mode 100644 vapi/libmutter-8.deps
+ create mode 100644 vapi/libmutter-8.vapi
+ create mode 100644 vapi/mutter-clutter-7-custom.vala
+ create mode 100644 vapi/mutter-clutter-8-custom.vala
+ create mode 100644 vapi/mutter-clutter-8.deps
+ create mode 100644 vapi/mutter-clutter-8.vapi
+ create mode 100644 vapi/mutter-cogl-8-custom.vala
+ create mode 100644 vapi/mutter-cogl-8.deps
+ create mode 100644 vapi/mutter-cogl-8.vapi
+
+diff --git src/wm/meson.build src/wm/meson.build
+index 583ce790..17e6bc07 100644
+--- src/wm/meson.build
++++ src/wm/meson.build
+@@ -18,17 +18,25 @@ budgie_wm_sources = [
+ budgie_wm_status_vala_args = []
+ 
+ dep_graphene = dependency('graphene-gobject-1.0', version: '>= 1.10')
+-dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
++dep_mutter = dependency('libmutter-8', version: gnome_minimum_version, required: false)
+ if dep_mutter.found()
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
+-    message('Using new libmutter-7 ABI from GNOME 3.38')
+-    vapi_mutter = 'libmutter-7'
++    # Assume mutter-7 compilation argument since no additional code changes required
++    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_8']
++    message('Using new libmutter-8 ABI from GNOME 40')
++    vapi_mutter = 'libmutter-8'
+ else
+-    dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++    dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
+     if dep_mutter.found()
+-        message('Using new libmutter-6 ABI from GNOME 3.36')
+-        vapi_mutter = 'libmutter-6'
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
++        message('Using new libmutter-7 ABI from GNOME 3.38')
++        vapi_mutter = 'libmutter-7'
++    else
++        dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++        if dep_mutter.found()
++            message('Using new libmutter-6 ABI from GNOME 3.36')
++            vapi_mutter = 'libmutter-6'
++        endif
+     endif
+ endif
+ 
+diff --git src/wm/shim.vala src/wm/shim.vala
+index 4ba17a8e..5a985aa1 100644
+--- src/wm/shim.vala
++++ src/wm/shim.vala
+@@ -177,7 +177,11 @@ namespace Budgie {
+ 			foreach (string accelerator in grabs.get_keys()) {
+ 				if (grabs[accelerator] == action) {
+ 					var params = new HashTable<string,Variant>(null, null);
++#if HAVE_MUTTER_8
++					params.set("device-name", new Variant.string(dev.get_device_name()));
++#else
+ 					params.set("device-id", new Variant.uint32(dev.id));
++#endif
+ 					params.set("action-mode", new Variant.uint32(action));
+ 					params.set("device-mode", new Variant.string(dev.get_device_node()));
+ 					params.set("timestamp", new Variant.uint32(timestamp));
+diff --git vapi/Clutter-7.metadata vapi/Clutter-7.metadata
+index 1855274d..f7b1d68b 100644
+--- vapi/Clutter-7.metadata
++++ vapi/Clutter-7.metadata
+@@ -2,6 +2,8 @@
+ ActorBox struct
+ Color struct
+ Knot struct
++Margin struct
++PaintVolume struct
+ PathNode struct
+ Perspective struct
+ Units struct
+@@ -35,11 +37,13 @@ value_get_color nullable
+ // method/virtual-method/signal don't match
+ Actor
+ 	.event#method name="emit_event"
+-	.get_paint_volume#method skip
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
+ 	.queue_redraw#signal skip
+ 	.queue_redraw#virtual_method skip
+ Container
+ 	.add_actor skip=false
++	.class_* skip
+ Text
+ 	.activate#method name="try_activate"
+ 	.insert_text#signal skip
+@@ -58,6 +62,12 @@ Container
+ Stage.read_pixels
+ 	.width default=-1
+ 	.height default=-1
++Stage.get_capture_final_size
++	.width out
++	.height out
++	.scale out
++Stage.paint_to_buffer
++    .data type="uint8[]"
+ Text
+ 	.position_to_coords.line_height default=null
+ 
+@@ -70,11 +80,8 @@ LayoutManager
+ 	.create_child_meta skip=false
+ 
+ // Variadic arguments
+-Box
+-	.pack skip=false
+-	.pack_after skip=false
+-	.pack_at skip=false
+-	.pack_before skip=false
++Backend
++	.get_cogl_context skip=false
+ Container
+ 	.child_get skip=false
+ 	.child_set skip=false
+@@ -91,10 +98,6 @@ LayoutManager
+ Script
+ 	.get_objects skip=false
+ 
+-// Changing error domains
+-Texture
+-	.new_from_file throws="Clutter.TextureError"
+-
+ // Skipped upstream for unknown reasons
+ Interval.register_progress_func skip=false
+ get_option_group skip=false
+@@ -111,45 +114,46 @@ ActorBox
+ Units.from_* skip
+ Color
+ 	.new skip
++Margin
++	.new skip
+ 
+ // Class methods
+ container_class_find_child_property skip
+ container_class_list_child_properties skip
+ 
+ // Move symbols
++color_from_* skip
+ units_from_* skip
+ 
+-// Classes marked as out but not double ptr
+-Actor
+-	.get_margin.margin out=false
+-DragAction
+-	.get_drag_area.drag_area out=false
+-InputDevice
+-	.get_coords.point out=false
+-Rect
+-	.get_center.center out=false
+-	.intersection.res out=false
+-	.union.res out=false
+-Timeline
+-	.get_cubic_bezier_progress.c_* out=false
+-ZoomAction
+-	.get_focal_point.point out=false
+-	.get_transformed_focal_point.point out=false
+-
+ // Struct return values
+ color_get_static nullable
+ 
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
+ // Remove for clutter-2.0
+ /////////////////////////
+ 
++StageView.layout skip
++
+ Stage
+  	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
+ 
+ // *Event should be compact classes derived from Clutter.Event
+ Event.type skip=false
+ AnyEvent struct=false base_type="Clutter.Event"
+ ButtonEvent struct=false base_type="Clutter.Event"
+ CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
+ KeyEvent struct=false base_type="Clutter.Event"
+ MotionEvent struct=false base_type="Clutter.Event"
+ ScrollEvent struct=false base_type="Clutter.Event"
+@@ -157,6 +161,10 @@ StageStateEvent struct=false base_type="Clutter.Event"
+ TouchEvent struct=false base_type="Clutter.Event"
+ TouchpadPinchEvent struct=false base_type="Clutter.Event"
+ TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
+ 
+ // Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
+ *#constant skip
+diff --git vapi/Clutter-8.metadata vapi/Clutter-8.metadata
+new file mode 100644
+index 00000000..fa1210f1
+--- /dev/null
++++ vapi/Clutter-8.metadata
+@@ -0,0 +1,187 @@
++// Non mini-object
++ActorBox struct
++Color struct
++Knot struct
++Margin struct
++PaintVolume struct
++PathNode struct
++Perspective struct
++Units struct
++
++*.ref unowned
++
++init.argv unowned
++init_with_args
++	.argv unowned
++Actor
++	.apply_transform.matrix ref
++	.get_abs_allocation_vertices.verts out=false
++Canvas
++	.new symbol_type="constructor"
++Event.type#method name="get_type"
++Image
++	.new symbol_type="constructor"
++
++// ???
++Actor.has_pointer#method name="get_has_pointer"
++InitError errordomain=false
++
++// Not all backing symbols are deprecated
++Actor.pick deprecated=false
++
++// Nullable return values
++Actor
++	.get_parent nullable
++value_get_color nullable
++
++// method/virtual-method/signal don't match
++Actor
++	.event#method name="emit_event"
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
++Container
++	.add_actor skip=false
++	.class_* skip
++Text
++	.activate#method name="try_activate"
++	.insert_text#signal skip
++TextBuffer.get_text#virtual_method name="get_text_with_length"
++
++// virtual/abstract distinction
++Container
++	.lower virtual
++	.raise virtual
++	.*_child_meta#virtual_method virtual
++
++// Default values
++Container
++	.lower.sibling nullable default=null
++	.raise.sibling nullable default=null
++Stage.read_pixels
++	.width default=-1
++	.height default=-1
++Stage.paint_to_buffer
++    .data type="uint8[]"
++Text
++	.position_to_coords.line_height default=null
++
++// Reparented funcs methods can't be instance methods
++feature_available skip
++feature_get_all skip
++
++// Skipped by g-i for unknown reasons
++LayoutManager
++	.create_child_meta skip=false
++
++// Variadic arguments
++Backend
++	.get_cogl_context skip=false
++Container
++	.child_get skip=false
++	.child_set skip=false
++	.remove skip=false
++Interval
++	.new skip=false
++	.get_interval skip=false
++	.set_final skip=false
++	.set_initial skip=false
++	.set_interval skip=false
++LayoutManager
++	.child_get skip=false
++	.child_set skip=false
++Script
++	.get_objects skip=false
++
++// Skipped upstream for unknown reasons
++Interval.register_progress_func skip=false
++get_option_group skip=false
++get_option_group_without_init skip=false
++threads_add_idle skip=false
++threads_add_idle_full skip=false
++threads_add_timeout skip=false
++threads_add_timeout_full skip=false
++
++// struct/class confusion
++ActorBox
++	.new skip
++	.from_vertices skip
++Units.from_* skip
++Color
++	.new skip
++Margin
++	.new skip
++
++// Class methods
++container_class_find_child_property skip
++container_class_list_child_properties skip
++
++// Move symbols
++color_from_* skip
++units_from_* skip
++
++// Struct return values
++color_get_static nullable
++
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
++// Remove for clutter-2.0
++/////////////////////////
++
++StageView.layout skip
++
++Stage
++ 	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
++
++// *Event should be compact classes derived from Clutter.Event
++Event.type skip=false
++AnyEvent struct=false base_type="Clutter.Event"
++ButtonEvent struct=false base_type="Clutter.Event"
++CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
++KeyEvent struct=false base_type="Clutter.Event"
++MotionEvent struct=false base_type="Clutter.Event"
++ScrollEvent struct=false base_type="Clutter.Event"
++TouchEvent struct=false base_type="Clutter.Event"
++TouchpadPinchEvent struct=false base_type="Clutter.Event"
++TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
++
++// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
++*#constant skip
++COGL skip=false
++CURRENT_TIME skip=false
++FLAVOUR skip=false
++PATH_RELATIVE skip=false
++PRIORITY_REDRAW skip=false
++
++// Clutter devs don't like us creating nested namespaces
++value_* name="value_(.+)" parent="Clutter.Value"
++threads_* name="threads_(.+)" parent="Clutter.Threads"
++threads_add_idle name="add" parent="Clutter.Threads.Idle"
++threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
++threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
++threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
++
++// Backwards compatibility
++Color.alloc symbol_type="function"
++
++BinAlignment deprecated=false deprecated_since=null
++BinAlignment.* deprecated
++BinAlignment.start deprecated=false
++BinLayout.new.*_align default=Clutter.BinAlignment.START
++
++// Possibly keep
++KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
+diff --git vapi/Meta-7.metadata vapi/Meta-7.metadata
+index 72629fba..ababf5d9 100644
+--- vapi/Meta-7.metadata
++++ vapi/Meta-7.metadata
+@@ -9,6 +9,10 @@ Barrier cheader_filename="meta/barrier.h"
+ BarrierEvent cheader_filename="meta/barrier.h"
+ CloseDialog cheader_filename="meta/meta-close-dialog.h"
+ CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.x out
++CursorTracker.get_pointer.y out
++CursorTracker.get_pointer.mods out
+ Display cheader_filename="meta/display.h"
+ Dnd cheader_filename="meta/meta-dnd.h"
+ IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
+@@ -20,6 +24,10 @@ Preference cheader_filename="meta/prefs.h"
+ RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
+ RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
+ Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
+ ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
+ ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
+ SoundPlayer cheader_filename="meta/meta-sound-player.h"
+diff --git vapi/Meta-8.metadata vapi/Meta-8.metadata
+new file mode 100644
+index 00000000..0e00117f
+--- /dev/null
++++ vapi/Meta-8.metadata
+@@ -0,0 +1,85 @@
++Backend cheader_filename="meta/meta-backend.h"
++Background cheader_filename="meta/meta-background.h"
++BackgroundActor cheader_filename="meta/meta-background-actor.h"
++BackgroundContent cheader_filename="meta/meta-background-content.h"
++BackgroundGroup cheader_filename="meta/meta-background-group.h"
++BackgroundImage cheader_filename="meta/meta-background-image.h"
++BackgroundImageCache cheader_filename="meta/meta-background-image.h"
++Barrier cheader_filename="meta/barrier.h"
++BarrierEvent cheader_filename="meta/barrier.h"
++CloseDialog cheader_filename="meta/meta-close-dialog.h"
++CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.mods out
++Display cheader_filename="meta/display.h"
++Dnd cheader_filename="meta/meta-dnd.h"
++IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
++InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
++LaunchContext cheader_filename="meta/meta-launch-context.h"
++Meta cheader_filename="meta/main.h"
++MonitorManager cheader_filename="meta/meta-monitor-manager.h"
++Preference cheader_filename="meta/prefs.h"
++RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
++RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
++Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
++ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
++ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
++SoundPlayer cheader_filename="meta/meta-sound-player.h"
++Stage cheader_filename="meta/meta-stage.h"
++StartupNotification cheader_filename="meta/meta-startup-notification.h"
++Theme cheader_filename="meta/theme.h"
++WaylandClient cheader_filename="meta/meta-wayland-client.h"
++Window cheader_filename="meta/window.h"
++WindowActor cheader_filename="meta/meta-window-actor.h"
++WindowGroup cheader_filename="meta/meta-window-group.h"
++WindowShape cheader_filename="meta/meta-window-shape.h"
++Workspace cheader_filename="meta/workspace.h"
++WorkspaceManager cheader_filename="meta/meta-workspace-manager.h"
++X11Display cheader_filename="meta/meta-x11-display.h"
++Rectangle struct
++Plugin cheader_filename="meta/meta-plugin.h"
++PluginInfo cheader_filename="meta/meta-plugin.h"
++prefs_* cheader_filename="meta/prefs.h" parent="Meta.Prefs"
++add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_push parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop_with_return parent="Meta.Util" cheader_filename="meta/util.h"
++external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h"
++get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h"
++gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h"
++is_syncing parent="Meta.Util" cheader_filename="meta/util.h"
++is_verbose parent="Meta.Util" cheader_filename="meta/util.h"
++is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h"
++later_add parent="Meta.Util" cheader_filename="meta/util.h"
++later_remove parent="Meta.Util" cheader_filename="meta/util.h"
++pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++rect parent="Meta.Util" cheader_filename="meta/util.h"
++remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_equal parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_hash parent="Meta.Util" cheader_filename="meta/util.h"
++show_dialog parent="Meta.Util" cheader_filename="meta/util.h"
++get_stage_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_actors parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_top_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_feedback_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++disable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++enable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++focus_stage_window parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler"
++KeyHandlerFunc.event type="Clutter.KeyEvent?"
++get_backend parent="Meta.Backend"
++Window.focus#signal skip=true
++Window.get_xwindow skip=false
++get_option_context skip=false
++set_gnome_wm_keybindings skip=false
++set_wm_name skip=false
++init skip=false
++run skip=false
++show_dialog skip=false
++get_backend cheader_filename="meta/meta-backend.h"
+diff --git vapi/generate-mutter-vapi.sh vapi/generate-mutter-vapi.sh
+index b233e586..11740435 100755
+--- vapi/generate-mutter-vapi.sh
++++ vapi/generate-mutter-vapi.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -xe
+ 
+-version=${6-7}
++version=${6-8}
+ girdir=$(pkg-config libmutter-$version --variable=girdir)
+ 
+ cd $(dirname $0)
+diff --git vapi/libmutter-7-custom.vala vapi/libmutter-7-custom.vala
+index 1e0b917c..73bc5f1b 100644
+--- vapi/libmutter-7-custom.vala
++++ vapi/libmutter-7-custom.vala
+@@ -5,3 +5,10 @@ public struct before_frame {
+ [CCode (has_type_id = false)]
+ public struct frame {
+ }
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-7.vapi vapi/libmutter-7.vapi
+index 6bfdc4b7..30f8892c 100644
+--- vapi/libmutter-7.vapi
++++ vapi/libmutter-7.vapi
+@@ -149,7 +149,7 @@ namespace Meta {
+ 		public static void x11_error_trap_push (Meta.X11Display x11_display);
+ 	}
+ 	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
+-	public abstract class Backend : GLib.Object, GLib.Initable {
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
+ 		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
+@@ -277,9 +277,8 @@ namespace Meta {
+ 	public class CursorTracker : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected CursorTracker ();
+-		public static unowned Meta.CursorTracker get_for_display (Meta.Display display);
+ 		public void get_hot (out int x, out int y);
+-		public void get_pointer (int x, int y, Clutter.ModifierType mods);
++		public void get_pointer (out int x, out int y, out Clutter.ModifierType mods);
+ 		public bool get_pointer_visible ();
+ 		public unowned Cogl.Texture get_sprite ();
+ 		public void set_pointer_visible (bool visible);
+@@ -304,6 +303,8 @@ namespace Meta {
+ 		public int get_current_monitor ();
+ 		public uint32 get_current_time ();
+ 		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
+ 		public unowned Meta.Window get_focus_window ();
+ 		public Meta.GrabOp get_grab_op ();
+ 		public uint get_keybinding_action (uint keycode, ulong mask);
+@@ -422,10 +423,12 @@ namespace Meta {
+ 		public static int get_display_configuration_timeout ();
+ 		public bool get_is_builtin_display_on ();
+ 		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
+ 		public Meta.MonitorSwitchConfigType get_switch_config ();
+ 		public void switch_config (Meta.MonitorSwitchConfigType config_type);
+ 		[NoAccessorMethod]
+ 		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
+ 		public signal void confirm_display_change ();
+ 		public signal void monitors_changed ();
+ 		public signal void monitors_changed_internal ();
+@@ -504,7 +507,7 @@ namespace Meta {
+ 		public bool is_recording { get; construct; }
+ 		public signal void stopped ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
+ 	public class Selection : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		public Selection (Meta.Display display);
+@@ -514,7 +517,7 @@ namespace Meta {
+ 		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
+ 		public signal void owner_changed (uint object, Meta.SelectionSource p0);
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
+ 	public class SelectionSource : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected SelectionSource ();
+@@ -524,7 +527,7 @@ namespace Meta {
+ 		public virtual signal void activated ();
+ 		public virtual signal void deactivated ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_memory_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
+ 	public class SelectionSourceMemory : Meta.SelectionSource {
+ 		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
+ 		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
+@@ -768,6 +771,7 @@ namespace Meta {
+ 		public uint user_time { get; }
+ 		public Meta.WindowType window_type { get; }
+ 		public string wm_class { get; }
++		public signal void monitor_changed (int old_monitor);
+ 		public signal void position_changed ();
+ 		public signal void raised ();
+ 		public signal void shown ();
+@@ -1012,6 +1016,12 @@ namespace Meta {
+ 		BLANK,
+ 		LAST
+ 	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
+ 	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
+ 	[Flags]
+ 	public enum DebugTopic {
+@@ -1354,7 +1364,7 @@ namespace Meta {
+ 		CHECK_ALIVE_TIMEOUT;
+ 		public unowned string to_string ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
+ 	public enum SelectionType {
+ 		SELECTION_PRIMARY,
+ 		SELECTION_CLIPBOARD,
+@@ -1491,12 +1501,16 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void clutter_init ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void exit (Meta.ExitCode code);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static string g_utf8_strndup (string src, size_t n);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static unowned GLib.OptionContext get_option_context ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static bool get_replace_current_wm ();
+@@ -1511,6 +1525,8 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void restart (string? message);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static int run ();
+diff --git vapi/libmutter-8-custom.vala vapi/libmutter-8-custom.vala
+new file mode 100644
+index 00000000..73bc5f1b
+--- /dev/null
++++ vapi/libmutter-8-custom.vala
+@@ -0,0 +1,14 @@
++[CCode (has_type_id = false)]
++public struct before_frame {
++}
++
++[CCode (has_type_id = false)]
++public struct frame {
++}
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-8.deps vapi/libmutter-8.deps
+new file mode 100644
+index 00000000..d94a615d
+--- /dev/null
++++ vapi/libmutter-8.deps
+@@ -0,0 +1,6 @@
++gtk+-3.0
++json-glib-1.0
++mutter-clutter-8
++x11
++xfixes-4.0
++graphene-gobject-1.0
+diff --git vapi/libmutter-8.vapi vapi/libmutter-8.vapi
+new file mode 100644
+index 00000000..5cdc794f
+--- /dev/null
++++ vapi/libmutter-8.vapi
+@@ -0,0 +1,1535 @@
++/* libmutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Meta", gir_namespace = "Meta", gir_version = "8", lower_case_cprefix = "meta_")]
++namespace Meta {
++	namespace Compositor {
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_disable_unredirect_for_display")]
++		public static void disable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_enable_unredirect_for_display")]
++		public static void enable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
++		public static void focus_stage_window (Meta.Display display, uint32 timestamp);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")]
++		public static unowned Clutter.Actor get_feedback_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
++		public static unowned Clutter.Actor get_stage_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_top_window_group_for_display")]
++		public static unowned Clutter.Actor get_top_window_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_actors")]
++		public static unowned GLib.List<Clutter.Actor> get_window_actors (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_display")]
++		public static unowned Clutter.Actor get_window_group_for_display (Meta.Display display);
++	}
++	namespace Prefs {
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_bell_is_audible")]
++		public static bool prefs_bell_is_audible ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_change_workspace_name")]
++		public static void prefs_change_workspace_name (int i, string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_double_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_double_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_middle_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_middle_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_right_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_right_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_attach_modal_dialogs")]
++		public static bool prefs_get_attach_modal_dialogs ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_maximize")]
++		public static bool prefs_get_auto_maximize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise")]
++		public static bool prefs_get_auto_raise ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise_delay")]
++		public static int prefs_get_auto_raise_delay ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_button_layout")]
++		public static Meta.ButtonLayout prefs_get_button_layout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_center_new_windows")]
++		public static bool prefs_get_center_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_check_alive_timeout")]
++		public static uint prefs_get_check_alive_timeout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_compositing_manager")]
++		public static bool prefs_get_compositing_manager ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_size")]
++		public static int prefs_get_cursor_size ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_theme")]
++		public static unowned string prefs_get_cursor_theme ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_disable_workarounds")]
++		public static bool prefs_get_disable_workarounds ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_drag_threshold")]
++		public static int prefs_get_drag_threshold ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_draggable_border_width")]
++		public static int prefs_get_draggable_border_width ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_dynamic_workspaces")]
++		public static bool prefs_get_dynamic_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_edge_tiling")]
++		public static bool prefs_get_edge_tiling ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_change_on_pointer_rest")]
++		public static bool prefs_get_focus_change_on_pointer_rest ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_mode")]
++		public static GDesktop.FocusMode prefs_get_focus_mode ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_new_windows")]
++		public static GDesktop.FocusNewWindows prefs_get_focus_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_force_fullscreen")]
++		public static bool prefs_get_force_fullscreen ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_accessibility")]
++		public static bool prefs_get_gnome_accessibility ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_animations")]
++		public static bool prefs_get_gnome_animations ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_keybinding_action")]
++		public static Meta.KeyBindingAction prefs_get_keybinding_action (string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_menu")]
++		public static int prefs_get_mouse_button_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_mods")]
++		public static Meta.VirtualModifier prefs_get_mouse_button_mods ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_resize")]
++		public static int prefs_get_mouse_button_resize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_num_workspaces")]
++		public static int prefs_get_num_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_raise_on_click")]
++		public static bool prefs_get_raise_on_click ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_show_fallback_app_menu")]
++		public static bool prefs_get_show_fallback_app_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_titlebar_font")]
++		public static unowned Pango.FontDescription prefs_get_titlebar_font ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell")]
++		public static bool prefs_get_visual_bell ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell_type")]
++		public static GDesktop.VisualBellType prefs_get_visual_bell_type ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspace_name")]
++		public static unowned string prefs_get_workspace_name (int i);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspaces_only_on_primary")]
++		public static bool prefs_get_workspaces_only_on_primary ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_init")]
++		public static void prefs_init ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_force_fullscreen")]
++		public static void prefs_set_force_fullscreen (bool whether);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_num_workspaces")]
++		public static void prefs_set_num_workspaces (int n_workspaces);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_show_fallback_app_menu")]
++		public static void prefs_set_show_fallback_app_menu (bool whether);
++	}
++	namespace Util {
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_add_verbose_topic")]
++		public static void add_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_external_binding_name_for_action")]
++		public static string external_binding_name_for_action (uint keybinding_action);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_get_locale_direction")]
++		public static Meta.LocaleDirection get_locale_direction ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_gravity_to_string")]
++		public static unowned string gravity_to_string (Meta.Gravity gravity);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_syncing")]
++		public static bool is_syncing ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_verbose")]
++		public static bool is_verbose ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_wayland_compositor")]
++		public static bool is_wayland_compositor ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_add")]
++		public static uint later_add (Meta.LaterType when, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_remove")]
++		public static void later_remove (uint later_id);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_pop_no_msg_prefix")]
++		public static void pop_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_push_no_msg_prefix")]
++		public static void push_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_rect")]
++		public static Meta.Rectangle? rect (int x, int y, int width, int height);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_remove_verbose_topic")]
++		public static void remove_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_show_dialog")]
++		public static GLib.Pid show_dialog (string type, string message, string timeout, string display, string ok_text, string cancel_text, string icon_name, int transient_for, GLib.SList<void*> columns, GLib.SList<void*> entries);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_equal")]
++		public static int unsigned_long_equal (void* v1, void* v2);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_hash")]
++		public static uint unsigned_long_hash (void* v);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop")]
++		public static void x11_error_trap_pop (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop_with_return")]
++		public static int x11_error_trap_pop_with_return (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_push")]
++		public static void x11_error_trap_push (Meta.X11Display x11_display);
++	}
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
++		public static unowned Meta.Backend get_backend ();
++		public unowned Meta.Dnd get_dnd ();
++		public unowned Meta.RemoteAccessController get_remote_access_controller ();
++		public unowned Meta.Settings get_settings ();
++		public unowned Clutter.Actor get_stage ();
++		public bool is_rendering_hardware_accelerated ();
++		public void lock_layout_group (uint idx);
++		public void set_keymap (string layouts, string variants, string options);
++		public void set_numlock (bool numlock_state);
++		public signal void keymap_changed ();
++		public signal void keymap_layout_group_changed (uint object);
++		public signal void last_device_changed (Clutter.InputDevice object);
++		public signal void lid_is_closed_changed (bool object);
++	}
++	[CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")]
++	public class Background : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Background (Meta.Display display);
++		public static void refresh_all ();
++		public void set_blend (GLib.File file1, GLib.File file2, double blend_factor, GDesktop.BackgroundStyle style);
++		public void set_color (Clutter.Color color);
++		public void set_file (GLib.File? file, GDesktop.BackgroundStyle style);
++		public void set_gradient (GDesktop.BackgroundShading shading_direction, Clutter.Color color, Clutter.Color second_color);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
++	public class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundActor (Meta.Display display, int monitor);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-content.h", type_id = "meta_background_content_get_type ()")]
++	public class BackgroundContent : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected BackgroundContent ();
++		public static Clutter.Content @new (Meta.Display display, int monitor);
++		public void set_background (Meta.Background background);
++		public void set_gradient (bool enabled, int height, double tone_start);
++		public void set_rounded_clip_bounds (Graphene.Rect? bounds);
++		public void set_rounded_clip_radius (float radius);
++		public void set_vignette (bool enabled, double brightness, double sharpness);
++		[NoAccessorMethod]
++		public Meta.Background background { owned get; set; }
++		[NoAccessorMethod]
++		public double brightness { get; set; }
++		[NoAccessorMethod]
++		public bool gradient { get; set; }
++		[NoAccessorMethod]
++		public int gradient_height { get; set; }
++		[NoAccessorMethod]
++		public double gradient_max_darkness { get; set; }
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++		[NoAccessorMethod]
++		public float rounded_clip_radius { get; set; }
++		[NoAccessorMethod]
++		public bool vignette { get; set; }
++		[NoAccessorMethod]
++		public double vignette_sharpness { get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-group.h", type_id = "meta_background_group_get_type ()")]
++	public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_get_type ()")]
++	public class BackgroundImage : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImage ();
++		public bool get_success ();
++		public unowned Cogl.Texture get_texture ();
++		public bool is_loaded ();
++		public signal void loaded ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_cache_get_type ()")]
++	public class BackgroundImageCache : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImageCache ();
++		public static unowned Meta.BackgroundImageCache get_default ();
++		public Meta.BackgroundImage load (GLib.File file);
++		public void purge (GLib.File file);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", type_id = "meta_barrier_get_type ()")]
++	public class Barrier : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Barrier ();
++		public void destroy ();
++		public bool is_active ();
++		public void release (Meta.BarrierEvent event);
++		[NoAccessorMethod]
++		public Meta.BarrierDirection directions { get; construct; }
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public int x1 { get; construct; }
++		[NoAccessorMethod]
++		public int x2 { get; construct; }
++		[NoAccessorMethod]
++		public int y1 { get; construct; }
++		[NoAccessorMethod]
++		public int y2 { get; construct; }
++		public signal void hit (Meta.BarrierEvent event);
++		public signal void left (Meta.BarrierEvent event);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_barrier_event_get_type ()")]
++	[Compact]
++	public class BarrierEvent {
++		public int dt;
++		public double dx;
++		public double dy;
++		public int event_id;
++		public bool grabbed;
++		public bool released;
++		public uint32 time;
++		public double x;
++		public double y;
++	}
++	[CCode (cheader_filename = "meta/meta-cursor-tracker.h", type_id = "meta_cursor_tracker_get_type ()")]
++	public class CursorTracker : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected CursorTracker ();
++		public void get_hot (out int x, out int y);
++		public void get_pointer (Graphene.Point coords, out Clutter.ModifierType mods);
++		public bool get_pointer_visible ();
++		public unowned Cogl.Texture get_sprite ();
++		public void set_pointer_visible (bool visible);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public signal void cursor_changed ();
++		public signal void position_invalidated ();
++		public signal void visibility_changed ();
++	}
++	[CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")]
++	public class Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Display ();
++		public void add_ignored_crossing_serial (ulong serial);
++		public uint add_keybinding (string name, GLib.Settings settings, Meta.KeyBindingFlags flags, owned Meta.KeyHandlerFunc handler);
++		public bool begin_grab_op (Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
++		public void clear_mouse_mode ();
++		public void close (uint32 timestamp);
++		public void end_grab_op (uint32 timestamp);
++		public void focus_default_window (uint32 timestamp);
++		public void freeze_keyboard (uint32 timestamp);
++		public Clutter.ModifierType get_compositor_modifiers ();
++		public int get_current_monitor ();
++		public uint32 get_current_time ();
++		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
++		public unowned Meta.Window get_focus_window ();
++		public Meta.GrabOp get_grab_op ();
++		public uint get_keybinding_action (uint keycode, ulong mask);
++		public uint32 get_last_user_time ();
++		public Meta.Rectangle get_monitor_geometry (int monitor);
++		public bool get_monitor_in_fullscreen (int monitor);
++		public int get_monitor_index_for_rect (Meta.Rectangle rect);
++		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
++		public float get_monitor_scale (int monitor);
++		public int get_n_monitors ();
++		public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number);
++		public int get_primary_monitor ();
++		public unowned Meta.Selection get_selection ();
++		public void get_size (out int width, out int height);
++		public unowned Meta.SoundPlayer get_sound_player ();
++		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
++		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
++		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
++		public unowned Meta.WorkspaceManager get_workspace_manager ();
++		public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags);
++		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
++		public bool remove_keybinding (string name);
++		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
++		public void set_cursor (Meta.Cursor cursor);
++		public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp);
++		public GLib.SList<weak Meta.Window> sort_windows_by_stacking (GLib.SList<Meta.Window> windows);
++		public bool supports_extended_barriers ();
++		public void unfreeze_keyboard (uint32 timestamp);
++		public bool ungrab_accelerator (uint action_id);
++		public void ungrab_keyboard (uint32 timestamp);
++		public void unset_input_focus (uint32 timestamp);
++		public bool xserver_time_is_before (uint32 time1, uint32 time2);
++		public Clutter.ModifierType compositor_modifiers { get; }
++		public Meta.Window focus_window { get; }
++		public signal void accelerator_activated (uint object, Clutter.InputDevice p0, uint p1);
++		public signal void closing ();
++		public signal void cursor_updated ();
++		public signal void gl_video_memory_purged ();
++		public signal void grab_op_begin (Meta.Window object, Meta.GrabOp p0);
++		public signal void grab_op_end (Meta.Window object, Meta.GrabOp p0);
++		public signal void in_fullscreen_changed ();
++		public signal bool init_xserver (GLib.Task object);
++		public signal bool modifiers_accelerator_activated ();
++		public signal void overlay_key ();
++		public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1);
++		public signal void restacked ();
++		public signal bool restart ();
++		public signal void show_osd (int object, string p0, string p1);
++		public signal unowned Clutter.Actor? show_pad_osd (Clutter.InputDevice pad, GLib.Settings settings, string layout_path, bool edition_mode, int monitor_idx);
++		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
++		public signal bool show_restart_message (string? message);
++		public signal void showing_desktop_changed ();
++		public signal void window_created (Meta.Window object);
++		public signal void window_demands_attention (Meta.Window object);
++		public signal void window_entered_monitor (int object, Meta.Window p0);
++		public signal void window_left_monitor (int object, Meta.Window p0);
++		public signal void window_marked_urgent (Meta.Window object);
++		public signal void workareas_changed ();
++		public signal void x11_display_closing ();
++		public signal void x11_display_opened ();
++		public signal void x11_display_setup ();
++	}
++	[CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")]
++	public class Dnd : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Dnd ();
++		public signal void dnd_enter ();
++		public signal void dnd_leave ();
++		public signal void dnd_position_change (int object, int p0);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++	}
++	[CCode (cheader_filename = "meta/meta-idle-monitor.h", type_id = "meta_idle_monitor_get_type ()")]
++	public class IdleMonitor : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected IdleMonitor ();
++		public uint add_idle_watch (uint64 interval_msec, owned Meta.IdleMonitorWatchFunc? callback);
++		public uint add_user_active_watch (owned Meta.IdleMonitorWatchFunc? callback);
++		public static unowned Meta.IdleMonitor get_core ();
++		public int64 get_idletime ();
++		public void remove_watch (uint id);
++		[NoAccessorMethod]
++		public Clutter.InputDevice device { owned get; construct; }
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_key_binding_get_type ()")]
++	[Compact]
++	public class KeyBinding {
++		public uint get_mask ();
++		public Meta.VirtualModifier get_modifiers ();
++		public unowned string get_name ();
++		public bool is_builtin ();
++		public bool is_reversed ();
++		[CCode (cname = "meta_keybindings_set_custom_handler")]
++		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
++	}
++	[CCode (cheader_filename = "meta/meta-launch-context.h", type_id = "meta_launch_context_get_type ()")]
++	public class LaunchContext : GLib.AppLaunchContext {
++		[CCode (has_construct_function = false)]
++		protected LaunchContext ();
++		public void set_timestamp (uint32 timestamp);
++		public void set_workspace (Meta.Workspace workspace);
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public uint timestamp { get; set; }
++		[NoAccessorMethod]
++		public Meta.Workspace workspace { owned get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_monitor_manager_get_type ()")]
++	public class MonitorManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected MonitorManager ();
++		public bool can_switch_config ();
++		public static unowned Meta.MonitorManager @get ();
++		public static int get_display_configuration_timeout ();
++		public bool get_is_builtin_display_on ();
++		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
++		public Meta.MonitorSwitchConfigType get_switch_config ();
++		public void switch_config (Meta.MonitorSwitchConfigType config_type);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
++		public signal void confirm_display_change ();
++		public signal void monitors_changed ();
++		public signal void monitors_changed_internal ();
++		public signal void power_save_mode_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
++	public abstract class Plugin : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Plugin ();
++		public bool begin_modal (Meta.ModalOptions options, uint32 timestamp);
++		public void complete_display_change (bool ok);
++		[NoWrapper]
++		public virtual void confirm_display_change ();
++		[NoWrapper]
++		public virtual void destroy (Meta.WindowActor actor);
++		public void destroy_completed (Meta.WindowActor actor);
++		public void end_modal (uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.PluginInfo? get_info ();
++		[NoWrapper]
++		public virtual void hide_tile_preview ();
++		[NoWrapper]
++		public virtual bool keybinding_filter (Meta.KeyBinding binding);
++		[NoWrapper]
++		public virtual void kill_switch_workspace ();
++		[NoWrapper]
++		public virtual void kill_window_effects (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void locate_pointer ();
++		public static void manager_set_plugin_type (GLib.Type gtype);
++		[NoWrapper]
++		public virtual void map (Meta.WindowActor actor);
++		public void map_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void minimize (Meta.WindowActor actor);
++		public void minimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual unowned Meta.PluginInfo? plugin_info ();
++		[NoWrapper]
++		public virtual void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number);
++		[NoWrapper]
++		public virtual void show_window_menu (Meta.Window window, Meta.WindowMenuType menu, int x, int y);
++		[NoWrapper]
++		public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Meta.Rectangle rect);
++		[NoWrapper]
++		public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Meta.Rectangle old_frame_rect, Meta.Rectangle old_buffer_rect);
++		public void size_change_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void size_changed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void start ();
++		[NoWrapper]
++		public virtual void switch_workspace (int from, int to, Meta.MotionDirection direction);
++		public void switch_workspace_completed ();
++		[NoWrapper]
++		public virtual void unminimize (Meta.WindowActor actor);
++		public void unminimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual bool xevent_filter (X.Event event);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_controller_get_type ()")]
++	public class RemoteAccessController : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessController ();
++		public void inhibit_remote_access ();
++		public void uninhibit_remote_access ();
++		public signal void new_handle (Meta.RemoteAccessHandle object);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_handle_get_type ()")]
++	public class RemoteAccessHandle : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessHandle ();
++		public bool get_disable_animations ();
++		public virtual void stop ();
++		[NoAccessorMethod]
++		public bool is_recording { get; construct; }
++		public signal void stopped ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
++	public class Selection : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Selection (Meta.Display display);
++		public GLib.List<string> get_mimetypes (Meta.SelectionType selection_type);
++		public void set_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public async bool transfer_async (Meta.SelectionType selection_type, string mimetype, ssize_t size, GLib.OutputStream output, GLib.Cancellable? cancellable) throws GLib.Error;
++		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public signal void owner_changed (uint object, Meta.SelectionSource p0);
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
++	public class SelectionSource : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SelectionSource ();
++		public virtual GLib.List<string> get_mimetypes ();
++		public bool is_active ();
++		public virtual async GLib.InputStream read_async (string mimetype, GLib.Cancellable? cancellable) throws GLib.Error;
++		public virtual signal void activated ();
++		public virtual signal void deactivated ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
++	public class SelectionSourceMemory : Meta.SelectionSource {
++		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
++		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
++	}
++	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
++	[Compact]
++	public class Settings {
++		public int get_font_dpi ();
++		public int get_ui_scaling_factor ();
++	}
++	[CCode (cheader_filename = "meta/main.h", ref_function = "meta_shadow_ref", type_id = "meta_shadow_get_type ()", unref_function = "meta_shadow_unref")]
++	[Compact]
++	public class Shadow {
++		public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds);
++		public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
++		public Meta.Shadow @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/meta-shadow-factory.h", type_id = "meta_shadow_factory_get_type ()")]
++	public class ShadowFactory : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public ShadowFactory ();
++		public static unowned Meta.ShadowFactory get_default ();
++		public Meta.ShadowParams get_params (string class_name, bool focused);
++		public Meta.Shadow get_shadow (Meta.WindowShape shape, int width, int height, string class_name, bool focused);
++		public void set_params (string class_name, bool focused, Meta.ShadowParams @params);
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-shaped-texture.h", type_id = "meta_shaped_texture_get_type ()")]
++	public class ShapedTexture : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected ShapedTexture ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Cogl.Texture get_texture ();
++		public void set_create_mipmaps (bool create_mipmaps);
++		public void set_mask_texture (Cogl.Texture mask_texture);
++		public signal void size_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")]
++	public class SoundPlayer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SoundPlayer ();
++		public void play_from_file (GLib.File file, string description, GLib.Cancellable? cancellable = null);
++		public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null);
++	}
++	[CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")]
++	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public static bool is_focused (Meta.Display display);
++		public signal void actors_painted ();
++	}
++	[CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")]
++	public class StartupNotification : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupNotification ();
++		public Meta.LaunchContext create_launcher ();
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		public signal void changed (void* object);
++	}
++	[CCode (cheader_filename = "meta/main.h", type_id = "meta_startup_sequence_get_type ()")]
++	public class StartupSequence : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupSequence ();
++		public unowned string get_application_id ();
++		public bool get_completed ();
++		public unowned string get_icon_name ();
++		public unowned string get_id ();
++		public unowned string get_name ();
++		public uint64 get_timestamp ();
++		public unowned string get_wmclass ();
++		public int get_workspace ();
++		public string application_id { get; construct; }
++		public string icon_name { get; construct; }
++		public string id { get; construct; }
++		public string name { get; construct; }
++		public uint64 timestamp { get; construct; }
++		public string wmclass { get; construct; }
++		public int workspace { get; construct; }
++		[HasEmitter]
++		public signal void complete ();
++	}
++	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
++	[Compact]
++	public class Theme {
++		public void free ();
++	}
++	[CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")]
++	public class WaylandClient : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public WaylandClient (GLib.SubprocessLauncher launcher) throws GLib.Error;
++		public void hide_from_window_list (Meta.Window window);
++		public bool owns_window (Meta.Window window);
++		public void show_in_window_list (Meta.Window window);
++		public GLib.Subprocess spawnv (Meta.Display display, [CCode (array_length = false, array_null_terminated = true)] string[] argv) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "meta/window.h", type_id = "meta_window_get_type ()")]
++	public abstract class Window : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Window ();
++		public void activate (uint32 current_time);
++		public void activate_with_workspace (uint32 current_time, Meta.Workspace workspace);
++		public bool allows_move ();
++		public bool allows_resize ();
++		public void begin_grab_op (Meta.GrabOp op, bool frame_action, uint32 timestamp);
++		public bool can_close ();
++		public bool can_maximize ();
++		public bool can_minimize ();
++		public bool can_shade ();
++		public void change_workspace (Meta.Workspace workspace);
++		public void change_workspace_by_index (int space_index, bool append);
++		public void check_alive (uint32 timestamp);
++		public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect);
++		public void compute_group ();
++		public void @delete (uint32 timestamp);
++		public unowned Meta.Window find_root_ancestor ();
++		public void focus (uint32 timestamp);
++		public void foreach_ancestor (Meta.WindowForeachFunc func);
++		public void foreach_transient (Meta.WindowForeachFunc func);
++		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
++		public Meta.Rectangle get_buffer_rect ();
++		public unowned string get_client_machine ();
++		public Meta.WindowClientType get_client_type ();
++		public unowned GLib.Object get_compositor_private ();
++		public unowned string get_description ();
++		public unowned Meta.Display get_display ();
++		public unowned Cairo.Region? get_frame_bounds ();
++		public Meta.Rectangle get_frame_rect ();
++		public Meta.FrameType get_frame_type ();
++		public unowned string get_gtk_app_menu_object_path ();
++		public unowned string get_gtk_application_id ();
++		public unowned string get_gtk_application_object_path ();
++		public unowned string get_gtk_menubar_object_path ();
++		public unowned string get_gtk_theme_variant ();
++		public unowned string get_gtk_unique_bus_name ();
++		public unowned string get_gtk_window_object_path ();
++		public bool get_icon_geometry (out Meta.Rectangle rect);
++		public uint64 get_id ();
++		public Meta.StackLayer get_layer ();
++		public Meta.MaximizeFlags get_maximized ();
++		public int get_monitor ();
++		public unowned string get_mutter_hints ();
++		public int get_pid ();
++		public unowned string get_role ();
++		public unowned string get_sandboxed_app_id ();
++		public uint get_stable_sequence ();
++		public unowned string get_startup_id ();
++		public unowned Meta.Window? get_tile_match ();
++		public unowned string get_title ();
++		public unowned Meta.Window get_transient_for ();
++		public uint32 get_user_time ();
++		public Meta.WindowType get_window_type ();
++		public unowned string get_wm_class ();
++		public unowned string get_wm_class_instance ();
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_current_monitor ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public unowned Meta.Workspace get_workspace ();
++		public X.Window get_xwindow ();
++		public void group_leader_changed ();
++		public bool has_focus ();
++		public bool is_above ();
++		public bool is_always_on_all_workspaces ();
++		public bool is_ancestor_of_transient (Meta.Window transient);
++		public bool is_attached_dialog ();
++		public bool is_client_decorated ();
++		public bool is_fullscreen ();
++		public bool is_hidden ();
++		public bool is_monitor_sized ();
++		public bool is_on_all_workspaces ();
++		public bool is_on_primary_monitor ();
++		public bool is_override_redirect ();
++		public bool is_remote ();
++		public bool is_screen_sized ();
++		public bool is_shaded ();
++		public bool is_skip_taskbar ();
++		public void kill ();
++		public bool located_on_workspace (Meta.Workspace workspace);
++		public void lower ();
++		public void make_above ();
++		public void make_fullscreen ();
++		public void maximize (Meta.MaximizeFlags directions);
++		public void minimize ();
++		public void move_frame (bool user_op, int root_x_nw, int root_y_nw);
++		public void move_resize_frame (bool user_op, int root_x_nw, int root_y_nw, int w, int h);
++		public void move_to_monitor (int monitor);
++		public void raise ();
++		public void set_compositor_private (GLib.Object priv);
++		public void set_demands_attention ();
++		public void set_icon_geometry (Meta.Rectangle? rect);
++		public void shade (uint32 timestamp);
++		public void shove_titlebar_onscreen ();
++		public bool showing_on_its_workspace ();
++		public void shutdown_group ();
++		public void stick ();
++		public bool titlebar_is_onscreen ();
++		public void unmake_above ();
++		public void unmake_fullscreen ();
++		public void unmaximize (Meta.MaximizeFlags directions);
++		public void unminimize ();
++		public void unset_demands_attention ();
++		public void unshade (uint32 timestamp);
++		public void unstick ();
++		[NoAccessorMethod]
++		public bool above { get; }
++		[NoAccessorMethod]
++		public bool appears_focused { get; }
++		[NoAccessorMethod]
++		public bool decorated { get; }
++		[NoAccessorMethod]
++		public bool demands_attention { get; }
++		[NoAccessorMethod]
++		public bool fullscreen { get; }
++		public string gtk_app_menu_object_path { get; }
++		public string gtk_application_id { get; }
++		public string gtk_application_object_path { get; }
++		public string gtk_menubar_object_path { get; }
++		public string gtk_unique_bus_name { get; }
++		public string gtk_window_object_path { get; }
++		[NoAccessorMethod]
++		public void* icon { get; }
++		[NoAccessorMethod]
++		public bool maximized_horizontally { get; }
++		[NoAccessorMethod]
++		public bool maximized_vertically { get; }
++		[NoAccessorMethod]
++		public void* mini_icon { get; }
++		[NoAccessorMethod]
++		public bool minimized { get; }
++		public string mutter_hints { get; }
++		[NoAccessorMethod]
++		public bool on_all_workspaces { get; }
++		[NoAccessorMethod]
++		public bool resizeable { get; }
++		[NoAccessorMethod]
++		public bool skip_taskbar { get; }
++		public string title { get; }
++		[NoAccessorMethod]
++		public bool urgent { get; }
++		public uint user_time { get; }
++		public Meta.WindowType window_type { get; }
++		public string wm_class { get; }
++		public signal void position_changed ();
++		public signal void raised ();
++		public signal void shown ();
++		public signal void size_changed ();
++		public signal void unmanaged ();
++		public signal void unmanaging ();
++		public signal void workspace_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")]
++	public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowActor ();
++		public void freeze ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Meta.Window get_meta_window ();
++		public unowned Meta.ShapedTexture get_texture ();
++		public bool is_destroyed ();
++		public void sync_visibility ();
++		public void thaw ();
++		public Meta.Window meta_window { get; construct; }
++		public signal void damaged ();
++		public signal void effects_completed ();
++		public signal void first_frame ();
++		public signal void thawed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-group.h", type_id = "meta_window_group_get_type ()")]
++	public class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-shape.h", ref_function = "meta_window_shape_ref", type_id = "meta_window_shape_get_type ()", unref_function = "meta_window_shape_unref")]
++	[Compact]
++	public class WindowShape {
++		[CCode (has_construct_function = false)]
++		public WindowShape (Cairo.Region region);
++		public bool equal (Meta.WindowShape shape_b);
++		public void get_borders (int border_top, int border_right, int border_bottom, int border_left);
++		public uint hash ();
++		public Meta.WindowShape @ref ();
++		public Cairo.Region to_region (int center_width, int center_height);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/workspace.h", type_id = "meta_workspace_get_type ()")]
++	public class Workspace : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Workspace ();
++		public void activate (uint32 timestamp);
++		public void activate_with_focus (Meta.Window focus_this, uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction);
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public int index ();
++		public GLib.List<weak Meta.Window> list_windows ();
++		public void set_builtin_struts (GLib.SList<Meta.Strut?> struts);
++		[NoAccessorMethod]
++		public bool active { get; }
++		[NoAccessorMethod]
++		public uint n_windows { get; }
++		[NoAccessorMethod]
++		public uint workspace_index { get; }
++		public signal void window_added (Meta.Window object);
++		public signal void window_removed (Meta.Window object);
++	}
++	[CCode (cheader_filename = "meta/meta-workspace-manager.h", type_id = "meta_workspace_manager_get_type ()")]
++	public class WorkspaceManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected WorkspaceManager ();
++		public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp);
++		public unowned Meta.Workspace get_active_workspace ();
++		public int get_active_workspace_index ();
++		public int get_n_workspaces ();
++		public unowned Meta.Workspace? get_workspace_by_index (int index);
++		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
++		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
++		public void reorder_workspace (Meta.Workspace workspace, int new_index);
++		[NoAccessorMethod]
++		public int layout_columns { get; }
++		[NoAccessorMethod]
++		public int layout_rows { get; }
++		public int n_workspaces { get; }
++		public signal void active_workspace_changed ();
++		public signal void showing_desktop_changed ();
++		public signal void workspace_added (int object);
++		public signal void workspace_removed (int object);
++		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
++		public signal void workspaces_reordered ();
++	}
++	[CCode (cheader_filename = "meta/meta-x11-display.h", type_id = "meta_x11_display_get_type ()")]
++	public class X11Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected X11Display ();
++		public void clear_stage_input_region ();
++		public int get_damage_event_base ();
++		public int get_screen_number ();
++		public int get_shape_event_base ();
++		public bool has_shape ();
++		public void set_cm_selection ();
++		public void set_stage_input_region (X.XserverRegion region);
++		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
++	}
++	[CCode (cheader_filename = "meta/meta-close-dialog.h", type_cname = "MetaCloseDialogInterface", type_id = "meta_close_dialog_get_type ()")]
++	public interface CloseDialog : GLib.Object {
++		public abstract void focus ();
++		public abstract void hide ();
++		public bool is_visible ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.CloseDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/meta-inhibit-shortcuts-dialog.h", type_cname = "MetaInhibitShortcutsDialogInterface", type_id = "meta_inhibit_shortcuts_dialog_get_type ()")]
++	public interface InhibitShortcutsDialog : GLib.Object {
++		public abstract void hide ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.InhibitShortcutsDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ButtonLayout {
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction left_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool left_buttons_has_spacer[4];
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction right_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool right_buttons_has_spacer[4];
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Edge {
++		public Meta.Rectangle rect;
++		public Meta.Side side_type;
++		public Meta.EdgeType edge_type;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct FrameBorders {
++		public Gtk.Border visible;
++		public Gtk.Border invisible;
++		public Gtk.Border total;
++		public void clear ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", has_type_id = false)]
++	public struct PluginInfo {
++		public weak string name;
++		public weak string version;
++		public weak string author;
++		public weak string license;
++		public weak string description;
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_rectangle_get_type ()")]
++	public struct Rectangle {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++		public int area ();
++		public bool contains_rect (Meta.Rectangle inner_rect);
++		public Meta.Rectangle? copy ();
++		public bool could_fit_rect (Meta.Rectangle inner_rect);
++		public bool equal (Meta.Rectangle src2);
++		public void free ();
++		public bool horiz_overlap (Meta.Rectangle rect2);
++		public bool intersect (Meta.Rectangle src2, out Meta.Rectangle dest);
++		public bool overlap (Meta.Rectangle rect2);
++		public Meta.Rectangle union (Meta.Rectangle rect2);
++		public bool vert_overlap (Meta.Rectangle rect2);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ShadowParams {
++		public int radius;
++		public int top_fade;
++		public int x_offset;
++		public int y_offset;
++		public uint8 opacity;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Strut {
++		public Meta.Rectangle rect;
++		public Meta.Side side;
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BARRIER_DIRECTION_", type_id = "meta_barrier_direction_get_type ()")]
++	[Flags]
++	public enum BarrierDirection {
++		POSITIVE_X,
++		POSITIVE_Y,
++		NEGATIVE_X,
++		NEGATIVE_Y
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BUTTON_FUNCTION_", type_id = "meta_button_function_get_type ()")]
++	public enum ButtonFunction {
++		MENU,
++		MINIMIZE,
++		MAXIMIZE,
++		CLOSE,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CLOSE_DIALOG_RESPONSE_", type_id = "meta_close_dialog_response_get_type ()")]
++	public enum CloseDialogResponse {
++		WAIT,
++		FORCE_CLOSE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_COMP_EFFECT_", type_id = "meta_comp_effect_get_type ()")]
++	public enum CompEffect {
++		CREATE,
++		UNMINIMIZE,
++		DESTROY,
++		MINIMIZE,
++		NONE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CURSOR_", type_id = "meta_cursor_get_type ()")]
++	public enum Cursor {
++		NONE,
++		DEFAULT,
++		NORTH_RESIZE,
++		SOUTH_RESIZE,
++		WEST_RESIZE,
++		EAST_RESIZE,
++		SE_RESIZE,
++		SW_RESIZE,
++		NE_RESIZE,
++		NW_RESIZE,
++		MOVE_OR_RESIZE_WINDOW,
++		BUSY,
++		DND_IN_DRAG,
++		DND_MOVE,
++		DND_COPY,
++		DND_UNSUPPORTED_TARGET,
++		POINTING_HAND,
++		CROSSHAIR,
++		IBEAM,
++		BLANK,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
++	[Flags]
++	public enum DebugTopic {
++		VERBOSE,
++		FOCUS,
++		WORKAREA,
++		STACK,
++		SM,
++		EVENTS,
++		WINDOW_STATE,
++		WINDOW_OPS,
++		GEOMETRY,
++		PLACEMENT,
++		PING,
++		KEYBINDINGS,
++		SYNC,
++		STARTUP,
++		PREFS,
++		GROUPS,
++		RESIZING,
++		SHAPES,
++		EDGE_RESISTANCE,
++		DBUS,
++		INPUT,
++		WAYLAND,
++		KMS,
++		SCREEN_CAST,
++		REMOTE_DESKTOP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DIRECTION_", type_id = "meta_direction_get_type ()")]
++	[Flags]
++	public enum Direction {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM,
++		UP,
++		DOWN,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_corner_get_type ()")]
++	public enum DisplayCorner {
++		TOPLEFT,
++		TOPRIGHT,
++		BOTTOMLEFT,
++		BOTTOMRIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_direction_get_type ()")]
++	public enum DisplayDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EDGE_", type_id = "meta_edge_type_get_type ()")]
++	public enum EdgeType {
++		WINDOW,
++		MONITOR,
++		SCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")]
++	public enum ExitCode {
++		SUCCESS,
++		ERROR
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_", type_id = "meta_frame_flags_get_type ()")]
++	[Flags]
++	public enum FrameFlags {
++		ALLOWS_DELETE,
++		ALLOWS_MENU,
++		ALLOWS_MINIMIZE,
++		ALLOWS_MAXIMIZE,
++		ALLOWS_VERTICAL_RESIZE,
++		ALLOWS_HORIZONTAL_RESIZE,
++		HAS_FOCUS,
++		SHADED,
++		STUCK,
++		MAXIMIZED,
++		ALLOWS_SHADE,
++		ALLOWS_MOVE,
++		FULLSCREEN,
++		ABOVE,
++		TILED_LEFT,
++		TILED_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_TYPE_", type_id = "meta_frame_type_get_type ()")]
++	public enum FrameType {
++		NORMAL,
++		DIALOG,
++		MODAL_DIALOG,
++		UTILITY,
++		MENU,
++		BORDER,
++		ATTACHED,
++		LAST;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAB_OP_", type_id = "meta_grab_op_get_type ()")]
++	public enum GrabOp {
++		NONE,
++		WINDOW_BASE,
++		COMPOSITOR,
++		WAYLAND_POPUP,
++		FRAME_BUTTON,
++		MOVING,
++		RESIZING_NW,
++		RESIZING_N,
++		RESIZING_NE,
++		RESIZING_E,
++		RESIZING_SW,
++		RESIZING_S,
++		RESIZING_SE,
++		RESIZING_W,
++		KEYBOARD_MOVING,
++		KEYBOARD_RESIZING_UNKNOWN,
++		KEYBOARD_RESIZING_NW,
++		KEYBOARD_RESIZING_N,
++		KEYBOARD_RESIZING_NE,
++		KEYBOARD_RESIZING_E,
++		KEYBOARD_RESIZING_SW,
++		KEYBOARD_RESIZING_S,
++		KEYBOARD_RESIZING_SE,
++		KEYBOARD_RESIZING_W
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")]
++	public enum Gravity {
++		NONE,
++		NORTH_WEST,
++		NORTH,
++		NORTH_EAST,
++		WEST,
++		CENTER,
++		EAST,
++		SOUTH_WEST,
++		SOUTH,
++		SOUTH_EAST,
++		STATIC
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_INHIBIT_SHORTCUTS_DIALOG_RESPONSE_", type_id = "meta_inhibit_shortcuts_dialog_response_get_type ()")]
++	public enum InhibitShortcutsDialogResponse {
++		ALLOW,
++		DENY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEYBINDING_ACTION_", type_id = "meta_key_binding_action_get_type ()")]
++	public enum KeyBindingAction {
++		NONE,
++		WORKSPACE_1,
++		WORKSPACE_2,
++		WORKSPACE_3,
++		WORKSPACE_4,
++		WORKSPACE_5,
++		WORKSPACE_6,
++		WORKSPACE_7,
++		WORKSPACE_8,
++		WORKSPACE_9,
++		WORKSPACE_10,
++		WORKSPACE_11,
++		WORKSPACE_12,
++		WORKSPACE_LEFT,
++		WORKSPACE_RIGHT,
++		WORKSPACE_UP,
++		WORKSPACE_DOWN,
++		WORKSPACE_LAST,
++		SWITCH_APPLICATIONS,
++		SWITCH_APPLICATIONS_BACKWARD,
++		SWITCH_GROUP,
++		SWITCH_GROUP_BACKWARD,
++		SWITCH_WINDOWS,
++		SWITCH_WINDOWS_BACKWARD,
++		SWITCH_PANELS,
++		SWITCH_PANELS_BACKWARD,
++		CYCLE_GROUP,
++		CYCLE_GROUP_BACKWARD,
++		CYCLE_WINDOWS,
++		CYCLE_WINDOWS_BACKWARD,
++		CYCLE_PANELS,
++		CYCLE_PANELS_BACKWARD,
++		SHOW_DESKTOP,
++		PANEL_MAIN_MENU,
++		PANEL_RUN_DIALOG,
++		TOGGLE_RECORDING,
++		SET_SPEW_MARK,
++		ACTIVATE_WINDOW_MENU,
++		TOGGLE_FULLSCREEN,
++		TOGGLE_MAXIMIZED,
++		TOGGLE_TILED_LEFT,
++		TOGGLE_TILED_RIGHT,
++		TOGGLE_ABOVE,
++		MAXIMIZE,
++		UNMAXIMIZE,
++		TOGGLE_SHADED,
++		MINIMIZE,
++		CLOSE,
++		BEGIN_MOVE,
++		BEGIN_RESIZE,
++		TOGGLE_ON_ALL_WORKSPACES,
++		MOVE_TO_WORKSPACE_1,
++		MOVE_TO_WORKSPACE_2,
++		MOVE_TO_WORKSPACE_3,
++		MOVE_TO_WORKSPACE_4,
++		MOVE_TO_WORKSPACE_5,
++		MOVE_TO_WORKSPACE_6,
++		MOVE_TO_WORKSPACE_7,
++		MOVE_TO_WORKSPACE_8,
++		MOVE_TO_WORKSPACE_9,
++		MOVE_TO_WORKSPACE_10,
++		MOVE_TO_WORKSPACE_11,
++		MOVE_TO_WORKSPACE_12,
++		MOVE_TO_WORKSPACE_LEFT,
++		MOVE_TO_WORKSPACE_RIGHT,
++		MOVE_TO_WORKSPACE_UP,
++		MOVE_TO_WORKSPACE_DOWN,
++		MOVE_TO_WORKSPACE_LAST,
++		MOVE_TO_MONITOR_LEFT,
++		MOVE_TO_MONITOR_RIGHT,
++		MOVE_TO_MONITOR_UP,
++		MOVE_TO_MONITOR_DOWN,
++		RAISE_OR_LOWER,
++		RAISE,
++		LOWER,
++		MAXIMIZE_VERTICALLY,
++		MAXIMIZE_HORIZONTALLY,
++		MOVE_TO_CORNER_NW,
++		MOVE_TO_CORNER_NE,
++		MOVE_TO_CORNER_SW,
++		MOVE_TO_CORNER_SE,
++		MOVE_TO_SIDE_N,
++		MOVE_TO_SIDE_S,
++		MOVE_TO_SIDE_E,
++		MOVE_TO_SIDE_W,
++		MOVE_TO_CENTER,
++		OVERLAY_KEY,
++		LOCATE_POINTER_KEY,
++		ISO_NEXT_GROUP,
++		ALWAYS_ON_TOP,
++		SWITCH_MONITOR,
++		ROTATE_MONITOR,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEY_BINDING_", type_id = "meta_key_binding_flags_get_type ()")]
++	[Flags]
++	public enum KeyBindingFlags {
++		NONE,
++		PER_WINDOW,
++		BUILTIN,
++		IS_REVERSED,
++		NON_MASKABLE,
++		IGNORE_AUTOREPEAT,
++		NO_AUTO_GRAB
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LATER_", type_id = "meta_later_type_get_type ()")]
++	public enum LaterType {
++		RESIZE,
++		CALC_SHOWING,
++		CHECK_FULLSCREEN,
++		SYNC_STACK,
++		BEFORE_REDRAW,
++		IDLE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LOCALE_DIRECTION_", type_id = "meta_locale_direction_get_type ()")]
++	public enum LocaleDirection {
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MAXIMIZE_", type_id = "meta_maximize_flags_get_type ()")]
++	[Flags]
++	public enum MaximizeFlags {
++		HORIZONTAL,
++		VERTICAL,
++		BOTH
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MODAL_", type_id = "meta_modal_options_get_type ()")]
++	[Flags]
++	public enum ModalOptions {
++		POINTER_ALREADY_GRABBED,
++		KEYBOARD_ALREADY_GRABBED
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MONITOR_SWITCH_CONFIG_", type_id = "meta_monitor_switch_config_type_get_type ()")]
++	public enum MonitorSwitchConfigType {
++		ALL_MIRROR,
++		ALL_LINEAR,
++		EXTERNAL,
++		BUILTIN,
++		UNKNOWN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MOTION_", type_id = "meta_motion_direction_get_type ()")]
++	public enum MotionDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		UP_LEFT,
++		UP_RIGHT,
++		DOWN_LEFT,
++		DOWN_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_PAD_ACTION_", type_id = "meta_pad_action_type_get_type ()")]
++	public enum PadActionType {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "meta/prefs.h", cprefix = "META_PREF_", type_id = "meta_preference_get_type ()")]
++	public enum Preference {
++		MOUSE_BUTTON_MODS,
++		FOCUS_MODE,
++		FOCUS_NEW_WINDOWS,
++		ATTACH_MODAL_DIALOGS,
++		RAISE_ON_CLICK,
++		ACTION_DOUBLE_CLICK_TITLEBAR,
++		ACTION_MIDDLE_CLICK_TITLEBAR,
++		ACTION_RIGHT_CLICK_TITLEBAR,
++		AUTO_RAISE,
++		AUTO_RAISE_DELAY,
++		FOCUS_CHANGE_ON_POINTER_REST,
++		TITLEBAR_FONT,
++		NUM_WORKSPACES,
++		DYNAMIC_WORKSPACES,
++		KEYBINDINGS,
++		DISABLE_WORKAROUNDS,
++		BUTTON_LAYOUT,
++		WORKSPACE_NAMES,
++		VISUAL_BELL,
++		AUDIBLE_BELL,
++		VISUAL_BELL_TYPE,
++		GNOME_ACCESSIBILITY,
++		GNOME_ANIMATIONS,
++		CURSOR_THEME,
++		CURSOR_SIZE,
++		RESIZE_WITH_RIGHT_BUTTON,
++		EDGE_TILING,
++		FORCE_FULLSCREEN,
++		WORKSPACES_ONLY_ON_PRIMARY,
++		DRAGGABLE_BORDER_WIDTH,
++		AUTO_MAXIMIZE,
++		CENTER_NEW_WINDOWS,
++		DRAG_THRESHOLD,
++		LOCATE_POINTER,
++		CHECK_ALIVE_TIMEOUT;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	public enum SelectionType {
++		SELECTION_PRIMARY,
++		SELECTION_CLIPBOARD,
++		SELECTION_DND,
++		N_SELECTION_TYPES
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")]
++	public enum ShadowMode {
++		AUTO,
++		FORCED_OFF,
++		FORCED_ON
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIDE_", type_id = "meta_side_get_type ()")]
++	public enum Side {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIZE_CHANGE_", type_id = "meta_size_change_get_type ()")]
++	public enum SizeChange {
++		MAXIMIZE,
++		UNMAXIMIZE,
++		FULLSCREEN,
++		UNFULLSCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LAYER_", type_id = "meta_stack_layer_get_type ()")]
++	public enum StackLayer {
++		DESKTOP,
++		BOTTOM,
++		NORMAL,
++		TOP,
++		DOCK,
++		OVERRIDE_REDIRECT,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_LIST_", type_id = "meta_tab_list_get_type ()")]
++	public enum TabList {
++		NORMAL,
++		DOCKS,
++		GROUP,
++		NORMAL_ALL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_SHOW_", type_id = "meta_tab_show_type_get_type ()")]
++	public enum TabShowType {
++		ICON,
++		INSTANTLY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")]
++	[Flags]
++	public enum VirtualModifier {
++		SHIFT_MASK,
++		CONTROL_MASK,
++		ALT_MASK,
++		META_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")]
++	public enum WindowClientType {
++		WAYLAND,
++		X11
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_MENU_", type_id = "meta_window_menu_type_get_type ()")]
++	public enum WindowMenuType {
++		WM,
++		APP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_", type_id = "meta_window_type_get_type ()")]
++	public enum WindowType {
++		NORMAL,
++		DESKTOP,
++		DOCK,
++		DIALOG,
++		MODAL_DIALOG,
++		TOOLBAR,
++		MENU,
++		UTILITY,
++		SPLASHSCREEN,
++		DROPDOWN_MENU,
++		POPUP_MENU,
++		TOOLTIP,
++		NOTIFICATION,
++		COMBO,
++		DND,
++		OVERRIDE_OTHER
++	}
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 2.9)]
++	public delegate void IdleMonitorWatchFunc (Meta.IdleMonitor monitor, uint watch_id);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 4.9)]
++	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Window window, [CCode (type = "ClutterKeyEvent*")] Clutter.KeyEvent? event, Meta.KeyBinding binding);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate void PrefsChangedFunc (Meta.Preference pref);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate bool WindowForeachFunc (Meta.Window window);
++	[CCode (cheader_filename = "meta/main.h", cname = "META_CURRENT_TIME")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
++	public const string DEFAULT_ICON_NAME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_HEIGHT")]
++	public const int ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_WIDTH")]
++	public const int ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_HEIGHT")]
++	public const int MINI_ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_WIDTH")]
++	public const int MINI_ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_BEFORE_REDRAW")]
++	public const int PRIORITY_BEFORE_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_PREFS_NOTIFY")]
++	public const int PRIORITY_PREFS_NOTIFY;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_REDRAW")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_RESIZE")]
++	public const int PRIORITY_RESIZE;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_KEYBOARD_ID")]
++	public const int VIRTUAL_CORE_KEYBOARD_ID;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_POINTER_ID")]
++	public const int VIRTUAL_CORE_POINTER_ID;
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void clutter_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void exit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static string g_utf8_strndup (string src, size_t n);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static unowned GLib.OptionContext get_option_context ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool get_replace_current_wm ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_restart ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_topic_enabled (Meta.DebugTopic topic);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void quit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void register_with_session ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void restart (string? message);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static int run ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_gnome_wm_keybindings (string wm_keybindings);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_wm_name (string wm_name);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void test_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool x11_init_gdk_display () throws GLib.Error;
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct before_frame {
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct frame {
++}
+diff --git vapi/mutter-clutter-7-custom.vala vapi/mutter-clutter-7-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-7-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-7.deps vapi/mutter-clutter-7.deps
+index 6bd1ccf7..2f4cf3e8 100644
+--- vapi/mutter-clutter-7.deps
++++ vapi/mutter-clutter-7.deps
+@@ -2,3 +2,4 @@ atk
+ cairo
+ json-glib-1.0
+ mutter-cogl-7
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-7.vapi vapi/mutter-clutter-7.vapi
+index d7e133df..b1cdd185 100644
+--- vapi/mutter-clutter-7.vapi
++++ vapi/mutter-clutter-7.vapi
+@@ -4659,11 +4659,11 @@ namespace Clutter {
+ 		[Version (since = "0.8")]
+ 		public void allocate_preferred_size (float x, float y);
+ 		[Version (since = "0.6")]
+-		public void apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
+ 		[NoWrapper]
+ 		public virtual void apply_transform (ref Clutter.Matrix matrix);
+ 		[Version (since = "0.4")]
+-		public void apply_transform_to_point (Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
+ 		[Version (since = "1.24")]
+ 		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
+ 		[NoWrapper]
+@@ -4724,7 +4724,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
+ 		[Version (since = "1.10")]
+-		public unowned Clutter.PaintVolume get_default_paint_volume ();
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
+ 		[Version (since = "1.10")]
+ 		public uint get_easing_delay ();
+ 		[Version (since = "1.10")]
+@@ -4751,7 +4751,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public unowned Clutter.LayoutManager get_layout_manager ();
+ 		[Version (since = "1.10")]
+-		public void get_margin (Clutter.Margin margin);
++		public Clutter.Margin get_margin ();
+ 		[Version (since = "1.10")]
+ 		public float get_margin_bottom ();
+ 		[Version (since = "1.10")]
+@@ -4776,8 +4776,11 @@ namespace Clutter {
+ 		public uint8 get_paint_opacity ();
+ 		[Version (since = "0.8")]
+ 		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
+ 		[NoWrapper]
+-		public virtual bool get_paint_volume (Clutter.PaintVolume volume);
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
+ 		[Version (since = "1.0")]
+ 		public unowned Pango.Context get_pango_context ();
+ 		public unowned Clutter.Actor? get_parent ();
+@@ -4814,9 +4817,9 @@ namespace Clutter {
+ 		public Clutter.TextDirection get_text_direction ();
+ 		[Version (since = "1.12")]
+ 		public Clutter.Matrix get_transform ();
+-		public void get_transformed_extents (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_transformed_extents ();
+ 		[Version (since = "1.6")]
+-		public unowned Clutter.PaintVolume get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
+ 		[Version (since = "0.8")]
+ 		public void get_transformed_position (out float x, out float y);
+ 		[Version (since = "0.8")]
+@@ -5275,7 +5278,7 @@ namespace Clutter {
+ 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
+ 		public Clutter.AlignAxis get_align_axis ();
+ 		public float get_factor ();
+-		public void get_pivot_point (out unowned Graphene.Point pivot_point);
++		public Graphene.Point get_pivot_point ();
+ 		public unowned Clutter.Actor get_source ();
+ 		public void set_align_axis (Clutter.AlignAxis axis);
+ 		public void set_factor (float factor);
+@@ -5283,8 +5286,7 @@ namespace Clutter {
+ 		public void set_source (Clutter.Actor? source);
+ 		public Clutter.AlignAxis align_axis { get; set construct; }
+ 		public float factor { get; set construct; }
+-		[NoAccessorMethod]
+-		public Graphene.Point pivot_point { owned get; set; }
++		public Graphene.Point pivot_point { get; set; }
+ 		public Clutter.Actor source { get; set construct; }
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+@@ -5302,6 +5304,8 @@ namespace Clutter {
+ 	public abstract class Backend : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
+ 		public unowned Clutter.Seat get_default_seat ();
+ 		[Version (since = "0.8")]
+ 		public unowned Cairo.FontOptions get_font_options ();
+@@ -5561,6 +5565,16 @@ namespace Clutter {
+ 		public void set_factor (double factor);
+ 		public double factor { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public abstract class Effect : Clutter.ActorMeta {
+@@ -5630,7 +5644,7 @@ namespace Clutter {
+ 		public uint get_mode_group ();
+ 		public bool get_pad_event_details (out uint number, out uint mode, out double value);
+ 		[Version (since = "1.12")]
+-		public void get_position (Graphene.Point position);
++		public Graphene.Point get_position ();
+ 		[Version (since = "1.0")]
+ 		public unowned Clutter.Actor get_related ();
+ 		[Version (since = "1.10")]
+@@ -5752,7 +5766,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
+ 	public class FrameClock : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+-		public FrameClock (float refresh_rate, Clutter.FrameListenerIface iface, void* user_data);
++		protected FrameClock ();
+ 		public void add_timeline (Clutter.Timeline timeline);
+ 		public float get_refresh_rate ();
+ 		public void inhibit ();
+@@ -5850,6 +5864,18 @@ namespace Clutter {
+ 		public bool row_homogeneous { get; set; }
+ 		public uint row_spacing { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
+ 	[Version (since = "1.10")]
+ 	public class Image : GLib.Object, Clutter.Content {
+@@ -5874,7 +5900,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_axis_value ([CCode (array_length = false)] double[] axes, Clutter.InputAxis axis, out double value);
+ 		[Version (since = "1.12")]
+-		public bool get_coords (Clutter.EventSequence? sequence, Graphene.Point point);
++		public bool get_coords (Clutter.EventSequence? sequence, out Graphene.Point point);
+ 		[Version (since = "1.0")]
+ 		public int get_device_id ();
+ 		[Version (since = "1.6")]
+@@ -5904,13 +5930,13 @@ namespace Clutter {
+ 		public int get_n_mode_groups ();
+ 		public int get_n_rings ();
+ 		public int get_n_strips ();
++		[Version (since = "1.6")]
++		public GLib.List<weak Clutter.InputDevice> get_physical_devices ();
+ 		[Version (since = "1.2")]
+ 		public unowned Clutter.Stage get_pointer_stage ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_product_id ();
+ 		public unowned Clutter.Seat get_seat ();
+-		[Version (since = "1.6")]
+-		public GLib.List<weak Clutter.InputDevice> get_slave_devices ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_vendor_id ();
+ 		[Version (since = "1.10")]
+@@ -5987,7 +6013,7 @@ namespace Clutter {
+ 		public virtual void commit_text (string text);
+ 		[NoWrapper]
+ 		public virtual void delete_surrounding (int offset, uint len);
+-		public bool filter_key_event (Clutter.KeyEvent key);
++		public bool filter_event (Clutter.Event event);
+ 		[NoWrapper]
+ 		public virtual void focus_in (Clutter.InputMethod input_method);
+ 		[NoWrapper]
+@@ -6153,19 +6179,6 @@ namespace Clutter {
+ 		public unowned Clutter.LayoutManager get_manager ();
+ 		public Clutter.LayoutManager manager { get; construct; }
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.10")]
+-	public class Margin {
+-		public float bottom;
+-		public float left;
+-		public float right;
+-		public float top;
+-		[CCode (has_construct_function = false)]
+-		public Margin ();
+-		public Clutter.Margin copy ();
+-		public void free ();
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	[Compact]
+ 	[Version (since = "0.2")]
+@@ -6188,13 +6201,56 @@ namespace Clutter {
+ 		protected OffscreenEffect ();
+ 		public virtual Cogl.Handle create_texture (float width, float height);
+ 		[Version (since = "1.14")]
+-		public bool get_target_rect (out unowned Graphene.Rect rect);
++		public bool get_target_rect (out Graphene.Rect rect);
+ 		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
+ 		public bool get_target_size (out float width, out float height);
+ 		[Version (since = "1.10")]
+ 		public unowned Cogl.Handle get_texture ();
+ 		public virtual void paint_target (Clutter.PaintContext paint_context);
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public class PageTurnEffect : Clutter.DeformEffect {
+@@ -6236,37 +6292,6 @@ namespace Clutter {
+ 		public void set_name (string name);
+ 		public void unref ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.4")]
+-	public class PaintVolume {
+-		[Version (since = "1.6")]
+-		public Clutter.PaintVolume copy ();
+-		[Version (since = "1.6")]
+-		public void free ();
+-		[Version (since = "1.6")]
+-		public float get_depth ();
+-		[Version (since = "1.6")]
+-		public float get_height ();
+-		[Version (since = "1.6")]
+-		public void get_origin (out unowned Graphene.Point3D vertex);
+-		[Version (since = "1.6")]
+-		public float get_width ();
+-		[Version (since = "1.6")]
+-		public void set_depth (float depth);
+-		[Version (since = "1.6")]
+-		public bool set_from_allocation (Clutter.Actor actor);
+-		[Version (since = "1.6")]
+-		public void set_height (float height);
+-		[Version (since = "1.6")]
+-		public void set_origin (Graphene.Point3D origin);
+-		[Version (since = "1.6")]
+-		public void set_width (float width);
+-		[Version (since = "1.6")]
+-		public void union (Clutter.PaintVolume another_pv);
+-		[Version (since = "1.10")]
+-		public void union_box (Clutter.ActorBox box);
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
+ 	[Version (since = "1.12")]
+ 	public class PanAction : Clutter.GestureAction {
+@@ -6370,6 +6395,17 @@ namespace Clutter {
+ 		public void set_property_name (string? property_name);
+ 		public string property_name { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
+ 	public class RootNode : Clutter.PaintNode {
+ 		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
+@@ -6464,6 +6500,7 @@ namespace Clutter {
+ 		public virtual unowned Clutter.InputDevice get_pointer ();
+ 		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
+ 		public bool get_touch_mode ();
++		public virtual bool handle_device_event (Clutter.Event event);
+ 		public void inhibit_unfocus ();
+ 		public bool is_unfocus_inhibited ();
+ 		public GLib.List<weak Clutter.InputDevice> list_devices ();
+@@ -6588,7 +6625,7 @@ namespace Clutter {
+ 		[Version (since = "1.0")]
+ 		public void ensure_viewport ();
+ 		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
+-		public bool get_capture_final_size (Cairo.RectangleInt rect, int width, int height, float scale);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int width, out int height, out float scale);
+ 		public int64 get_frame_counter ();
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor get_key_focus ();
+@@ -6602,7 +6639,7 @@ namespace Clutter {
+ 		[Version (since = "0.4")]
+ 		public unowned string get_title ();
+ 		public bool get_use_alpha ();
+-		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, uint8 data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
+ 		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
+ 		[CCode (array_length = false)]
+ 		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
+@@ -6629,7 +6666,7 @@ namespace Clutter {
+ 		[Version (since = "1.20")]
+ 		public signal void after_paint (Clutter.StageView view);
+ 		public signal void after_update (Clutter.StageView view);
+-		public signal void before_paint (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
+ 		public signal void before_update (Clutter.StageView view);
+ 		[Version (since = "0.6")]
+ 		public virtual signal void deactivate ();
+@@ -6676,6 +6713,7 @@ namespace Clutter {
+ 		public void get_layout (Cairo.RectangleInt rect);
+ 		public virtual void get_offscreen_transformation_matrix (Cogl.Matrix matrix);
+ 		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
+ 		public float get_scale ();
+ 		public void invalidate_offscreen_blit_pipeline ();
+ 		[NoWrapper]
+@@ -6683,8 +6721,6 @@ namespace Clutter {
+ 		[NoWrapper]
+ 		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
+ 		[NoAccessorMethod]
+-		public Cairo.RectangleInt layout { owned get; set construct; }
+-		[NoAccessorMethod]
+ 		public string name { owned get; construct; }
+ 		[NoAccessorMethod]
+ 		public float refresh_rate { get; set construct; }
+@@ -6732,7 +6768,7 @@ namespace Clutter {
+ 		public Clutter.Color get_cursor_color ();
+ 		public int get_cursor_position ();
+ 		[Version (since = "1.16")]
+-		public void get_cursor_rect (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_cursor_rect ();
+ 		public uint get_cursor_size ();
+ 		public bool get_cursor_visible ();
+ 		public bool get_editable ();
+@@ -6916,7 +6952,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_auto_reverse ();
+ 		[Version (since = "1.12")]
+-		public bool get_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
+ 		[Version (since = "1.10")]
+ 		public int get_current_repeat ();
+ 		[Version (since = "0.4")]
+@@ -7108,8 +7144,8 @@ namespace Clutter {
+ 	public class ZoomAction : Clutter.GestureAction {
+ 		[CCode (has_construct_function = false, type = "ClutterAction*")]
+ 		public ZoomAction ();
+-		public void get_focal_point (Graphene.Point point);
+-		public void get_transformed_focal_point (Graphene.Point point);
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
+ 		public Clutter.ZoomAxis get_zoom_axis ();
+ 		public void set_zoom_axis (Clutter.ZoomAxis axis);
+ 		public Clutter.ZoomAxis zoom_axis { get; set; }
+@@ -7130,6 +7166,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
+ 	[Version (since = "0.4")]
+ 	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
+ 		[CCode (vfunc_name = "add")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public abstract void add_actor (Clutter.Actor actor);
+@@ -7141,21 +7178,20 @@ namespace Clutter {
+ 		public void child_set (Clutter.Actor actor, ...);
+ 		[Version (since = "0.8")]
+ 		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
+-		[Version (since = "0.8")]
+-		public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass klass, string property_name);
+-		[CCode (array_length_pos = 1.1, array_length_type = "guint")]
+-		[Version (since = "0.8")]
+-		public static GLib.ParamSpec[] class_list_child_properties (GLib.ObjectClass klass);
+ 		[Version (since = "1.2")]
+ 		public virtual void create_child_meta (Clutter.Actor actor);
+ 		[Version (since = "1.2")]
+ 		public virtual void destroy_child_meta (Clutter.Actor actor);
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
+ 		[Version (since = "0.8")]
+ 		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
+ 		[CCode (vfunc_name = "lower")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
+ 		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
+@@ -7256,9 +7292,9 @@ namespace Clutter {
+ 		public bool prev (out unowned Clutter.Actor child);
+ 		public void remove ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
+ 	public struct Capture {
+-		public weak Cairo.Surface image;
++		public Cairo.ImageSurface image;
+ 		public Cairo.RectangleInt rect;
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
+@@ -7277,11 +7313,12 @@ namespace Clutter {
+ 		public bool equal (Clutter.Color v2);
+ 		[Version (since = "0.2")]
+ 		public void free ();
+-		public static void from_hls (out Clutter.Color color, float hue, float luminance, float saturation);
+-		public static void from_pixel (out Clutter.Color color, uint32 pixel);
+-		[Version (since = "1.0")]
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
+ 		public static bool from_string (out Clutter.Color color, string str);
+-		[Version (since = "1.6")]
+ 		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
+ 		[Version (since = "1.0")]
+ 		public uint hash ();
+@@ -7290,6 +7327,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public Clutter.Color interpolate (Clutter.Color final, double progress);
+ 		public Clutter.Color lighten ();
++		public bool parse_string (string str);
+ 		public Clutter.Color shade (double factor);
+ 		public Clutter.Color subtract (Clutter.Color b);
+ 		public void to_hls (out float hue, out float luminance, out float saturation);
+@@ -7298,11 +7336,6 @@ namespace Clutter {
+ 		public string to_string ();
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct FrameListenerIface {
+-		public weak global::before_frame before_frame;
+-		public weak global::frame frame;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	public struct KbdA11ySettings {
+ 		public Clutter.KeyboardA11yFlags controls;
+ 		public int slowkeys_delay;
+@@ -7321,6 +7354,16 @@ namespace Clutter {
+ 		public bool equal (Clutter.Knot knot_b);
+ 		public void free ();
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "COGL_TYPE_MATRIX")]
+ 	public struct Matrix : Cogl.Matrix {
+ 		[Version (since = "1.12")]
+@@ -7335,45 +7378,35 @@ namespace Clutter {
+ 		[Version (since = "1.12")]
+ 		public unowned Clutter.Matrix? init_identity ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadButtonEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public uint32 button;
+-		public uint32 group;
+-		public weak Clutter.InputDevice device;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadRingEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource ring_source;
+-		public uint32 ring_number;
+-		public uint32 group;
+-		public double angle;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadStripEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource strip_source;
+-		public uint32 strip_number;
+-		public uint32 group;
+-		public double value;
+-		public uint32 mode;
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
+ 	[Version (since = "1.0")]
+@@ -7406,21 +7439,25 @@ namespace Clutter {
+ 		public int dwell_delay;
+ 		public int dwell_threshold;
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	[Version (since = "1.28")]
+-	public struct ProximityEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
+ 	[Version (since = "1.0")]
+ 	public struct Units {
+ 		public Clutter.Units? copy ();
+ 		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
+ 		public Clutter.UnitType get_unit_type ();
+ 		public float get_unit_value ();
+ 		public float to_pixels ();
+@@ -7638,6 +7675,11 @@ namespace Clutter {
+ 		PAD_BUTTON_RELEASE,
+ 		PAD_STRIP,
+ 		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
+ 		EVENT_LAST
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
+@@ -7787,8 +7829,8 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
+ 	[Version (since = "1.6")]
+ 	public enum InputMode {
+-		MASTER,
+-		SLAVE,
++		LOGICAL,
++		PHYSICAL,
+ 		FLOATING
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
+@@ -7889,7 +7931,8 @@ namespace Clutter {
+ 	public enum PaintFlag {
+ 		NONE,
+ 		NO_CURSORS,
+-		FORCE_CURSORS
++		FORCE_CURSORS,
++		CLEAR
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
+ 	[Version (since = "1.12")]
+@@ -8231,6 +8274,9 @@ namespace Clutter {
+ 	[Version (since = "1.0")]
+ 	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
+ 	[Version (since = "1.14")]
+ 	public static void disable_accessibility ();
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
+diff --git vapi/mutter-clutter-8-custom.vala vapi/mutter-clutter-8-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-8-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-8.deps vapi/mutter-clutter-8.deps
+new file mode 100644
+index 00000000..a03b108b
+--- /dev/null
++++ vapi/mutter-clutter-8.deps
+@@ -0,0 +1,5 @@
++atk
++cairo
++json-glib-1.0
++mutter-cogl-8
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-8.vapi vapi/mutter-clutter-8.vapi
+new file mode 100644
+index 00000000..e2fe5989
+--- /dev/null
++++ vapi/mutter-clutter-8.vapi
+@@ -0,0 +1,8279 @@
++/* mutter-clutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "8", lower_case_cprefix = "clutter_")]
++namespace Clutter {
++	namespace Key {
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_0")]
++		public const uint @0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_1")]
++		public const uint @1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_2")]
++		public const uint @2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3")]
++		public const uint @3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_AltCursor")]
++		public const uint @3270_AltCursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Attn")]
++		public const uint @3270_Attn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_BackTab")]
++		public const uint @3270_BackTab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ChangeScreen")]
++		public const uint @3270_ChangeScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Copy")]
++		public const uint @3270_Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorBlink")]
++		public const uint @3270_CursorBlink;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorSelect")]
++		public const uint @3270_CursorSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_DeleteWord")]
++		public const uint @3270_DeleteWord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Duplicate")]
++		public const uint @3270_Duplicate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Enter")]
++		public const uint @3270_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseEOF")]
++		public const uint @3270_EraseEOF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseInput")]
++		public const uint @3270_EraseInput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ExSelect")]
++		public const uint @3270_ExSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_FieldMark")]
++		public const uint @3270_FieldMark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Ident")]
++		public const uint @3270_Ident;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Jump")]
++		public const uint @3270_Jump;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_KeyClick")]
++		public const uint @3270_KeyClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Left2")]
++		public const uint @3270_Left2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA1")]
++		public const uint @3270_PA1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA2")]
++		public const uint @3270_PA2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA3")]
++		public const uint @3270_PA3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Play")]
++		public const uint @3270_Play;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PrintScreen")]
++		public const uint @3270_PrintScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Quit")]
++		public const uint @3270_Quit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Record")]
++		public const uint @3270_Record;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Reset")]
++		public const uint @3270_Reset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Right2")]
++		public const uint @3270_Right2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Rule")]
++		public const uint @3270_Rule;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Setup")]
++		public const uint @3270_Setup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Test")]
++		public const uint @3270_Test;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_4")]
++		public const uint @4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_5")]
++		public const uint @5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_6")]
++		public const uint @6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_7")]
++		public const uint @7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_8")]
++		public const uint @8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_9")]
++		public const uint @9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_A")]
++		public const uint A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AE")]
++		public const uint AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aacute")]
++		public const uint Aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abelowdot")]
++		public const uint Abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreve")]
++		public const uint Abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreveacute")]
++		public const uint Abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevebelowdot")]
++		public const uint Abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevegrave")]
++		public const uint Abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevehook")]
++		public const uint Abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevetilde")]
++		public const uint Abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Enable")]
++		public const uint AccessX_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Feedback_Enable")]
++		public const uint AccessX_Feedback_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflex")]
++		public const uint Acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexacute")]
++		public const uint Acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexbelowdot")]
++		public const uint Acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexgrave")]
++		public const uint Acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexhook")]
++		public const uint Acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflextilde")]
++		public const uint Acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AddFavorite")]
++		public const uint AddFavorite;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Adiaeresis")]
++		public const uint Adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Agrave")]
++		public const uint Agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ahook")]
++		public const uint Ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_L")]
++		public const uint Alt_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_R")]
++		public const uint Alt_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Amacron")]
++		public const uint Amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aogonek")]
++		public const uint Aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationLeft")]
++		public const uint ApplicationLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationRight")]
++		public const uint ApplicationRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_0")]
++		public const uint Arabic_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_1")]
++		public const uint Arabic_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_2")]
++		public const uint Arabic_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_3")]
++		public const uint Arabic_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_4")]
++		public const uint Arabic_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_5")]
++		public const uint Arabic_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_6")]
++		public const uint Arabic_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_7")]
++		public const uint Arabic_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_8")]
++		public const uint Arabic_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_9")]
++		public const uint Arabic_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ain")]
++		public const uint Arabic_ain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alef")]
++		public const uint Arabic_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alefmaksura")]
++		public const uint Arabic_alefmaksura;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_beh")]
++		public const uint Arabic_beh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_comma")]
++		public const uint Arabic_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dad")]
++		public const uint Arabic_dad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dal")]
++		public const uint Arabic_dal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_damma")]
++		public const uint Arabic_damma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dammatan")]
++		public const uint Arabic_dammatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ddal")]
++		public const uint Arabic_ddal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_farsi_yeh")]
++		public const uint Arabic_farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fatha")]
++		public const uint Arabic_fatha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fathatan")]
++		public const uint Arabic_fathatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_feh")]
++		public const uint Arabic_feh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fullstop")]
++		public const uint Arabic_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_gaf")]
++		public const uint Arabic_gaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ghain")]
++		public const uint Arabic_ghain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ha")]
++		public const uint Arabic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hah")]
++		public const uint Arabic_hah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza")]
++		public const uint Arabic_hamza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_above")]
++		public const uint Arabic_hamza_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_below")]
++		public const uint Arabic_hamza_below;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonalef")]
++		public const uint Arabic_hamzaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonwaw")]
++		public const uint Arabic_hamzaonwaw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonyeh")]
++		public const uint Arabic_hamzaonyeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaunderalef")]
++		public const uint Arabic_hamzaunderalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh")]
++		public const uint Arabic_heh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_doachashmee")]
++		public const uint Arabic_heh_doachashmee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_goal")]
++		public const uint Arabic_heh_goal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeem")]
++		public const uint Arabic_jeem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeh")]
++		public const uint Arabic_jeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kaf")]
++		public const uint Arabic_kaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasra")]
++		public const uint Arabic_kasra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasratan")]
++		public const uint Arabic_kasratan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_keheh")]
++		public const uint Arabic_keheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_khah")]
++		public const uint Arabic_khah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_lam")]
++		public const uint Arabic_lam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_madda_above")]
++		public const uint Arabic_madda_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_maddaonalef")]
++		public const uint Arabic_maddaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_meem")]
++		public const uint Arabic_meem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon")]
++		public const uint Arabic_noon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon_ghunna")]
++		public const uint Arabic_noon_ghunna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_peh")]
++		public const uint Arabic_peh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_percent")]
++		public const uint Arabic_percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_qaf")]
++		public const uint Arabic_qaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_question_mark")]
++		public const uint Arabic_question_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ra")]
++		public const uint Arabic_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_rreh")]
++		public const uint Arabic_rreh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sad")]
++		public const uint Arabic_sad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_seen")]
++		public const uint Arabic_seen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_semicolon")]
++		public const uint Arabic_semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_shadda")]
++		public const uint Arabic_shadda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sheen")]
++		public const uint Arabic_sheen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sukun")]
++		public const uint Arabic_sukun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_superscript_alef")]
++		public const uint Arabic_superscript_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_switch")]
++		public const uint Arabic_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tah")]
++		public const uint Arabic_tah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tatweel")]
++		public const uint Arabic_tatweel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tcheh")]
++		public const uint Arabic_tcheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_teh")]
++		public const uint Arabic_teh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tehmarbuta")]
++		public const uint Arabic_tehmarbuta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_thal")]
++		public const uint Arabic_thal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_theh")]
++		public const uint Arabic_theh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tteh")]
++		public const uint Arabic_tteh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_veh")]
++		public const uint Arabic_veh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_waw")]
++		public const uint Arabic_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh")]
++		public const uint Arabic_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh_baree")]
++		public const uint Arabic_yeh_baree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zah")]
++		public const uint Arabic_zah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zain")]
++		public const uint Arabic_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aring")]
++		public const uint Aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AT")]
++		public const uint Armenian_AT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AYB")]
++		public const uint Armenian_AYB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_BEN")]
++		public const uint Armenian_BEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_CHA")]
++		public const uint Armenian_CHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DA")]
++		public const uint Armenian_DA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DZA")]
++		public const uint Armenian_DZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_E")]
++		public const uint Armenian_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_FE")]
++		public const uint Armenian_FE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GHAT")]
++		public const uint Armenian_GHAT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GIM")]
++		public const uint Armenian_GIM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HI")]
++		public const uint Armenian_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HO")]
++		public const uint Armenian_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_INI")]
++		public const uint Armenian_INI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_JE")]
++		public const uint Armenian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KE")]
++		public const uint Armenian_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KEN")]
++		public const uint Armenian_KEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KHE")]
++		public const uint Armenian_KHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_LYUN")]
++		public const uint Armenian_LYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_MEN")]
++		public const uint Armenian_MEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_NU")]
++		public const uint Armenian_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_O")]
++		public const uint Armenian_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PE")]
++		public const uint Armenian_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PYUR")]
++		public const uint Armenian_PYUR;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RA")]
++		public const uint Armenian_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RE")]
++		public const uint Armenian_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SE")]
++		public const uint Armenian_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SHA")]
++		public const uint Armenian_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TCHE")]
++		public const uint Armenian_TCHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TO")]
++		public const uint Armenian_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSA")]
++		public const uint Armenian_TSA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSO")]
++		public const uint Armenian_TSO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TYUN")]
++		public const uint Armenian_TYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VEV")]
++		public const uint Armenian_VEV;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VO")]
++		public const uint Armenian_VO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VYUN")]
++		public const uint Armenian_VYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_YECH")]
++		public const uint Armenian_YECH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZA")]
++		public const uint Armenian_ZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZHE")]
++		public const uint Armenian_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_accent")]
++		public const uint Armenian_accent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_amanak")]
++		public const uint Armenian_amanak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_apostrophe")]
++		public const uint Armenian_apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_at")]
++		public const uint Armenian_at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ayb")]
++		public const uint Armenian_ayb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ben")]
++		public const uint Armenian_ben;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_but")]
++		public const uint Armenian_but;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_cha")]
++		public const uint Armenian_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_da")]
++		public const uint Armenian_da;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_dza")]
++		public const uint Armenian_dza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_e")]
++		public const uint Armenian_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_exclam")]
++		public const uint Armenian_exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_fe")]
++		public const uint Armenian_fe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_full_stop")]
++		public const uint Armenian_full_stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ghat")]
++		public const uint Armenian_ghat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_gim")]
++		public const uint Armenian_gim;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hi")]
++		public const uint Armenian_hi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ho")]
++		public const uint Armenian_ho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hyphen")]
++		public const uint Armenian_hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ini")]
++		public const uint Armenian_ini;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_je")]
++		public const uint Armenian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ke")]
++		public const uint Armenian_ke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ken")]
++		public const uint Armenian_ken;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_khe")]
++		public const uint Armenian_khe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ligature_ew")]
++		public const uint Armenian_ligature_ew;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_lyun")]
++		public const uint Armenian_lyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_men")]
++		public const uint Armenian_men;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_nu")]
++		public const uint Armenian_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_o")]
++		public const uint Armenian_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_paruyk")]
++		public const uint Armenian_paruyk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pe")]
++		public const uint Armenian_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pyur")]
++		public const uint Armenian_pyur;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_question")]
++		public const uint Armenian_question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ra")]
++		public const uint Armenian_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_re")]
++		public const uint Armenian_re;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_se")]
++		public const uint Armenian_se;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_separation_mark")]
++		public const uint Armenian_separation_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_sha")]
++		public const uint Armenian_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_shesht")]
++		public const uint Armenian_shesht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tche")]
++		public const uint Armenian_tche;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_to")]
++		public const uint Armenian_to;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tsa")]
++		public const uint Armenian_tsa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tso")]
++		public const uint Armenian_tso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tyun")]
++		public const uint Armenian_tyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_verjaket")]
++		public const uint Armenian_verjaket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vev")]
++		public const uint Armenian_vev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vo")]
++		public const uint Armenian_vo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vyun")]
++		public const uint Armenian_vyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yech")]
++		public const uint Armenian_yech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yentamna")]
++		public const uint Armenian_yentamna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_za")]
++		public const uint Armenian_za;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_zhe")]
++		public const uint Armenian_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Atilde")]
++		public const uint Atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudibleBell_Enable")]
++		public const uint AudibleBell_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioCycleTrack")]
++		public const uint AudioCycleTrack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioForward")]
++		public const uint AudioForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioLowerVolume")]
++		public const uint AudioLowerVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMedia")]
++		public const uint AudioMedia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMicMute")]
++		public const uint AudioMicMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMute")]
++		public const uint AudioMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioNext")]
++		public const uint AudioNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPause")]
++		public const uint AudioPause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPlay")]
++		public const uint AudioPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPrev")]
++		public const uint AudioPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRaiseVolume")]
++		public const uint AudioRaiseVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRandomPlay")]
++		public const uint AudioRandomPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRecord")]
++		public const uint AudioRecord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRepeat")]
++		public const uint AudioRepeat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRewind")]
++		public const uint AudioRewind;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioStop")]
++		public const uint AudioStop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Away")]
++		public const uint Away;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_B")]
++		public const uint B;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Babovedot")]
++		public const uint Babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Back")]
++		public const uint Back;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackForward")]
++		public const uint BackForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackSpace")]
++		public const uint BackSpace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Battery")]
++		public const uint Battery;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Begin")]
++		public const uint Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Blue")]
++		public const uint Blue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Bluetooth")]
++		public const uint Bluetooth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Book")]
++		public const uint Book;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BounceKeys_Enable")]
++		public const uint BounceKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Break")]
++		public const uint Break;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BrightnessAdjust")]
++		public const uint BrightnessAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_SHORTU")]
++		public const uint Byelorussian_SHORTU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_shortu")]
++		public const uint Byelorussian_shortu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C")]
++		public const uint C;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CD")]
++		public const uint CD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CH")]
++		public const uint CH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_H")]
++		public const uint C_H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_h")]
++		public const uint C_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cabovedot")]
++		public const uint Cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cacute")]
++		public const uint Cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calculator")]
++		public const uint Calculator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calendar")]
++		public const uint Calendar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cancel")]
++		public const uint Cancel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Caps_Lock")]
++		public const uint Caps_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccaron")]
++		public const uint Ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccedilla")]
++		public const uint Ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccircumflex")]
++		public const uint Ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ch")]
++		public const uint Ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Clear")]
++		public const uint Clear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ClearGrab")]
++		public const uint ClearGrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Close")]
++		public const uint Close;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Codeinput")]
++		public const uint Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ColonSign")]
++		public const uint ColonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Community")]
++		public const uint Community;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ContrastAdjust")]
++		public const uint ContrastAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_L")]
++		public const uint Control_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_R")]
++		public const uint Control_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Copy")]
++		public const uint Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CruzeiroSign")]
++		public const uint CruzeiroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cut")]
++		public const uint Cut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CycleAngle")]
++		public const uint CycleAngle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_A")]
++		public const uint Cyrillic_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_BE")]
++		public const uint Cyrillic_BE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE")]
++		public const uint Cyrillic_CHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_descender")]
++		public const uint Cyrillic_CHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_vertstroke")]
++		public const uint Cyrillic_CHE_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DE")]
++		public const uint Cyrillic_DE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DZHE")]
++		public const uint Cyrillic_DZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_E")]
++		public const uint Cyrillic_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EF")]
++		public const uint Cyrillic_EF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EL")]
++		public const uint Cyrillic_EL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EM")]
++		public const uint Cyrillic_EM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN")]
++		public const uint Cyrillic_EN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN_descender")]
++		public const uint Cyrillic_EN_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ER")]
++		public const uint Cyrillic_ER;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ES")]
++		public const uint Cyrillic_ES;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE")]
++		public const uint Cyrillic_GHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE_bar")]
++		public const uint Cyrillic_GHE_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA")]
++		public const uint Cyrillic_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HARDSIGN")]
++		public const uint Cyrillic_HARDSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA_descender")]
++		public const uint Cyrillic_HA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I")]
++		public const uint Cyrillic_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IE")]
++		public const uint Cyrillic_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IO")]
++		public const uint Cyrillic_IO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I_macron")]
++		public const uint Cyrillic_I_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_JE")]
++		public const uint Cyrillic_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA")]
++		public const uint Cyrillic_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_descender")]
++		public const uint Cyrillic_KA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_vertstroke")]
++		public const uint Cyrillic_KA_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_LJE")]
++		public const uint Cyrillic_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_NJE")]
++		public const uint Cyrillic_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O")]
++		public const uint Cyrillic_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O_bar")]
++		public const uint Cyrillic_O_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_PE")]
++		public const uint Cyrillic_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SCHWA")]
++		public const uint Cyrillic_SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHA")]
++		public const uint Cyrillic_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHCHA")]
++		public const uint Cyrillic_SHCHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHHA")]
++		public const uint Cyrillic_SHHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHORTI")]
++		public const uint Cyrillic_SHORTI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SOFTSIGN")]
++		public const uint Cyrillic_SOFTSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TE")]
++		public const uint Cyrillic_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TSE")]
++		public const uint Cyrillic_TSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U")]
++		public const uint Cyrillic_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_macron")]
++		public const uint Cyrillic_U_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight")]
++		public const uint Cyrillic_U_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight_bar")]
++		public const uint Cyrillic_U_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_VE")]
++		public const uint Cyrillic_VE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YA")]
++		public const uint Cyrillic_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YERU")]
++		public const uint Cyrillic_YERU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YU")]
++		public const uint Cyrillic_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZE")]
++		public const uint Cyrillic_ZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE")]
++		public const uint Cyrillic_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE_descender")]
++		public const uint Cyrillic_ZHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_a")]
++		public const uint Cyrillic_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_be")]
++		public const uint Cyrillic_be;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che")]
++		public const uint Cyrillic_che;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_descender")]
++		public const uint Cyrillic_che_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_vertstroke")]
++		public const uint Cyrillic_che_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_de")]
++		public const uint Cyrillic_de;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_dzhe")]
++		public const uint Cyrillic_dzhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_e")]
++		public const uint Cyrillic_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ef")]
++		public const uint Cyrillic_ef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_el")]
++		public const uint Cyrillic_el;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_em")]
++		public const uint Cyrillic_em;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en")]
++		public const uint Cyrillic_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en_descender")]
++		public const uint Cyrillic_en_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_er")]
++		public const uint Cyrillic_er;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_es")]
++		public const uint Cyrillic_es;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe")]
++		public const uint Cyrillic_ghe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe_bar")]
++		public const uint Cyrillic_ghe_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha")]
++		public const uint Cyrillic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha_descender")]
++		public const uint Cyrillic_ha_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_hardsign")]
++		public const uint Cyrillic_hardsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i")]
++		public const uint Cyrillic_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i_macron")]
++		public const uint Cyrillic_i_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ie")]
++		public const uint Cyrillic_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_io")]
++		public const uint Cyrillic_io;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_je")]
++		public const uint Cyrillic_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka")]
++		public const uint Cyrillic_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_descender")]
++		public const uint Cyrillic_ka_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_vertstroke")]
++		public const uint Cyrillic_ka_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_lje")]
++		public const uint Cyrillic_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_nje")]
++		public const uint Cyrillic_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o")]
++		public const uint Cyrillic_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o_bar")]
++		public const uint Cyrillic_o_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_pe")]
++		public const uint Cyrillic_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_schwa")]
++		public const uint Cyrillic_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_sha")]
++		public const uint Cyrillic_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shcha")]
++		public const uint Cyrillic_shcha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shha")]
++		public const uint Cyrillic_shha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shorti")]
++		public const uint Cyrillic_shorti;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_softsign")]
++		public const uint Cyrillic_softsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_te")]
++		public const uint Cyrillic_te;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_tse")]
++		public const uint Cyrillic_tse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u")]
++		public const uint Cyrillic_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_macron")]
++		public const uint Cyrillic_u_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight")]
++		public const uint Cyrillic_u_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight_bar")]
++		public const uint Cyrillic_u_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ve")]
++		public const uint Cyrillic_ve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ya")]
++		public const uint Cyrillic_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yeru")]
++		public const uint Cyrillic_yeru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yu")]
++		public const uint Cyrillic_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ze")]
++		public const uint Cyrillic_ze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe")]
++		public const uint Cyrillic_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe_descender")]
++		public const uint Cyrillic_zhe_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_D")]
++		public const uint D;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DOS")]
++		public const uint DOS;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dabovedot")]
++		public const uint Dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dcaron")]
++		public const uint Dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Delete")]
++		public const uint Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Display")]
++		public const uint Display;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Documents")]
++		public const uint Documents;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DongSign")]
++		public const uint DongSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Down")]
++		public const uint Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dstroke")]
++		public const uint Dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_E")]
++		public const uint E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ENG")]
++		public const uint ENG;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ETH")]
++		public const uint ETH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EZH")]
++		public const uint EZH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eabovedot")]
++		public const uint Eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eacute")]
++		public const uint Eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ebelowdot")]
++		public const uint Ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecaron")]
++		public const uint Ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflex")]
++		public const uint Ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexacute")]
++		public const uint Ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexbelowdot")]
++		public const uint Ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexgrave")]
++		public const uint Ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexhook")]
++		public const uint Ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflextilde")]
++		public const uint Ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EcuSign")]
++		public const uint EcuSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ediaeresis")]
++		public const uint Ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Egrave")]
++		public const uint Egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ehook")]
++		public const uint Ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_Shift")]
++		public const uint Eisu_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_toggle")]
++		public const uint Eisu_toggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eject")]
++		public const uint Eject;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Emacron")]
++		public const uint Emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_End")]
++		public const uint End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eogonek")]
++		public const uint Eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Escape")]
++		public const uint Escape;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eth")]
++		public const uint Eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Etilde")]
++		public const uint Etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EuroSign")]
++		public const uint EuroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Excel")]
++		public const uint Excel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Execute")]
++		public const uint Execute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Explorer")]
++		public const uint Explorer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F")]
++		public const uint F;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F1")]
++		public const uint F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F10")]
++		public const uint F10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F11")]
++		public const uint F11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F12")]
++		public const uint F12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F13")]
++		public const uint F13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F14")]
++		public const uint F14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F15")]
++		public const uint F15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F16")]
++		public const uint F16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F17")]
++		public const uint F17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F18")]
++		public const uint F18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F19")]
++		public const uint F19;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F2")]
++		public const uint F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F20")]
++		public const uint F20;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F21")]
++		public const uint F21;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F22")]
++		public const uint F22;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F23")]
++		public const uint F23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F24")]
++		public const uint F24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F25")]
++		public const uint F25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F26")]
++		public const uint F26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F27")]
++		public const uint F27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F28")]
++		public const uint F28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F29")]
++		public const uint F29;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F3")]
++		public const uint F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F30")]
++		public const uint F30;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F31")]
++		public const uint F31;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F32")]
++		public const uint F32;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F33")]
++		public const uint F33;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F34")]
++		public const uint F34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F35")]
++		public const uint F35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F4")]
++		public const uint F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F5")]
++		public const uint F5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F6")]
++		public const uint F6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F7")]
++		public const uint F7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F8")]
++		public const uint F8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F9")]
++		public const uint F9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FFrancSign")]
++		public const uint FFrancSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Fabovedot")]
++		public const uint Fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_0")]
++		public const uint Farsi_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_1")]
++		public const uint Farsi_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_2")]
++		public const uint Farsi_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_3")]
++		public const uint Farsi_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_4")]
++		public const uint Farsi_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_5")]
++		public const uint Farsi_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_6")]
++		public const uint Farsi_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_7")]
++		public const uint Farsi_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_8")]
++		public const uint Farsi_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_9")]
++		public const uint Farsi_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_yeh")]
++		public const uint Farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Favorites")]
++		public const uint Favorites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Finance")]
++		public const uint Finance;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Find")]
++		public const uint Find;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_First_Virtual_Screen")]
++		public const uint First_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Forward")]
++		public const uint Forward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameBack")]
++		public const uint FrameBack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameForward")]
++		public const uint FrameForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_G")]
++		public const uint G;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gabovedot")]
++		public const uint Gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Game")]
++		public const uint Game;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gbreve")]
++		public const uint Gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcaron")]
++		public const uint Gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcedilla")]
++		public const uint Gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcircumflex")]
++		public const uint Gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_an")]
++		public const uint Georgian_an;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ban")]
++		public const uint Georgian_ban;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_can")]
++		public const uint Georgian_can;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_char")]
++		public const uint Georgian_char;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_chin")]
++		public const uint Georgian_chin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_cil")]
++		public const uint Georgian_cil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_don")]
++		public const uint Georgian_don;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_en")]
++		public const uint Georgian_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_fi")]
++		public const uint Georgian_fi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_gan")]
++		public const uint Georgian_gan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ghan")]
++		public const uint Georgian_ghan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hae")]
++		public const uint Georgian_hae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_har")]
++		public const uint Georgian_har;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_he")]
++		public const uint Georgian_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hie")]
++		public const uint Georgian_hie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hoe")]
++		public const uint Georgian_hoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_in")]
++		public const uint Georgian_in;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jhan")]
++		public const uint Georgian_jhan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jil")]
++		public const uint Georgian_jil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_kan")]
++		public const uint Georgian_kan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_khar")]
++		public const uint Georgian_khar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_las")]
++		public const uint Georgian_las;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_man")]
++		public const uint Georgian_man;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_nar")]
++		public const uint Georgian_nar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_on")]
++		public const uint Georgian_on;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_par")]
++		public const uint Georgian_par;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_phar")]
++		public const uint Georgian_phar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_qar")]
++		public const uint Georgian_qar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_rae")]
++		public const uint Georgian_rae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_san")]
++		public const uint Georgian_san;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_shin")]
++		public const uint Georgian_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tan")]
++		public const uint Georgian_tan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tar")]
++		public const uint Georgian_tar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_un")]
++		public const uint Georgian_un;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_vin")]
++		public const uint Georgian_vin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_we")]
++		public const uint Georgian_we;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_xan")]
++		public const uint Georgian_xan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zen")]
++		public const uint Georgian_zen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zhar")]
++		public const uint Georgian_zhar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Go")]
++		public const uint Go;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHA")]
++		public const uint Greek_ALPHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHAaccent")]
++		public const uint Greek_ALPHAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_BETA")]
++		public const uint Greek_BETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_CHI")]
++		public const uint Greek_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_DELTA")]
++		public const uint Greek_DELTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILON")]
++		public const uint Greek_EPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILONaccent")]
++		public const uint Greek_EPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETA")]
++		public const uint Greek_ETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETAaccent")]
++		public const uint Greek_ETAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_GAMMA")]
++		public const uint Greek_GAMMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTA")]
++		public const uint Greek_IOTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAaccent")]
++		public const uint Greek_IOTAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdiaeresis")]
++		public const uint Greek_IOTAdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdieresis")]
++		public const uint Greek_IOTAdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_KAPPA")]
++		public const uint Greek_KAPPA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMBDA")]
++		public const uint Greek_LAMBDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMDA")]
++		public const uint Greek_LAMDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_MU")]
++		public const uint Greek_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_NU")]
++		public const uint Greek_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGA")]
++		public const uint Greek_OMEGA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGAaccent")]
++		public const uint Greek_OMEGAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRON")]
++		public const uint Greek_OMICRON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRONaccent")]
++		public const uint Greek_OMICRONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PHI")]
++		public const uint Greek_PHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PI")]
++		public const uint Greek_PI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PSI")]
++		public const uint Greek_PSI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_RHO")]
++		public const uint Greek_RHO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_SIGMA")]
++		public const uint Greek_SIGMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_TAU")]
++		public const uint Greek_TAU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_THETA")]
++		public const uint Greek_THETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILON")]
++		public const uint Greek_UPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONaccent")]
++		public const uint Greek_UPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONdieresis")]
++		public const uint Greek_UPSILONdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_XI")]
++		public const uint Greek_XI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ZETA")]
++		public const uint Greek_ZETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_accentdieresis")]
++		public const uint Greek_accentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alpha")]
++		public const uint Greek_alpha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alphaaccent")]
++		public const uint Greek_alphaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_beta")]
++		public const uint Greek_beta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_chi")]
++		public const uint Greek_chi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_delta")]
++		public const uint Greek_delta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilon")]
++		public const uint Greek_epsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilonaccent")]
++		public const uint Greek_epsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_eta")]
++		public const uint Greek_eta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_etaaccent")]
++		public const uint Greek_etaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_finalsmallsigma")]
++		public const uint Greek_finalsmallsigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_gamma")]
++		public const uint Greek_gamma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_horizbar")]
++		public const uint Greek_horizbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iota")]
++		public const uint Greek_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccent")]
++		public const uint Greek_iotaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccentdieresis")]
++		public const uint Greek_iotaaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotadieresis")]
++		public const uint Greek_iotadieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_kappa")]
++		public const uint Greek_kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lambda")]
++		public const uint Greek_lambda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lamda")]
++		public const uint Greek_lamda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_mu")]
++		public const uint Greek_mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_nu")]
++		public const uint Greek_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omega")]
++		public const uint Greek_omega;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omegaaccent")]
++		public const uint Greek_omegaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicron")]
++		public const uint Greek_omicron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicronaccent")]
++		public const uint Greek_omicronaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_phi")]
++		public const uint Greek_phi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_pi")]
++		public const uint Greek_pi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_psi")]
++		public const uint Greek_psi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_rho")]
++		public const uint Greek_rho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_sigma")]
++		public const uint Greek_sigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_switch")]
++		public const uint Greek_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_tau")]
++		public const uint Greek_tau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_theta")]
++		public const uint Greek_theta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilon")]
++		public const uint Greek_upsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccent")]
++		public const uint Greek_upsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccentdieresis")]
++		public const uint Greek_upsilonaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilondieresis")]
++		public const uint Greek_upsilondieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_xi")]
++		public const uint Greek_xi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_zeta")]
++		public const uint Greek_zeta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Green")]
++		public const uint Green;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_H")]
++		public const uint H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul")]
++		public const uint Hangul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_A")]
++		public const uint Hangul_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AE")]
++		public const uint Hangul_AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeA")]
++		public const uint Hangul_AraeA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeAE")]
++		public const uint Hangul_AraeAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Banja")]
++		public const uint Hangul_Banja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Cieuc")]
++		public const uint Hangul_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Codeinput")]
++		public const uint Hangul_Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Dikeud")]
++		public const uint Hangul_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_E")]
++		public const uint Hangul_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EO")]
++		public const uint Hangul_EO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EU")]
++		public const uint Hangul_EU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_End")]
++		public const uint Hangul_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hanja")]
++		public const uint Hangul_Hanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hieuh")]
++		public const uint Hangul_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_I")]
++		public const uint Hangul_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Ieung")]
++		public const uint Hangul_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Cieuc")]
++		public const uint Hangul_J_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Dikeud")]
++		public const uint Hangul_J_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Hieuh")]
++		public const uint Hangul_J_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Ieung")]
++		public const uint Hangul_J_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Jieuj")]
++		public const uint Hangul_J_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Khieuq")]
++		public const uint Hangul_J_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Kiyeog")]
++		public const uint Hangul_J_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KiyeogSios")]
++		public const uint Hangul_J_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KkogjiDalrinIeung")]
++		public const uint Hangul_J_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Mieum")]
++		public const uint Hangul_J_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Nieun")]
++		public const uint Hangul_J_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunHieuh")]
++		public const uint Hangul_J_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunJieuj")]
++		public const uint Hangul_J_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PanSios")]
++		public const uint Hangul_J_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Phieuf")]
++		public const uint Hangul_J_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Pieub")]
++		public const uint Hangul_J_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PieubSios")]
++		public const uint Hangul_J_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Rieul")]
++		public const uint Hangul_J_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulHieuh")]
++		public const uint Hangul_J_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulKiyeog")]
++		public const uint Hangul_J_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulMieum")]
++		public const uint Hangul_J_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPhieuf")]
++		public const uint Hangul_J_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPieub")]
++		public const uint Hangul_J_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulSios")]
++		public const uint Hangul_J_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulTieut")]
++		public const uint Hangul_J_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Sios")]
++		public const uint Hangul_J_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangKiyeog")]
++		public const uint Hangul_J_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangSios")]
++		public const uint Hangul_J_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Tieut")]
++		public const uint Hangul_J_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_YeorinHieuh")]
++		public const uint Hangul_J_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jamo")]
++		public const uint Hangul_Jamo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jeonja")]
++		public const uint Hangul_Jeonja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jieuj")]
++		public const uint Hangul_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Khieuq")]
++		public const uint Hangul_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Kiyeog")]
++		public const uint Hangul_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KiyeogSios")]
++		public const uint Hangul_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KkogjiDalrinIeung")]
++		public const uint Hangul_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Mieum")]
++		public const uint Hangul_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_MultipleCandidate")]
++		public const uint Hangul_MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Nieun")]
++		public const uint Hangul_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunHieuh")]
++		public const uint Hangul_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunJieuj")]
++		public const uint Hangul_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_O")]
++		public const uint Hangul_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_OE")]
++		public const uint Hangul_OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PanSios")]
++		public const uint Hangul_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Phieuf")]
++		public const uint Hangul_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Pieub")]
++		public const uint Hangul_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PieubSios")]
++		public const uint Hangul_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PostHanja")]
++		public const uint Hangul_PostHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreHanja")]
++		public const uint Hangul_PreHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreviousCandidate")]
++		public const uint Hangul_PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Rieul")]
++		public const uint Hangul_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulHieuh")]
++		public const uint Hangul_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulKiyeog")]
++		public const uint Hangul_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulMieum")]
++		public const uint Hangul_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPhieuf")]
++		public const uint Hangul_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPieub")]
++		public const uint Hangul_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulSios")]
++		public const uint Hangul_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulTieut")]
++		public const uint Hangul_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulYeorinHieuh")]
++		public const uint Hangul_RieulYeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Romaja")]
++		public const uint Hangul_Romaja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SingleCandidate")]
++		public const uint Hangul_SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Sios")]
++		public const uint Hangul_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Special")]
++		public const uint Hangul_Special;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangDikeud")]
++		public const uint Hangul_SsangDikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangJieuj")]
++		public const uint Hangul_SsangJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangKiyeog")]
++		public const uint Hangul_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangPieub")]
++		public const uint Hangul_SsangPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangSios")]
++		public const uint Hangul_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Start")]
++		public const uint Hangul_Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumMieum")]
++		public const uint Hangul_SunkyeongeumMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPhieuf")]
++		public const uint Hangul_SunkyeongeumPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPieub")]
++		public const uint Hangul_SunkyeongeumPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Tieut")]
++		public const uint Hangul_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_U")]
++		public const uint Hangul_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WA")]
++		public const uint Hangul_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WAE")]
++		public const uint Hangul_WAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WE")]
++		public const uint Hangul_WE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WEO")]
++		public const uint Hangul_WEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WI")]
++		public const uint Hangul_WI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YA")]
++		public const uint Hangul_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YAE")]
++		public const uint Hangul_YAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YE")]
++		public const uint Hangul_YE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YEO")]
++		public const uint Hangul_YEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YI")]
++		public const uint Hangul_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YO")]
++		public const uint Hangul_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YU")]
++		public const uint Hangul_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YeorinHieuh")]
++		public const uint Hangul_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_switch")]
++		public const uint Hangul_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hankaku")]
++		public const uint Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hcircumflex")]
++		public const uint Hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hebrew_switch")]
++		public const uint Hebrew_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Help")]
++		public const uint Help;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan")]
++		public const uint Henkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan_Mode")]
++		public const uint Henkan_Mode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hibernate")]
++		public const uint Hibernate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana")]
++		public const uint Hiragana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana_Katakana")]
++		public const uint Hiragana_Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_History")]
++		public const uint History;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Home")]
++		public const uint Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HomePage")]
++		public const uint HomePage;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HotLinks")]
++		public const uint HotLinks;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hstroke")]
++		public const uint Hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_L")]
++		public const uint Hyper_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_R")]
++		public const uint Hyper_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_I")]
++		public const uint I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Center_Object")]
++		public const uint ISO_Center_Object;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Continuous_Underline")]
++		public const uint ISO_Continuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Discontinuous_Underline")]
++		public const uint ISO_Discontinuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Emphasize")]
++		public const uint ISO_Emphasize;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Enter")]
++		public const uint ISO_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Down")]
++		public const uint ISO_Fast_Cursor_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Left")]
++		public const uint ISO_Fast_Cursor_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Right")]
++		public const uint ISO_Fast_Cursor_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Up")]
++		public const uint ISO_Fast_Cursor_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group")]
++		public const uint ISO_First_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group_Lock")]
++		public const uint ISO_First_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Latch")]
++		public const uint ISO_Group_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Lock")]
++		public const uint ISO_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Shift")]
++		public const uint ISO_Group_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group")]
++		public const uint ISO_Last_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group_Lock")]
++		public const uint ISO_Last_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Left_Tab")]
++		public const uint ISO_Left_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level2_Latch")]
++		public const uint ISO_Level2_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Latch")]
++		public const uint ISO_Level3_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Lock")]
++		public const uint ISO_Level3_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Shift")]
++		public const uint ISO_Level3_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Latch")]
++		public const uint ISO_Level5_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Lock")]
++		public const uint ISO_Level5_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Shift")]
++		public const uint ISO_Level5_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Lock")]
++		public const uint ISO_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Down")]
++		public const uint ISO_Move_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Up")]
++		public const uint ISO_Move_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group")]
++		public const uint ISO_Next_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group_Lock")]
++		public const uint ISO_Next_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Down")]
++		public const uint ISO_Partial_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Up")]
++		public const uint ISO_Partial_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Left")]
++		public const uint ISO_Partial_Space_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Right")]
++		public const uint ISO_Partial_Space_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group")]
++		public const uint ISO_Prev_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group_Lock")]
++		public const uint ISO_Prev_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Both_Margins")]
++		public const uint ISO_Release_Both_Margins;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Left")]
++		public const uint ISO_Release_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Right")]
++		public const uint ISO_Release_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Left")]
++		public const uint ISO_Set_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Right")]
++		public const uint ISO_Set_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iabovedot")]
++		public const uint Iabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iacute")]
++		public const uint Iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibelowdot")]
++		public const uint Ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibreve")]
++		public const uint Ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Icircumflex")]
++		public const uint Icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Idiaeresis")]
++		public const uint Idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Igrave")]
++		public const uint Igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ihook")]
++		public const uint Ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Imacron")]
++		public const uint Imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Insert")]
++		public const uint Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iogonek")]
++		public const uint Iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Itilde")]
++		public const uint Itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_J")]
++		public const uint J;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Jcircumflex")]
++		public const uint Jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_K")]
++		public const uint K;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_0")]
++		public const uint KP_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_1")]
++		public const uint KP_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_2")]
++		public const uint KP_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_3")]
++		public const uint KP_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_4")]
++		public const uint KP_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_5")]
++		public const uint KP_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_6")]
++		public const uint KP_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_7")]
++		public const uint KP_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_8")]
++		public const uint KP_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_9")]
++		public const uint KP_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Add")]
++		public const uint KP_Add;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Begin")]
++		public const uint KP_Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Decimal")]
++		public const uint KP_Decimal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Delete")]
++		public const uint KP_Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Divide")]
++		public const uint KP_Divide;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Down")]
++		public const uint KP_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_End")]
++		public const uint KP_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Enter")]
++		public const uint KP_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Equal")]
++		public const uint KP_Equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F1")]
++		public const uint KP_F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F2")]
++		public const uint KP_F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F3")]
++		public const uint KP_F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F4")]
++		public const uint KP_F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Home")]
++		public const uint KP_Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Insert")]
++		public const uint KP_Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Left")]
++		public const uint KP_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Multiply")]
++		public const uint KP_Multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Next")]
++		public const uint KP_Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Down")]
++		public const uint KP_Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Up")]
++		public const uint KP_Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Prior")]
++		public const uint KP_Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Right")]
++		public const uint KP_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Separator")]
++		public const uint KP_Separator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Space")]
++		public const uint KP_Space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Subtract")]
++		public const uint KP_Subtract;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Tab")]
++		public const uint KP_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Up")]
++		public const uint KP_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Lock")]
++		public const uint Kana_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Shift")]
++		public const uint Kana_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji")]
++		public const uint Kanji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji_Bangou")]
++		public const uint Kanji_Bangou;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Katakana")]
++		public const uint Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessDown")]
++		public const uint KbdBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessUp")]
++		public const uint KbdBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdLightOnOff")]
++		public const uint KbdLightOnOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kcedilla")]
++		public const uint Kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Korean_Won")]
++		public const uint Korean_Won;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L")]
++		public const uint L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L1")]
++		public const uint L1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L10")]
++		public const uint L10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L2")]
++		public const uint L2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L3")]
++		public const uint L3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L4")]
++		public const uint L4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L5")]
++		public const uint L5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L6")]
++		public const uint L6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L7")]
++		public const uint L7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L8")]
++		public const uint L8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L9")]
++		public const uint L9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lacute")]
++		public const uint Lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Last_Virtual_Screen")]
++		public const uint Last_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch0")]
++		public const uint Launch0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch1")]
++		public const uint Launch1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch2")]
++		public const uint Launch2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch3")]
++		public const uint Launch3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch4")]
++		public const uint Launch4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch5")]
++		public const uint Launch5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch6")]
++		public const uint Launch6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch7")]
++		public const uint Launch7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch8")]
++		public const uint Launch8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch9")]
++		public const uint Launch9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchA")]
++		public const uint LaunchA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchB")]
++		public const uint LaunchB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchC")]
++		public const uint LaunchC;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchD")]
++		public const uint LaunchD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchE")]
++		public const uint LaunchE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchF")]
++		public const uint LaunchF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lbelowdot")]
++		public const uint Lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcaron")]
++		public const uint Lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcedilla")]
++		public const uint Lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Left")]
++		public const uint Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LightBulb")]
++		public const uint LightBulb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Linefeed")]
++		public const uint Linefeed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LiraSign")]
++		public const uint LiraSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogGrabInfo")]
++		public const uint LogGrabInfo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogOff")]
++		public const uint LogOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogWindowTree")]
++		public const uint LogWindowTree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lstroke")]
++		public const uint Lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_M")]
++		public const uint M;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mabovedot")]
++		public const uint Mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_DSE")]
++		public const uint Macedonia_DSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_GJE")]
++		public const uint Macedonia_GJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_KJE")]
++		public const uint Macedonia_KJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_dse")]
++		public const uint Macedonia_dse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_gje")]
++		public const uint Macedonia_gje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_kje")]
++		public const uint Macedonia_kje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mae_Koho")]
++		public const uint Mae_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mail")]
++		public const uint Mail;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MailForward")]
++		public const uint MailForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Market")]
++		public const uint Market;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Massyo")]
++		public const uint Massyo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meeting")]
++		public const uint Meeting;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Memo")]
++		public const uint Memo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Menu")]
++		public const uint Menu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuKB")]
++		public const uint MenuKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuPB")]
++		public const uint MenuPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Messenger")]
++		public const uint Messenger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_L")]
++		public const uint Meta_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_R")]
++		public const uint Meta_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MillSign")]
++		public const uint MillSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ModeLock")]
++		public const uint ModeLock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mode_switch")]
++		public const uint Mode_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessDown")]
++		public const uint MonBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessUp")]
++		public const uint MonBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Accel_Enable")]
++		public const uint MouseKeys_Accel_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Enable")]
++		public const uint MouseKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Muhenkan")]
++		public const uint Muhenkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Multi_key")]
++		public const uint Multi_key;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MultipleCandidate")]
++		public const uint MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Music")]
++		public const uint Music;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MyComputer")]
++		public const uint MyComputer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MySites")]
++		public const uint MySites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_N")]
++		public const uint N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Nacute")]
++		public const uint Nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NairaSign")]
++		public const uint NairaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncaron")]
++		public const uint Ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncedilla")]
++		public const uint Ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_New")]
++		public const uint New;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NewSheqelSign")]
++		public const uint NewSheqelSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_News")]
++		public const uint News;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next")]
++		public const uint Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_VMode")]
++		public const uint Next_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_Virtual_Screen")]
++		public const uint Next_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ntilde")]
++		public const uint Ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Num_Lock")]
++		public const uint Num_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_O")]
++		public const uint O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OE")]
++		public const uint OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oacute")]
++		public const uint Oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obarred")]
++		public const uint Obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obelowdot")]
++		public const uint Obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocaron")]
++		public const uint Ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflex")]
++		public const uint Ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexacute")]
++		public const uint Ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexbelowdot")]
++		public const uint Ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexgrave")]
++		public const uint Ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexhook")]
++		public const uint Ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflextilde")]
++		public const uint Ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odiaeresis")]
++		public const uint Odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odoubleacute")]
++		public const uint Odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OfficeHome")]
++		public const uint OfficeHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ograve")]
++		public const uint Ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohook")]
++		public const uint Ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorn")]
++		public const uint Ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornacute")]
++		public const uint Ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornbelowdot")]
++		public const uint Ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorngrave")]
++		public const uint Ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornhook")]
++		public const uint Ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorntilde")]
++		public const uint Ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Omacron")]
++		public const uint Omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ooblique")]
++		public const uint Ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Open")]
++		public const uint Open;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OpenURL")]
++		public const uint OpenURL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Option")]
++		public const uint Option;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oslash")]
++		public const uint Oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Otilde")]
++		public const uint Otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay1_Enable")]
++		public const uint Overlay1_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay2_Enable")]
++		public const uint Overlay2_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_P")]
++		public const uint P;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pabovedot")]
++		public const uint Pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Down")]
++		public const uint Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Up")]
++		public const uint Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Paste")]
++		public const uint Paste;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pause")]
++		public const uint Pause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PesetaSign")]
++		public const uint PesetaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Phone")]
++		public const uint Phone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pictures")]
++		public const uint Pictures;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Accelerate")]
++		public const uint Pointer_Accelerate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button1")]
++		public const uint Pointer_Button1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button2")]
++		public const uint Pointer_Button2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button3")]
++		public const uint Pointer_Button3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button4")]
++		public const uint Pointer_Button4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button5")]
++		public const uint Pointer_Button5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button_Dflt")]
++		public const uint Pointer_Button_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick1")]
++		public const uint Pointer_DblClick1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick2")]
++		public const uint Pointer_DblClick2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick3")]
++		public const uint Pointer_DblClick3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick4")]
++		public const uint Pointer_DblClick4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick5")]
++		public const uint Pointer_DblClick5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick_Dflt")]
++		public const uint Pointer_DblClick_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnNext")]
++		public const uint Pointer_DfltBtnNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnPrev")]
++		public const uint Pointer_DfltBtnPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Down")]
++		public const uint Pointer_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownLeft")]
++		public const uint Pointer_DownLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownRight")]
++		public const uint Pointer_DownRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag1")]
++		public const uint Pointer_Drag1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag2")]
++		public const uint Pointer_Drag2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag3")]
++		public const uint Pointer_Drag3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag4")]
++		public const uint Pointer_Drag4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag5")]
++		public const uint Pointer_Drag5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag_Dflt")]
++		public const uint Pointer_Drag_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_EnableKeys")]
++		public const uint Pointer_EnableKeys;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Left")]
++		public const uint Pointer_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Right")]
++		public const uint Pointer_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Up")]
++		public const uint Pointer_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpLeft")]
++		public const uint Pointer_UpLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpRight")]
++		public const uint Pointer_UpRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerDown")]
++		public const uint PowerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerOff")]
++		public const uint PowerOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_VMode")]
++		public const uint Prev_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_Virtual_Screen")]
++		public const uint Prev_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PreviousCandidate")]
++		public const uint PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Print")]
++		public const uint Print;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prior")]
++		public const uint Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Q")]
++		public const uint Q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R")]
++		public const uint R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R1")]
++		public const uint R1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R10")]
++		public const uint R10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R11")]
++		public const uint R11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R12")]
++		public const uint R12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R13")]
++		public const uint R13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R14")]
++		public const uint R14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R15")]
++		public const uint R15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R2")]
++		public const uint R2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R3")]
++		public const uint R3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R4")]
++		public const uint R4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R5")]
++		public const uint R5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R6")]
++		public const uint R6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R7")]
++		public const uint R7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R8")]
++		public const uint R8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R9")]
++		public const uint R9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Racute")]
++		public const uint Racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcaron")]
++		public const uint Rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcedilla")]
++		public const uint Rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Red")]
++		public const uint Red;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Redo")]
++		public const uint Redo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Refresh")]
++		public const uint Refresh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reload")]
++		public const uint Reload;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RepeatKeys_Enable")]
++		public const uint RepeatKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reply")]
++		public const uint Reply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Return")]
++		public const uint Return;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Right")]
++		public const uint Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerDown")]
++		public const uint RockerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerEnter")]
++		public const uint RockerEnter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerUp")]
++		public const uint RockerUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Romaji")]
++		public const uint Romaji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotateWindows")]
++		public const uint RotateWindows;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationKB")]
++		public const uint RotationKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationPB")]
++		public const uint RotationPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RupeeSign")]
++		public const uint RupeeSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_S")]
++		public const uint S;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SCHWA")]
++		public const uint SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sabovedot")]
++		public const uint Sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sacute")]
++		public const uint Sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Save")]
++		public const uint Save;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scaron")]
++		public const uint Scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scedilla")]
++		public const uint Scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scircumflex")]
++		public const uint Scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScreenSaver")]
++		public const uint ScreenSaver;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollClick")]
++		public const uint ScrollClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollDown")]
++		public const uint ScrollDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollUp")]
++		public const uint ScrollUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scroll_Lock")]
++		public const uint Scroll_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Search")]
++		public const uint Search;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Select")]
++		public const uint Select;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SelectButton")]
++		public const uint SelectButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Send")]
++		public const uint Send;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DJE")]
++		public const uint Serbian_DJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DZE")]
++		public const uint Serbian_DZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_JE")]
++		public const uint Serbian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_LJE")]
++		public const uint Serbian_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_NJE")]
++		public const uint Serbian_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_TSHE")]
++		public const uint Serbian_TSHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dje")]
++		public const uint Serbian_dje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dze")]
++		public const uint Serbian_dze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_je")]
++		public const uint Serbian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_lje")]
++		public const uint Serbian_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_nje")]
++		public const uint Serbian_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_tshe")]
++		public const uint Serbian_tshe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_L")]
++		public const uint Shift_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_Lock")]
++		public const uint Shift_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_R")]
++		public const uint Shift_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shop")]
++		public const uint Shop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SingleCandidate")]
++		public const uint SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_a")]
++		public const uint Sinh_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa")]
++		public const uint Sinh_aa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa2")]
++		public const uint Sinh_aa2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae")]
++		public const uint Sinh_ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae2")]
++		public const uint Sinh_ae2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee")]
++		public const uint Sinh_aee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee2")]
++		public const uint Sinh_aee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai")]
++		public const uint Sinh_ai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai2")]
++		public const uint Sinh_ai2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_al")]
++		public const uint Sinh_al;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au")]
++		public const uint Sinh_au;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au2")]
++		public const uint Sinh_au2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ba")]
++		public const uint Sinh_ba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_bha")]
++		public const uint Sinh_bha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ca")]
++		public const uint Sinh_ca;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_cha")]
++		public const uint Sinh_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dda")]
++		public const uint Sinh_dda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ddha")]
++		public const uint Sinh_ddha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dha")]
++		public const uint Sinh_dha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dhha")]
++		public const uint Sinh_dhha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e")]
++		public const uint Sinh_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e2")]
++		public const uint Sinh_e2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee")]
++		public const uint Sinh_ee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee2")]
++		public const uint Sinh_ee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_fa")]
++		public const uint Sinh_fa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ga")]
++		public const uint Sinh_ga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_gha")]
++		public const uint Sinh_gha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_h2")]
++		public const uint Sinh_h2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ha")]
++		public const uint Sinh_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i")]
++		public const uint Sinh_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i2")]
++		public const uint Sinh_i2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii")]
++		public const uint Sinh_ii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii2")]
++		public const uint Sinh_ii2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ja")]
++		public const uint Sinh_ja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jha")]
++		public const uint Sinh_jha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jnya")]
++		public const uint Sinh_jnya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ka")]
++		public const uint Sinh_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kha")]
++		public const uint Sinh_kha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kunddaliya")]
++		public const uint Sinh_kunddaliya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_la")]
++		public const uint Sinh_la;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lla")]
++		public const uint Sinh_lla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu")]
++		public const uint Sinh_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu2")]
++		public const uint Sinh_lu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu")]
++		public const uint Sinh_luu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu2")]
++		public const uint Sinh_luu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ma")]
++		public const uint Sinh_ma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_mba")]
++		public const uint Sinh_mba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_na")]
++		public const uint Sinh_na;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndda")]
++		public const uint Sinh_ndda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndha")]
++		public const uint Sinh_ndha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng")]
++		public const uint Sinh_ng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng2")]
++		public const uint Sinh_ng2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nga")]
++		public const uint Sinh_nga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nja")]
++		public const uint Sinh_nja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nna")]
++		public const uint Sinh_nna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nya")]
++		public const uint Sinh_nya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o")]
++		public const uint Sinh_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o2")]
++		public const uint Sinh_o2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo")]
++		public const uint Sinh_oo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo2")]
++		public const uint Sinh_oo2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pa")]
++		public const uint Sinh_pa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pha")]
++		public const uint Sinh_pha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ra")]
++		public const uint Sinh_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ri")]
++		public const uint Sinh_ri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_rii")]
++		public const uint Sinh_rii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ru2")]
++		public const uint Sinh_ru2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ruu2")]
++		public const uint Sinh_ruu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sa")]
++		public const uint Sinh_sa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sha")]
++		public const uint Sinh_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ssha")]
++		public const uint Sinh_ssha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tha")]
++		public const uint Sinh_tha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_thha")]
++		public const uint Sinh_thha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tta")]
++		public const uint Sinh_tta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ttha")]
++		public const uint Sinh_ttha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u")]
++		public const uint Sinh_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u2")]
++		public const uint Sinh_u2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu")]
++		public const uint Sinh_uu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu2")]
++		public const uint Sinh_uu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_va")]
++		public const uint Sinh_va;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ya")]
++		public const uint Sinh_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sleep")]
++		public const uint Sleep;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SlowKeys_Enable")]
++		public const uint SlowKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Spell")]
++		public const uint Spell;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SplitScreen")]
++		public const uint SplitScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Standby")]
++		public const uint Standby;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Start")]
++		public const uint Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_StickyKeys_Enable")]
++		public const uint StickyKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Stop")]
++		public const uint Stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Subtitle")]
++		public const uint Subtitle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_L")]
++		public const uint Super_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_R")]
++		public const uint Super_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Support")]
++		public const uint Support;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Suspend")]
++		public const uint Suspend;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_1")]
++		public const uint Switch_VT_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_10")]
++		public const uint Switch_VT_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_11")]
++		public const uint Switch_VT_11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_12")]
++		public const uint Switch_VT_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_2")]
++		public const uint Switch_VT_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_3")]
++		public const uint Switch_VT_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_4")]
++		public const uint Switch_VT_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_5")]
++		public const uint Switch_VT_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_6")]
++		public const uint Switch_VT_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_7")]
++		public const uint Switch_VT_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_8")]
++		public const uint Switch_VT_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_9")]
++		public const uint Switch_VT_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sys_Req")]
++		public const uint Sys_Req;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_T")]
++		public const uint T;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_THORN")]
++		public const uint THORN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tab")]
++		public const uint Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tabovedot")]
++		public const uint Tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TaskPane")]
++		public const uint TaskPane;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcaron")]
++		public const uint Tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcedilla")]
++		public const uint Tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminal")]
++		public const uint Terminal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminate_Server")]
++		public const uint Terminate_Server;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_baht")]
++		public const uint Thai_baht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_bobaimai")]
++		public const uint Thai_bobaimai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochan")]
++		public const uint Thai_chochan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochang")]
++		public const uint Thai_chochang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_choching")]
++		public const uint Thai_choching;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochoe")]
++		public const uint Thai_chochoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dochada")]
++		public const uint Thai_dochada;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dodek")]
++		public const uint Thai_dodek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofa")]
++		public const uint Thai_fofa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofan")]
++		public const uint Thai_fofan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_hohip")]
++		public const uint Thai_hohip;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_honokhuk")]
++		public const uint Thai_honokhuk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhai")]
++		public const uint Thai_khokhai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhon")]
++		public const uint Thai_khokhon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhuat")]
++		public const uint Thai_khokhuat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhwai")]
++		public const uint Thai_khokhwai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khorakhang")]
++		public const uint Thai_khorakhang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_kokai")]
++		public const uint Thai_kokai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lakkhangyao")]
++		public const uint Thai_lakkhangyao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekchet")]
++		public const uint Thai_lekchet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekha")]
++		public const uint Thai_lekha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekhok")]
++		public const uint Thai_lekhok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekkao")]
++		public const uint Thai_lekkao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leknung")]
++		public const uint Thai_leknung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekpaet")]
++		public const uint Thai_lekpaet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksam")]
++		public const uint Thai_leksam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksi")]
++		public const uint Thai_leksi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksong")]
++		public const uint Thai_leksong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksun")]
++		public const uint Thai_leksun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lochula")]
++		public const uint Thai_lochula;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_loling")]
++		public const uint Thai_loling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lu")]
++		public const uint Thai_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maichattawa")]
++		public const uint Thai_maichattawa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiek")]
++		public const uint Thai_maiek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat")]
++		public const uint Thai_maihanakat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat_maitho")]
++		public const uint Thai_maihanakat_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitaikhu")]
++		public const uint Thai_maitaikhu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitho")]
++		public const uint Thai_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitri")]
++		public const uint Thai_maitri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiyamok")]
++		public const uint Thai_maiyamok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_moma")]
++		public const uint Thai_moma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ngongu")]
++		public const uint Thai_ngongu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nikhahit")]
++		public const uint Thai_nikhahit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonen")]
++		public const uint Thai_nonen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonu")]
++		public const uint Thai_nonu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_oang")]
++		public const uint Thai_oang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_paiyannoi")]
++		public const uint Thai_paiyannoi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phinthu")]
++		public const uint Thai_phinthu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophan")]
++		public const uint Thai_phophan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophung")]
++		public const uint Thai_phophung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phosamphao")]
++		public const uint Thai_phosamphao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_popla")]
++		public const uint Thai_popla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_rorua")]
++		public const uint Thai_rorua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ru")]
++		public const uint Thai_ru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraa")]
++		public const uint Thai_saraa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaa")]
++		public const uint Thai_saraaa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraae")]
++		public const uint Thai_saraae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimalai")]
++		public const uint Thai_saraaimaimalai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimuan")]
++		public const uint Thai_saraaimaimuan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraam")]
++		public const uint Thai_saraam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarae")]
++		public const uint Thai_sarae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarai")]
++		public const uint Thai_sarai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraii")]
++		public const uint Thai_saraii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarao")]
++		public const uint Thai_sarao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarau")]
++		public const uint Thai_sarau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraue")]
++		public const uint Thai_saraue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauee")]
++		public const uint Thai_sarauee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauu")]
++		public const uint Thai_sarauu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sorusi")]
++		public const uint Thai_sorusi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosala")]
++		public const uint Thai_sosala;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_soso")]
++		public const uint Thai_soso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosua")]
++		public const uint Thai_sosua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thanthakhat")]
++		public const uint Thai_thanthakhat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thonangmontho")]
++		public const uint Thai_thonangmontho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thophuthao")]
++		public const uint Thai_thophuthao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothahan")]
++		public const uint Thai_thothahan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothan")]
++		public const uint Thai_thothan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothong")]
++		public const uint Thai_thothong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothung")]
++		public const uint Thai_thothung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_topatak")]
++		public const uint Thai_topatak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_totao")]
++		public const uint Thai_totao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_wowaen")]
++		public const uint Thai_wowaen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoyak")]
++		public const uint Thai_yoyak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoying")]
++		public const uint Thai_yoying;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thorn")]
++		public const uint Thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Time")]
++		public const uint Time;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ToDoList")]
++		public const uint ToDoList;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tools")]
++		public const uint Tools;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TopMenu")]
++		public const uint TopMenu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOff")]
++		public const uint TouchpadOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOn")]
++		public const uint TouchpadOn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadToggle")]
++		public const uint TouchpadToggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Touroku")]
++		public const uint Touroku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Travel")]
++		public const uint Travel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tslash")]
++		public const uint Tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_U")]
++		public const uint U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UWB")]
++		public const uint UWB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uacute")]
++		public const uint Uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubelowdot")]
++		public const uint Ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubreve")]
++		public const uint Ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ucircumflex")]
++		public const uint Ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udiaeresis")]
++		public const uint Udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udoubleacute")]
++		public const uint Udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ugrave")]
++		public const uint Ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhook")]
++		public const uint Uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorn")]
++		public const uint Uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornacute")]
++		public const uint Uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornbelowdot")]
++		public const uint Uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorngrave")]
++		public const uint Uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornhook")]
++		public const uint Uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorntilde")]
++		public const uint Uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_GHE_WITH_UPTURN")]
++		public const uint Ukrainian_GHE_WITH_UPTURN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_I")]
++		public const uint Ukrainian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_IE")]
++		public const uint Ukrainian_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_YI")]
++		public const uint Ukrainian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ghe_with_upturn")]
++		public const uint Ukrainian_ghe_with_upturn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_i")]
++		public const uint Ukrainian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ie")]
++		public const uint Ukrainian_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_yi")]
++		public const uint Ukrainian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_I")]
++		public const uint Ukranian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_JE")]
++		public const uint Ukranian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_YI")]
++		public const uint Ukranian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_i")]
++		public const uint Ukranian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_je")]
++		public const uint Ukranian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_yi")]
++		public const uint Ukranian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Umacron")]
++		public const uint Umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Undo")]
++		public const uint Undo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ungrab")]
++		public const uint Ungrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uogonek")]
++		public const uint Uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Up")]
++		public const uint Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uring")]
++		public const uint Uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User1KB")]
++		public const uint User1KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User2KB")]
++		public const uint User2KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UserPB")]
++		public const uint UserPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Utilde")]
++		public const uint Utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_V")]
++		public const uint V;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VendorHome")]
++		public const uint VendorHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Video")]
++		public const uint Video;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_View")]
++		public const uint View;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VoidSymbol")]
++		public const uint VoidSymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_W")]
++		public const uint W;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WLAN")]
++		public const uint WLAN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WWW")]
++		public const uint WWW;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wacute")]
++		public const uint Wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WakeUp")]
++		public const uint WakeUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wcircumflex")]
++		public const uint Wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wdiaeresis")]
++		public const uint Wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WebCam")]
++		public const uint WebCam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wgrave")]
++		public const uint Wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WheelButton")]
++		public const uint WheelButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WindowClear")]
++		public const uint WindowClear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WonSign")]
++		public const uint WonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Word")]
++		public const uint Word;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_X")]
++		public const uint X;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xabovedot")]
++		public const uint Xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xfer")]
++		public const uint Xfer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Y")]
++		public const uint Y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yacute")]
++		public const uint Yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ybelowdot")]
++		public const uint Ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ycircumflex")]
++		public const uint Ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ydiaeresis")]
++		public const uint Ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yellow")]
++		public const uint Yellow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ygrave")]
++		public const uint Ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yhook")]
++		public const uint Yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ytilde")]
++		public const uint Ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Z")]
++		public const uint Z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zabovedot")]
++		public const uint Zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zacute")]
++		public const uint Zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zcaron")]
++		public const uint Zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zen_Koho")]
++		public const uint Zen_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku")]
++		public const uint Zenkaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku_Hankaku")]
++		public const uint Zenkaku_Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomIn")]
++		public const uint ZoomIn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomOut")]
++		public const uint ZoomOut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zstroke")]
++		public const uint Zstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_a")]
++		public const uint a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aacute")]
++		public const uint aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abelowdot")]
++		public const uint abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abovedot")]
++		public const uint abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreve")]
++		public const uint abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreveacute")]
++		public const uint abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevebelowdot")]
++		public const uint abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevegrave")]
++		public const uint abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevehook")]
++		public const uint abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevetilde")]
++		public const uint abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflex")]
++		public const uint acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexacute")]
++		public const uint acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexbelowdot")]
++		public const uint acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexgrave")]
++		public const uint acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexhook")]
++		public const uint acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflextilde")]
++		public const uint acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acute")]
++		public const uint acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_adiaeresis")]
++		public const uint adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ae")]
++		public const uint ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_agrave")]
++		public const uint agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ahook")]
++		public const uint ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_amacron")]
++		public const uint amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ampersand")]
++		public const uint ampersand;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aogonek")]
++		public const uint aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_apostrophe")]
++		public const uint apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approxeq")]
++		public const uint approxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approximate")]
++		public const uint approximate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aring")]
++		public const uint aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciicircum")]
++		public const uint asciicircum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciitilde")]
++		public const uint asciitilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asterisk")]
++		public const uint asterisk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_at")]
++		public const uint at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_atilde")]
++		public const uint atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_b")]
++		public const uint b;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_babovedot")]
++		public const uint babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_backslash")]
++		public const uint backslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ballotcross")]
++		public const uint ballotcross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bar")]
++		public const uint bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_because")]
++		public const uint because;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_blank")]
++		public const uint blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botintegral")]
++		public const uint botintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftparens")]
++		public const uint botleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsqbracket")]
++		public const uint botleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsummation")]
++		public const uint botleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightparens")]
++		public const uint botrightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsqbracket")]
++		public const uint botrightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsummation")]
++		public const uint botrightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bott")]
++		public const uint bott;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botvertsummationconnector")]
++		public const uint botvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceleft")]
++		public const uint braceleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceright")]
++		public const uint braceright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketleft")]
++		public const uint bracketleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketright")]
++		public const uint bracketright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_blank")]
++		public const uint braille_blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_1")]
++		public const uint braille_dot_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_10")]
++		public const uint braille_dot_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_2")]
++		public const uint braille_dot_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_3")]
++		public const uint braille_dot_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_4")]
++		public const uint braille_dot_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_5")]
++		public const uint braille_dot_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_6")]
++		public const uint braille_dot_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_7")]
++		public const uint braille_dot_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_8")]
++		public const uint braille_dot_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_9")]
++		public const uint braille_dot_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1")]
++		public const uint braille_dots_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12")]
++		public const uint braille_dots_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123")]
++		public const uint braille_dots_123;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234")]
++		public const uint braille_dots_1234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345")]
++		public const uint braille_dots_12345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123456")]
++		public const uint braille_dots_123456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234567")]
++		public const uint braille_dots_1234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345678")]
++		public const uint braille_dots_12345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234568")]
++		public const uint braille_dots_1234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123457")]
++		public const uint braille_dots_123457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234578")]
++		public const uint braille_dots_1234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123458")]
++		public const uint braille_dots_123458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12346")]
++		public const uint braille_dots_12346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123467")]
++		public const uint braille_dots_123467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234678")]
++		public const uint braille_dots_1234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123468")]
++		public const uint braille_dots_123468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12347")]
++		public const uint braille_dots_12347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123478")]
++		public const uint braille_dots_123478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12348")]
++		public const uint braille_dots_12348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235")]
++		public const uint braille_dots_1235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12356")]
++		public const uint braille_dots_12356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123567")]
++		public const uint braille_dots_123567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235678")]
++		public const uint braille_dots_1235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123568")]
++		public const uint braille_dots_123568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12357")]
++		public const uint braille_dots_12357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123578")]
++		public const uint braille_dots_123578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12358")]
++		public const uint braille_dots_12358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1236")]
++		public const uint braille_dots_1236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12367")]
++		public const uint braille_dots_12367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123678")]
++		public const uint braille_dots_123678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12368")]
++		public const uint braille_dots_12368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1237")]
++		public const uint braille_dots_1237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12378")]
++		public const uint braille_dots_12378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1238")]
++		public const uint braille_dots_1238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124")]
++		public const uint braille_dots_124;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245")]
++		public const uint braille_dots_1245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12456")]
++		public const uint braille_dots_12456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124567")]
++		public const uint braille_dots_124567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245678")]
++		public const uint braille_dots_1245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124568")]
++		public const uint braille_dots_124568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12457")]
++		public const uint braille_dots_12457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124578")]
++		public const uint braille_dots_124578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12458")]
++		public const uint braille_dots_12458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1246")]
++		public const uint braille_dots_1246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12467")]
++		public const uint braille_dots_12467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124678")]
++		public const uint braille_dots_124678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12468")]
++		public const uint braille_dots_12468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1247")]
++		public const uint braille_dots_1247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12478")]
++		public const uint braille_dots_12478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1248")]
++		public const uint braille_dots_1248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125")]
++		public const uint braille_dots_125;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1256")]
++		public const uint braille_dots_1256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12567")]
++		public const uint braille_dots_12567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125678")]
++		public const uint braille_dots_125678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12568")]
++		public const uint braille_dots_12568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1257")]
++		public const uint braille_dots_1257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12578")]
++		public const uint braille_dots_12578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1258")]
++		public const uint braille_dots_1258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_126")]
++		public const uint braille_dots_126;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1267")]
++		public const uint braille_dots_1267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12678")]
++		public const uint braille_dots_12678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1268")]
++		public const uint braille_dots_1268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_127")]
++		public const uint braille_dots_127;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1278")]
++		public const uint braille_dots_1278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_128")]
++		public const uint braille_dots_128;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13")]
++		public const uint braille_dots_13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134")]
++		public const uint braille_dots_134;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345")]
++		public const uint braille_dots_1345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13456")]
++		public const uint braille_dots_13456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134567")]
++		public const uint braille_dots_134567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345678")]
++		public const uint braille_dots_1345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134568")]
++		public const uint braille_dots_134568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13457")]
++		public const uint braille_dots_13457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134578")]
++		public const uint braille_dots_134578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13458")]
++		public const uint braille_dots_13458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1346")]
++		public const uint braille_dots_1346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13467")]
++		public const uint braille_dots_13467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134678")]
++		public const uint braille_dots_134678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13468")]
++		public const uint braille_dots_13468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1347")]
++		public const uint braille_dots_1347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13478")]
++		public const uint braille_dots_13478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1348")]
++		public const uint braille_dots_1348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135")]
++		public const uint braille_dots_135;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1356")]
++		public const uint braille_dots_1356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13567")]
++		public const uint braille_dots_13567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135678")]
++		public const uint braille_dots_135678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13568")]
++		public const uint braille_dots_13568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1357")]
++		public const uint braille_dots_1357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13578")]
++		public const uint braille_dots_13578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1358")]
++		public const uint braille_dots_1358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_136")]
++		public const uint braille_dots_136;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1367")]
++		public const uint braille_dots_1367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13678")]
++		public const uint braille_dots_13678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1368")]
++		public const uint braille_dots_1368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_137")]
++		public const uint braille_dots_137;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1378")]
++		public const uint braille_dots_1378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_138")]
++		public const uint braille_dots_138;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14")]
++		public const uint braille_dots_14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145")]
++		public const uint braille_dots_145;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1456")]
++		public const uint braille_dots_1456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14567")]
++		public const uint braille_dots_14567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145678")]
++		public const uint braille_dots_145678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14568")]
++		public const uint braille_dots_14568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1457")]
++		public const uint braille_dots_1457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14578")]
++		public const uint braille_dots_14578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1458")]
++		public const uint braille_dots_1458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_146")]
++		public const uint braille_dots_146;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1467")]
++		public const uint braille_dots_1467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14678")]
++		public const uint braille_dots_14678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1468")]
++		public const uint braille_dots_1468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_147")]
++		public const uint braille_dots_147;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1478")]
++		public const uint braille_dots_1478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_148")]
++		public const uint braille_dots_148;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15")]
++		public const uint braille_dots_15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_156")]
++		public const uint braille_dots_156;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1567")]
++		public const uint braille_dots_1567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15678")]
++		public const uint braille_dots_15678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1568")]
++		public const uint braille_dots_1568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_157")]
++		public const uint braille_dots_157;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1578")]
++		public const uint braille_dots_1578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_158")]
++		public const uint braille_dots_158;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_16")]
++		public const uint braille_dots_16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_167")]
++		public const uint braille_dots_167;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1678")]
++		public const uint braille_dots_1678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_168")]
++		public const uint braille_dots_168;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_17")]
++		public const uint braille_dots_17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_178")]
++		public const uint braille_dots_178;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_18")]
++		public const uint braille_dots_18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2")]
++		public const uint braille_dots_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23")]
++		public const uint braille_dots_23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234")]
++		public const uint braille_dots_234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345")]
++		public const uint braille_dots_2345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23456")]
++		public const uint braille_dots_23456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234567")]
++		public const uint braille_dots_234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345678")]
++		public const uint braille_dots_2345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234568")]
++		public const uint braille_dots_234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23457")]
++		public const uint braille_dots_23457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234578")]
++		public const uint braille_dots_234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23458")]
++		public const uint braille_dots_23458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2346")]
++		public const uint braille_dots_2346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23467")]
++		public const uint braille_dots_23467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234678")]
++		public const uint braille_dots_234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23468")]
++		public const uint braille_dots_23468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2347")]
++		public const uint braille_dots_2347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23478")]
++		public const uint braille_dots_23478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2348")]
++		public const uint braille_dots_2348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235")]
++		public const uint braille_dots_235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2356")]
++		public const uint braille_dots_2356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23567")]
++		public const uint braille_dots_23567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235678")]
++		public const uint braille_dots_235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23568")]
++		public const uint braille_dots_23568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2357")]
++		public const uint braille_dots_2357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23578")]
++		public const uint braille_dots_23578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2358")]
++		public const uint braille_dots_2358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_236")]
++		public const uint braille_dots_236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2367")]
++		public const uint braille_dots_2367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23678")]
++		public const uint braille_dots_23678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2368")]
++		public const uint braille_dots_2368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_237")]
++		public const uint braille_dots_237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2378")]
++		public const uint braille_dots_2378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_238")]
++		public const uint braille_dots_238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24")]
++		public const uint braille_dots_24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245")]
++		public const uint braille_dots_245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2456")]
++		public const uint braille_dots_2456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24567")]
++		public const uint braille_dots_24567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245678")]
++		public const uint braille_dots_245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24568")]
++		public const uint braille_dots_24568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2457")]
++		public const uint braille_dots_2457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24578")]
++		public const uint braille_dots_24578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2458")]
++		public const uint braille_dots_2458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_246")]
++		public const uint braille_dots_246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2467")]
++		public const uint braille_dots_2467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24678")]
++		public const uint braille_dots_24678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2468")]
++		public const uint braille_dots_2468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_247")]
++		public const uint braille_dots_247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2478")]
++		public const uint braille_dots_2478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_248")]
++		public const uint braille_dots_248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25")]
++		public const uint braille_dots_25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_256")]
++		public const uint braille_dots_256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2567")]
++		public const uint braille_dots_2567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25678")]
++		public const uint braille_dots_25678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2568")]
++		public const uint braille_dots_2568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_257")]
++		public const uint braille_dots_257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2578")]
++		public const uint braille_dots_2578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_258")]
++		public const uint braille_dots_258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_26")]
++		public const uint braille_dots_26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_267")]
++		public const uint braille_dots_267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2678")]
++		public const uint braille_dots_2678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_268")]
++		public const uint braille_dots_268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_27")]
++		public const uint braille_dots_27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_278")]
++		public const uint braille_dots_278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_28")]
++		public const uint braille_dots_28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3")]
++		public const uint braille_dots_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34")]
++		public const uint braille_dots_34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345")]
++		public const uint braille_dots_345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3456")]
++		public const uint braille_dots_3456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34567")]
++		public const uint braille_dots_34567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345678")]
++		public const uint braille_dots_345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34568")]
++		public const uint braille_dots_34568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3457")]
++		public const uint braille_dots_3457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34578")]
++		public const uint braille_dots_34578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3458")]
++		public const uint braille_dots_3458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_346")]
++		public const uint braille_dots_346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3467")]
++		public const uint braille_dots_3467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34678")]
++		public const uint braille_dots_34678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3468")]
++		public const uint braille_dots_3468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_347")]
++		public const uint braille_dots_347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3478")]
++		public const uint braille_dots_3478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_348")]
++		public const uint braille_dots_348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35")]
++		public const uint braille_dots_35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_356")]
++		public const uint braille_dots_356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3567")]
++		public const uint braille_dots_3567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35678")]
++		public const uint braille_dots_35678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3568")]
++		public const uint braille_dots_3568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_357")]
++		public const uint braille_dots_357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3578")]
++		public const uint braille_dots_3578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_358")]
++		public const uint braille_dots_358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_36")]
++		public const uint braille_dots_36;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_367")]
++		public const uint braille_dots_367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3678")]
++		public const uint braille_dots_3678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_368")]
++		public const uint braille_dots_368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_37")]
++		public const uint braille_dots_37;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_378")]
++		public const uint braille_dots_378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_38")]
++		public const uint braille_dots_38;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4")]
++		public const uint braille_dots_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45")]
++		public const uint braille_dots_45;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_456")]
++		public const uint braille_dots_456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4567")]
++		public const uint braille_dots_4567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45678")]
++		public const uint braille_dots_45678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4568")]
++		public const uint braille_dots_4568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_457")]
++		public const uint braille_dots_457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4578")]
++		public const uint braille_dots_4578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_458")]
++		public const uint braille_dots_458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_46")]
++		public const uint braille_dots_46;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_467")]
++		public const uint braille_dots_467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4678")]
++		public const uint braille_dots_4678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_468")]
++		public const uint braille_dots_468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_47")]
++		public const uint braille_dots_47;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_478")]
++		public const uint braille_dots_478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_48")]
++		public const uint braille_dots_48;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5")]
++		public const uint braille_dots_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_56")]
++		public const uint braille_dots_56;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_567")]
++		public const uint braille_dots_567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5678")]
++		public const uint braille_dots_5678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_568")]
++		public const uint braille_dots_568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_57")]
++		public const uint braille_dots_57;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_578")]
++		public const uint braille_dots_578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_58")]
++		public const uint braille_dots_58;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_6")]
++		public const uint braille_dots_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_67")]
++		public const uint braille_dots_67;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_678")]
++		public const uint braille_dots_678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_68")]
++		public const uint braille_dots_68;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_7")]
++		public const uint braille_dots_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_78")]
++		public const uint braille_dots_78;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_8")]
++		public const uint braille_dots_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_breve")]
++		public const uint breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_brokenbar")]
++		public const uint brokenbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c")]
++		public const uint c;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c_h")]
++		public const uint c_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cabovedot")]
++		public const uint cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cacute")]
++		public const uint cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_careof")]
++		public const uint careof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caret")]
++		public const uint caret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caron")]
++		public const uint caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccaron")]
++		public const uint ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccedilla")]
++		public const uint ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccircumflex")]
++		public const uint ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cedilla")]
++		public const uint cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cent")]
++		public const uint cent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ch")]
++		public const uint ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkerboard")]
++		public const uint checkerboard;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkmark")]
++		public const uint checkmark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_circle")]
++		public const uint circle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_club")]
++		public const uint club;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_colon")]
++		public const uint colon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_comma")]
++		public const uint comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_containsas")]
++		public const uint containsas;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_copyright")]
++		public const uint copyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cr")]
++		public const uint cr;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_crossinglines")]
++		public const uint crossinglines;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cuberoot")]
++		public const uint cuberoot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_currency")]
++		public const uint currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cursor")]
++		public const uint cursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_d")]
++		public const uint d;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dabovedot")]
++		public const uint dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dagger")]
++		public const uint dagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dcaron")]
++		public const uint dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_A")]
++		public const uint dead_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_E")]
++		public const uint dead_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_I")]
++		public const uint dead_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_O")]
++		public const uint dead_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_U")]
++		public const uint dead_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_a")]
++		public const uint dead_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovecomma")]
++		public const uint dead_abovecomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovedot")]
++		public const uint dead_abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovereversedcomma")]
++		public const uint dead_abovereversedcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovering")]
++		public const uint dead_abovering;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_aboveverticalline")]
++		public const uint dead_aboveverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_acute")]
++		public const uint dead_acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowbreve")]
++		public const uint dead_belowbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcircumflex")]
++		public const uint dead_belowcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcomma")]
++		public const uint dead_belowcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdiaeresis")]
++		public const uint dead_belowdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdot")]
++		public const uint dead_belowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowmacron")]
++		public const uint dead_belowmacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowring")]
++		public const uint dead_belowring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowtilde")]
++		public const uint dead_belowtilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowverticalline")]
++		public const uint dead_belowverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_breve")]
++		public const uint dead_breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_capital_schwa")]
++		public const uint dead_capital_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_caron")]
++		public const uint dead_caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_cedilla")]
++		public const uint dead_cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_circumflex")]
++		public const uint dead_circumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_currency")]
++		public const uint dead_currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_dasia")]
++		public const uint dead_dasia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_diaeresis")]
++		public const uint dead_diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doubleacute")]
++		public const uint dead_doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doublegrave")]
++		public const uint dead_doublegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_e")]
++		public const uint dead_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_grave")]
++		public const uint dead_grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_greek")]
++		public const uint dead_greek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_hook")]
++		public const uint dead_hook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_horn")]
++		public const uint dead_horn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_i")]
++		public const uint dead_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_invertedbreve")]
++		public const uint dead_invertedbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_iota")]
++		public const uint dead_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_longsolidusoverlay")]
++		public const uint dead_longsolidusoverlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_lowline")]
++		public const uint dead_lowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_macron")]
++		public const uint dead_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_o")]
++		public const uint dead_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_ogonek")]
++		public const uint dead_ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_perispomeni")]
++		public const uint dead_perispomeni;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_psili")]
++		public const uint dead_psili;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_semivoiced_sound")]
++		public const uint dead_semivoiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_small_schwa")]
++		public const uint dead_small_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_stroke")]
++		public const uint dead_stroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_tilde")]
++		public const uint dead_tilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_u")]
++		public const uint dead_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_voiced_sound")]
++		public const uint dead_voiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_decimalpoint")]
++		public const uint decimalpoint;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_degree")]
++		public const uint degree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diaeresis")]
++		public const uint diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diamond")]
++		public const uint diamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_digitspace")]
++		public const uint digitspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dintegral")]
++		public const uint dintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_division")]
++		public const uint division;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dollar")]
++		public const uint dollar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubbaselinedot")]
++		public const uint doubbaselinedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubleacute")]
++		public const uint doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubledagger")]
++		public const uint doubledagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doublelowquotemark")]
++		public const uint doublelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downarrow")]
++		public const uint downarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downcaret")]
++		public const uint downcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downshoe")]
++		public const uint downshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downstile")]
++		public const uint downstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downtack")]
++		public const uint downtack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dstroke")]
++		public const uint dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_e")]
++		public const uint e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eabovedot")]
++		public const uint eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eacute")]
++		public const uint eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ebelowdot")]
++		public const uint ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecaron")]
++		public const uint ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflex")]
++		public const uint ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexacute")]
++		public const uint ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexbelowdot")]
++		public const uint ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexgrave")]
++		public const uint ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexhook")]
++		public const uint ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflextilde")]
++		public const uint ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ediaeresis")]
++		public const uint ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_egrave")]
++		public const uint egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ehook")]
++		public const uint ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsubscript")]
++		public const uint eightsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsuperior")]
++		public const uint eightsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_elementof")]
++		public const uint elementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ellipsis")]
++		public const uint ellipsis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em3space")]
++		public const uint em3space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em4space")]
++		public const uint em4space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emacron")]
++		public const uint emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emdash")]
++		public const uint emdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledcircle")]
++		public const uint emfilledcircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledrect")]
++		public const uint emfilledrect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopencircle")]
++		public const uint emopencircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopenrectangle")]
++		public const uint emopenrectangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emptyset")]
++		public const uint emptyset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emspace")]
++		public const uint emspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_endash")]
++		public const uint endash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledcircbullet")]
++		public const uint enfilledcircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledsqbullet")]
++		public const uint enfilledsqbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eng")]
++		public const uint eng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopencircbullet")]
++		public const uint enopencircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopensquarebullet")]
++		public const uint enopensquarebullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enspace")]
++		public const uint enspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eogonek")]
++		public const uint eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_equal")]
++		public const uint equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eth")]
++		public const uint eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_etilde")]
++		public const uint etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclam")]
++		public const uint exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclamdown")]
++		public const uint exclamdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ezh")]
++		public const uint ezh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_f")]
++		public const uint f;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fabovedot")]
++		public const uint fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_femalesymbol")]
++		public const uint femalesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ff")]
++		public const uint ff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_figdash")]
++		public const uint figdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledlefttribullet")]
++		public const uint filledlefttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrectbullet")]
++		public const uint filledrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrighttribullet")]
++		public const uint filledrighttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletdown")]
++		public const uint filledtribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletup")]
++		public const uint filledtribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fiveeighths")]
++		public const uint fiveeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesixths")]
++		public const uint fivesixths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesubscript")]
++		public const uint fivesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesuperior")]
++		public const uint fivesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourfifths")]
++		public const uint fourfifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursubscript")]
++		public const uint foursubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursuperior")]
++		public const uint foursuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourthroot")]
++		public const uint fourthroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_function")]
++		public const uint function;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_g")]
++		public const uint g;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gabovedot")]
++		public const uint gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gbreve")]
++		public const uint gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcaron")]
++		public const uint gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcedilla")]
++		public const uint gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcircumflex")]
++		public const uint gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_grave")]
++		public const uint grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greater")]
++		public const uint greater;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greaterthanequal")]
++		public const uint greaterthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotleft")]
++		public const uint guillemotleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotright")]
++		public const uint guillemotright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_h")]
++		public const uint h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hairspace")]
++		public const uint hairspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hcircumflex")]
++		public const uint hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_heart")]
++		public const uint heart;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_aleph")]
++		public const uint hebrew_aleph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_ayin")]
++		public const uint hebrew_ayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_bet")]
++		public const uint hebrew_bet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_beth")]
++		public const uint hebrew_beth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_chet")]
++		public const uint hebrew_chet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_dalet")]
++		public const uint hebrew_dalet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_daleth")]
++		public const uint hebrew_daleth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_doublelowline")]
++		public const uint hebrew_doublelowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalkaph")]
++		public const uint hebrew_finalkaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalmem")]
++		public const uint hebrew_finalmem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalnun")]
++		public const uint hebrew_finalnun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalpe")]
++		public const uint hebrew_finalpe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzade")]
++		public const uint hebrew_finalzade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzadi")]
++		public const uint hebrew_finalzadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimel")]
++		public const uint hebrew_gimel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimmel")]
++		public const uint hebrew_gimmel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_he")]
++		public const uint hebrew_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_het")]
++		public const uint hebrew_het;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kaph")]
++		public const uint hebrew_kaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kuf")]
++		public const uint hebrew_kuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_lamed")]
++		public const uint hebrew_lamed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_mem")]
++		public const uint hebrew_mem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_nun")]
++		public const uint hebrew_nun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_pe")]
++		public const uint hebrew_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_qoph")]
++		public const uint hebrew_qoph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_resh")]
++		public const uint hebrew_resh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samech")]
++		public const uint hebrew_samech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samekh")]
++		public const uint hebrew_samekh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_shin")]
++		public const uint hebrew_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taf")]
++		public const uint hebrew_taf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taw")]
++		public const uint hebrew_taw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_tet")]
++		public const uint hebrew_tet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_teth")]
++		public const uint hebrew_teth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_waw")]
++		public const uint hebrew_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_yod")]
++		public const uint hebrew_yod;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zade")]
++		public const uint hebrew_zade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zadi")]
++		public const uint hebrew_zadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zain")]
++		public const uint hebrew_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zayin")]
++		public const uint hebrew_zayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hexagram")]
++		public const uint hexagram;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizconnector")]
++		public const uint horizconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan1")]
++		public const uint horizlinescan1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan3")]
++		public const uint horizlinescan3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan5")]
++		public const uint horizlinescan5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan7")]
++		public const uint horizlinescan7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan9")]
++		public const uint horizlinescan9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hstroke")]
++		public const uint hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ht")]
++		public const uint ht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hyphen")]
++		public const uint hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_i")]
++		public const uint i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iTouch")]
++		public const uint iTouch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iacute")]
++		public const uint iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibelowdot")]
++		public const uint ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibreve")]
++		public const uint ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_icircumflex")]
++		public const uint icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_identical")]
++		public const uint identical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idiaeresis")]
++		public const uint idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idotless")]
++		public const uint idotless;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ifonlyif")]
++		public const uint ifonlyif;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_igrave")]
++		public const uint igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ihook")]
++		public const uint ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_imacron")]
++		public const uint imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_implies")]
++		public const uint implies;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includedin")]
++		public const uint includedin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includes")]
++		public const uint includes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_infinity")]
++		public const uint infinity;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_integral")]
++		public const uint integral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_intersection")]
++		public const uint intersection;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iogonek")]
++		public const uint iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_itilde")]
++		public const uint itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_j")]
++		public const uint j;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jcircumflex")]
++		public const uint jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jot")]
++		public const uint jot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_k")]
++		public const uint k;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_A")]
++		public const uint kana_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_CHI")]
++		public const uint kana_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_E")]
++		public const uint kana_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_FU")]
++		public const uint kana_FU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HA")]
++		public const uint kana_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HE")]
++		public const uint kana_HE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HI")]
++		public const uint kana_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HO")]
++		public const uint kana_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HU")]
++		public const uint kana_HU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_I")]
++		public const uint kana_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KA")]
++		public const uint kana_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KE")]
++		public const uint kana_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KI")]
++		public const uint kana_KI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KO")]
++		public const uint kana_KO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KU")]
++		public const uint kana_KU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MA")]
++		public const uint kana_MA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ME")]
++		public const uint kana_ME;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MI")]
++		public const uint kana_MI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MO")]
++		public const uint kana_MO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MU")]
++		public const uint kana_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_N")]
++		public const uint kana_N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NA")]
++		public const uint kana_NA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NE")]
++		public const uint kana_NE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NI")]
++		public const uint kana_NI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NO")]
++		public const uint kana_NO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NU")]
++		public const uint kana_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_O")]
++		public const uint kana_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RA")]
++		public const uint kana_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RE")]
++		public const uint kana_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RI")]
++		public const uint kana_RI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RO")]
++		public const uint kana_RO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RU")]
++		public const uint kana_RU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SA")]
++		public const uint kana_SA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SE")]
++		public const uint kana_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SHI")]
++		public const uint kana_SHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SO")]
++		public const uint kana_SO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SU")]
++		public const uint kana_SU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TA")]
++		public const uint kana_TA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TE")]
++		public const uint kana_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TI")]
++		public const uint kana_TI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TO")]
++		public const uint kana_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TSU")]
++		public const uint kana_TSU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TU")]
++		public const uint kana_TU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_U")]
++		public const uint kana_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WA")]
++		public const uint kana_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WO")]
++		public const uint kana_WO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YA")]
++		public const uint kana_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YO")]
++		public const uint kana_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YU")]
++		public const uint kana_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_a")]
++		public const uint kana_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_closingbracket")]
++		public const uint kana_closingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_comma")]
++		public const uint kana_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_conjunctive")]
++		public const uint kana_conjunctive;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_e")]
++		public const uint kana_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_fullstop")]
++		public const uint kana_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_i")]
++		public const uint kana_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_middledot")]
++		public const uint kana_middledot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_o")]
++		public const uint kana_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_openingbracket")]
++		public const uint kana_openingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_switch")]
++		public const uint kana_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tsu")]
++		public const uint kana_tsu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tu")]
++		public const uint kana_tu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_u")]
++		public const uint kana_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ya")]
++		public const uint kana_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yo")]
++		public const uint kana_yo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yu")]
++		public const uint kana_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kappa")]
++		public const uint kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kcedilla")]
++		public const uint kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kra")]
++		public const uint kra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_l")]
++		public const uint l;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lacute")]
++		public const uint lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_latincross")]
++		public const uint latincross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lbelowdot")]
++		public const uint lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcaron")]
++		public const uint lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcedilla")]
++		public const uint lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftanglebracket")]
++		public const uint leftanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftarrow")]
++		public const uint leftarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftcaret")]
++		public const uint leftcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftdoublequotemark")]
++		public const uint leftdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftmiddlecurlybrace")]
++		public const uint leftmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftopentriangle")]
++		public const uint leftopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftpointer")]
++		public const uint leftpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftradical")]
++		public const uint leftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftshoe")]
++		public const uint leftshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftsinglequotemark")]
++		public const uint leftsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftt")]
++		public const uint leftt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lefttack")]
++		public const uint lefttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_less")]
++		public const uint less;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lessthanequal")]
++		public const uint lessthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lf")]
++		public const uint lf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicaland")]
++		public const uint logicaland;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicalor")]
++		public const uint logicalor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowleftcorner")]
++		public const uint lowleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowrightcorner")]
++		public const uint lowrightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lstroke")]
++		public const uint lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_m")]
++		public const uint m;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mabovedot")]
++		public const uint mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_macron")]
++		public const uint macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_malesymbol")]
++		public const uint malesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_maltesecross")]
++		public const uint maltesecross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_marker")]
++		public const uint marker;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_masculine")]
++		public const uint masculine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minus")]
++		public const uint minus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minutes")]
++		public const uint minutes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mu")]
++		public const uint mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_multiply")]
++		public const uint multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalflat")]
++		public const uint musicalflat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalsharp")]
++		public const uint musicalsharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_n")]
++		public const uint n;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nabla")]
++		public const uint nabla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nacute")]
++		public const uint nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncaron")]
++		public const uint ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncedilla")]
++		public const uint ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesubscript")]
++		public const uint ninesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesuperior")]
++		public const uint ninesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nl")]
++		public const uint nl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nobreakspace")]
++		public const uint nobreakspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notapproxeq")]
++		public const uint notapproxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notelementof")]
++		public const uint notelementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notequal")]
++		public const uint notequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notidentical")]
++		public const uint notidentical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notsign")]
++		public const uint notsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ntilde")]
++		public const uint ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numbersign")]
++		public const uint numbersign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numerosign")]
++		public const uint numerosign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_o")]
++		public const uint o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oacute")]
++		public const uint oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obarred")]
++		public const uint obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obelowdot")]
++		public const uint obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocaron")]
++		public const uint ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflex")]
++		public const uint ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexacute")]
++		public const uint ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexbelowdot")]
++		public const uint ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexgrave")]
++		public const uint ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexhook")]
++		public const uint ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflextilde")]
++		public const uint ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odiaeresis")]
++		public const uint odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odoubleacute")]
++		public const uint odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oe")]
++		public const uint oe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ogonek")]
++		public const uint ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ograve")]
++		public const uint ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohook")]
++		public const uint ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorn")]
++		public const uint ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornacute")]
++		public const uint ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornbelowdot")]
++		public const uint ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorngrave")]
++		public const uint ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornhook")]
++		public const uint ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorntilde")]
++		public const uint ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_omacron")]
++		public const uint omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oneeighth")]
++		public const uint oneeighth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onefifth")]
++		public const uint onefifth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onehalf")]
++		public const uint onehalf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onequarter")]
++		public const uint onequarter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesixth")]
++		public const uint onesixth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesubscript")]
++		public const uint onesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesuperior")]
++		public const uint onesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onethird")]
++		public const uint onethird;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ooblique")]
++		public const uint ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openrectbullet")]
++		public const uint openrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openstar")]
++		public const uint openstar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletdown")]
++		public const uint opentribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletup")]
++		public const uint opentribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ordfeminine")]
++		public const uint ordfeminine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oslash")]
++		public const uint oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_otilde")]
++		public const uint otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overbar")]
++		public const uint overbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overline")]
++		public const uint overline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_p")]
++		public const uint p;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_pabovedot")]
++		public const uint pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_paragraph")]
++		public const uint paragraph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenleft")]
++		public const uint parenleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenright")]
++		public const uint parenright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partdifferential")]
++		public const uint partdifferential;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partialderivative")]
++		public const uint partialderivative;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_percent")]
++		public const uint percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_period")]
++		public const uint period;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_periodcentered")]
++		public const uint periodcentered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_permille")]
++		public const uint permille;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_phonographcopyright")]
++		public const uint phonographcopyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plus")]
++		public const uint plus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plusminus")]
++		public const uint plusminus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prescription")]
++		public const uint prescription;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prolongedsound")]
++		public const uint prolongedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_punctspace")]
++		public const uint punctspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_q")]
++		public const uint q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quad")]
++		public const uint quad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_question")]
++		public const uint question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_questiondown")]
++		public const uint questiondown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quotedbl")]
++		public const uint quotedbl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteleft")]
++		public const uint quoteleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteright")]
++		public const uint quoteright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_r")]
++		public const uint r;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_racute")]
++		public const uint racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_radical")]
++		public const uint radical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcaron")]
++		public const uint rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcedilla")]
++		public const uint rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_registered")]
++		public const uint registered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightanglebracket")]
++		public const uint rightanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightarrow")]
++		public const uint rightarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightcaret")]
++		public const uint rightcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightdoublequotemark")]
++		public const uint rightdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlecurlybrace")]
++		public const uint rightmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlesummation")]
++		public const uint rightmiddlesummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightopentriangle")]
++		public const uint rightopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightpointer")]
++		public const uint rightpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightshoe")]
++		public const uint rightshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightsinglequotemark")]
++		public const uint rightsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightt")]
++		public const uint rightt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_righttack")]
++		public const uint righttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_s")]
++		public const uint s;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sabovedot")]
++		public const uint sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sacute")]
++		public const uint sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scaron")]
++		public const uint scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scedilla")]
++		public const uint scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_schwa")]
++		public const uint schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scircumflex")]
++		public const uint scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_script_switch")]
++		public const uint script_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seconds")]
++		public const uint seconds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_section")]
++		public const uint section;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semicolon")]
++		public const uint semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semivoicedsound")]
++		public const uint semivoicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seveneighths")]
++		public const uint seveneighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensubscript")]
++		public const uint sevensubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensuperior")]
++		public const uint sevensuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signaturemark")]
++		public const uint signaturemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signifblank")]
++		public const uint signifblank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_similarequal")]
++		public const uint similarequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_singlelowquotemark")]
++		public const uint singlelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsubscript")]
++		public const uint sixsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsuperior")]
++		public const uint sixsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_slash")]
++		public const uint slash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_soliddiamond")]
++		public const uint soliddiamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_space")]
++		public const uint space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_squareroot")]
++		public const uint squareroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ssharp")]
++		public const uint ssharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sterling")]
++		public const uint sterling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_stricteq")]
++		public const uint stricteq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_t")]
++		public const uint t;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tabovedot")]
++		public const uint tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcaron")]
++		public const uint tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcedilla")]
++		public const uint tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephone")]
++		public const uint telephone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephonerecorder")]
++		public const uint telephonerecorder;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_therefore")]
++		public const uint therefore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thinspace")]
++		public const uint thinspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thorn")]
++		public const uint thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threeeighths")]
++		public const uint threeeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threefifths")]
++		public const uint threefifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threequarters")]
++		public const uint threequarters;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesubscript")]
++		public const uint threesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesuperior")]
++		public const uint threesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tintegral")]
++		public const uint tintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topintegral")]
++		public const uint topintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftparens")]
++		public const uint topleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftradical")]
++		public const uint topleftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsqbracket")]
++		public const uint topleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsummation")]
++		public const uint topleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightparens")]
++		public const uint toprightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsqbracket")]
++		public const uint toprightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsummation")]
++		public const uint toprightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topt")]
++		public const uint topt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topvertsummationconnector")]
++		public const uint topvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademark")]
++		public const uint trademark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademarkincircle")]
++		public const uint trademarkincircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tslash")]
++		public const uint tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twofifths")]
++		public const uint twofifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosubscript")]
++		public const uint twosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosuperior")]
++		public const uint twosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twothirds")]
++		public const uint twothirds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_u")]
++		public const uint u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uacute")]
++		public const uint uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubelowdot")]
++		public const uint ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubreve")]
++		public const uint ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ucircumflex")]
++		public const uint ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udiaeresis")]
++		public const uint udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udoubleacute")]
++		public const uint udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ugrave")]
++		public const uint ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhook")]
++		public const uint uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorn")]
++		public const uint uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornacute")]
++		public const uint uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornbelowdot")]
++		public const uint uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorngrave")]
++		public const uint uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornhook")]
++		public const uint uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorntilde")]
++		public const uint uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_umacron")]
++		public const uint umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underbar")]
++		public const uint underbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underscore")]
++		public const uint underscore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_union")]
++		public const uint union;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uogonek")]
++		public const uint uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uparrow")]
++		public const uint uparrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upcaret")]
++		public const uint upcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upleftcorner")]
++		public const uint upleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uprightcorner")]
++		public const uint uprightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upshoe")]
++		public const uint upshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upstile")]
++		public const uint upstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uptack")]
++		public const uint uptack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uring")]
++		public const uint uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_utilde")]
++		public const uint utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_v")]
++		public const uint v;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_variation")]
++		public const uint variation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertbar")]
++		public const uint vertbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertconnector")]
++		public const uint vertconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_voicedsound")]
++		public const uint voicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vt")]
++		public const uint vt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_w")]
++		public const uint w;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wacute")]
++		public const uint wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wcircumflex")]
++		public const uint wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wdiaeresis")]
++		public const uint wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wgrave")]
++		public const uint wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_x")]
++		public const uint x;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_xabovedot")]
++		public const uint xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_y")]
++		public const uint y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yacute")]
++		public const uint yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ybelowdot")]
++		public const uint ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ycircumflex")]
++		public const uint ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ydiaeresis")]
++		public const uint ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yen")]
++		public const uint yen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ygrave")]
++		public const uint ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yhook")]
++		public const uint yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ytilde")]
++		public const uint ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_z")]
++		public const uint z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zabovedot")]
++		public const uint zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zacute")]
++		public const uint zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zcaron")]
++		public const uint zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosubscript")]
++		public const uint zerosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosuperior")]
++		public const uint zerosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zstroke")]
++		public const uint zstroke;
++	}
++	namespace Threads {
++		namespace Idle {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")]
++			[Version (since = "0.4")]
++			public static uint add (GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, owned GLib.SourceFunc func);
++		}
++		namespace Timeout {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")]
++			[Version (since = "0.4")]
++			public static uint add (uint interval, GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func);
++		}
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static uint add_repaint_func (owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static uint add_repaint_func_full (Clutter.RepaintFlags flags, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static void remove_repaint_func (uint handle_id);
++	}
++	namespace Value {
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static Clutter.PaintNode dup_paint_node (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Color? get_color (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static unowned Clutter.PaintNode get_paint_node (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_float (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned int[] get_shader_int (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_matrix (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Units? get_units (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_color (GLib.Value value, Clutter.Color color);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void set_paint_node (GLib.Value value, Clutter.PaintNode? node);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_units (GLib.Value value, Clutter.Units units);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void take_paint_node (GLib.Value value, Clutter.PaintNode? node);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_action_get_type ()")]
++	public abstract class Action : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Action ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")]
++	public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		public uint32 flags;
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.10")]
++		public Actor ();
++		[Version (since = "1.4")]
++		public void add_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void add_action_with_name (string name, Clutter.Action action);
++		[Version (since = "1.10")]
++		public void add_child (Clutter.Actor child);
++		[Version (since = "1.4")]
++		public void add_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_constraint_with_name (string name, Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void add_effect_with_name (string name, Clutter.Effect effect);
++		[Version (since = "1.10")]
++		public void add_transition (string name, Clutter.Transition transition);
++		[Version (since = "0.8")]
++		public virtual void allocate (Clutter.ActorBox box);
++		[Version (since = "1.4")]
++		public void allocate_align_fill (Clutter.ActorBox box, double x_align, double y_align, bool x_fill, bool y_fill);
++		[Version (since = "1.0")]
++		public void allocate_available_size (float x, float y, float available_width, float available_height);
++		[Version (since = "0.8")]
++		public void allocate_preferred_size (float x, float y);
++		[Version (since = "0.6")]
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
++		[NoWrapper]
++		public virtual void apply_transform (ref Graphene.Matrix matrix);
++		[Version (since = "0.4")]
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
++		[Version (since = "1.24")]
++		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
++		[NoWrapper]
++		public virtual float calculate_resource_scale (int phase);
++		[Version (since = "1.4")]
++		public void clear_actions ();
++		[Version (since = "1.4")]
++		public void clear_constraints ();
++		[Version (since = "1.4")]
++		public void clear_effects ();
++		[Version (since = "1.4")]
++		public bool contains (Clutter.Actor descendant);
++		[Version (since = "1.8")]
++		public void continue_paint (Clutter.PaintContext paint_context);
++		public void continue_pick (Clutter.PickContext pick_context);
++		[Version (since = "1.0")]
++		public Pango.Context create_pango_context ();
++		[Version (since = "1.0")]
++		public Pango.Layout create_pango_layout (string? text);
++		[Version (since = "1.10")]
++		public void destroy_all_children ();
++		[CCode (cname = "clutter_actor_event")]
++		[Version (since = "0.6")]
++		public bool emit_event (Clutter.Event event, bool capture);
++		[Version (since = "0.4")]
++		public void get_abs_allocation_vertices ([CCode (array_length = false)] Graphene.Point3D verts[4]);
++		public virtual unowned Atk.Object get_accessible ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Action get_action (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Action> get_actions ();
++		[Version (since = "0.8")]
++		public Clutter.ActorBox get_allocation_box ();
++		[Version (since = "1.10")]
++		public Clutter.Color get_background_color ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_child_at_index (int index_);
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_child_transform ();
++		[Version (since = "1.10")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[Version (since = "0.6")]
++		public void get_clip (out float xoff, out float yoff, out float width, out float height);
++		[Version (since = "1.4")]
++		public bool get_clip_to_allocation ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Constraint get_constraint (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Constraint> get_constraints ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Content get_content ();
++		[Version (since = "1.10")]
++		public Clutter.ActorBox get_content_box ();
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity get_content_gravity ();
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat get_content_repeat ();
++		[Version (since = "1.10")]
++		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
++		[Version (since = "1.10")]
++		public uint get_easing_delay ();
++		[Version (since = "1.10")]
++		public uint get_easing_duration ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_easing_mode ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Effect get_effect (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Effect> get_effects ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_first_child ();
++		public bool get_fixed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public bool get_fixed_position_set ();
++		[Version (since = "1.0")]
++		public Clutter.ActorFlags get_flags ();
++		[CCode (cname = "clutter_actor_has_pointer")]
++		[Version (since = "1.2")]
++		public bool get_has_pointer ();
++		public float get_height ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_last_child ();
++		[Version (since = "1.10")]
++		public unowned Clutter.LayoutManager get_layout_manager ();
++		[Version (since = "1.10")]
++		public Clutter.Margin get_margin ();
++		[Version (since = "1.10")]
++		public float get_margin_bottom ();
++		[Version (since = "1.10")]
++		public float get_margin_left ();
++		[Version (since = "1.10")]
++		public float get_margin_right ();
++		[Version (since = "1.10")]
++		public float get_margin_top ();
++		[Version (since = "1.10")]
++		public int get_n_children ();
++		public unowned string get_name ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_next_sibling ();
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect get_offscreen_redirect ();
++		public uint8 get_opacity ();
++		[Version (since = "1.22")]
++		public int get_opacity_override ();
++		[Version (since = "1.6")]
++		public bool get_paint_box (out Clutter.ActorBox box);
++		[Version (since = "0.8")]
++		public uint8 get_paint_opacity ();
++		[Version (since = "0.8")]
++		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
++		[NoWrapper]
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
++		[Version (since = "1.0")]
++		public unowned Pango.Context get_pango_context ();
++		public unowned Clutter.Actor? get_parent ();
++		[Version (since = "1.12")]
++		public void get_pivot_point (out float pivot_x, out float pivot_y);
++		[Version (since = "1.12")]
++		public float get_pivot_point_z ();
++		[Version (since = "0.6")]
++		public void get_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_height (float for_width, out float min_height_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public void get_preferred_size (out float min_width_p, out float min_height_p, out float natural_width_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_width (float for_height, out float min_width_p, out float natural_width_p);
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_previous_sibling ();
++		[Version (since = "0.6")]
++		public bool get_reactive ();
++		[Version (since = "1.2")]
++		public Clutter.RequestMode get_request_mode ();
++		public float get_resource_scale ();
++		[Version (since = "1.12")]
++		public double get_rotation_angle (Clutter.RotateAxis axis);
++		[Version (since = "0.2")]
++		public void get_scale (out double scale_x, out double scale_y);
++		[Version (since = "1.12")]
++		public double get_scale_z ();
++		[Version (since = "0.2")]
++		public void get_size (out float width, out float height);
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "1.2")]
++		public Clutter.TextDirection get_text_direction ();
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_transform ();
++		public Graphene.Rect get_transformed_extents ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		[Version (since = "0.8")]
++		public void get_transformed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public void get_transformed_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Clutter.Transition get_transition (string name);
++		[Version (since = "1.12")]
++		public void get_translation (out float translate_x, out float translate_y, out float translate_z);
++		public float get_width ();
++		public float get_x ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_x_align ();
++		[Version (since = "1.12")]
++		public bool get_x_expand ();
++		public float get_y ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_y_align ();
++		[Version (since = "1.12")]
++		public bool get_y_expand ();
++		[Version (since = "1.12")]
++		public float get_z_position ();
++		[Version (since = "1.0")]
++		public void grab_key_focus ();
++		public virtual bool has_accessible ();
++		[Version (since = "1.10")]
++		public bool has_actions ();
++		[Version (since = "1.4")]
++		public bool has_allocation ();
++		[Version (since = "1.10")]
++		public bool has_constraints ();
++		public bool has_damage ();
++		[Version (since = "1.10")]
++		public bool has_effects ();
++		[Version (since = "1.4")]
++		public bool has_key_focus ();
++		public bool has_mapped_clones ();
++		[Version (since = "1.8")]
++		public virtual bool has_overlaps ();
++		[NoWrapper]
++		public virtual void hide_all ();
++		public void inhibit_culling ();
++		[Version (since = "1.10")]
++		public void insert_child_above (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void insert_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void insert_child_below (Clutter.Actor child, Clutter.Actor? sibling);
++		public void invalidate_transform ();
++		public bool is_effectively_on_stage_view (Clutter.StageView view);
++		[Version (since = "1.0")]
++		public bool is_in_clone_paint ();
++		[Version (since = "1.24")]
++		public bool is_mapped ();
++		[Version (since = "1.24")]
++		public bool is_realized ();
++		[Version (since = "0.6")]
++		public bool is_rotated ();
++		[Version (since = "0.6")]
++		public bool is_scaled ();
++		[Version (since = "1.24")]
++		public bool is_visible ();
++		[Version (since = "1.0")]
++		public virtual void map ();
++		[Version (since = "0.2")]
++		public void move_by (float dx, float dy);
++		[Version (since = "1.12")]
++		public bool needs_expand (Clutter.Orientation orientation);
++		public virtual void paint (Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode root);
++		public unowned GLib.List<Clutter.StageView> peek_stage_views ();
++		public void pick_box (Clutter.PickContext pick_context, Clutter.ActorBox box);
++		public void queue_redraw ();
++		[Version (since = "1.10")]
++		public void queue_redraw_with_clip (Cairo.RectangleInt? clip);
++		[Version (since = "1.4")]
++		public void remove_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void remove_action_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_all_children ();
++		[Version (since = "1.10")]
++		public void remove_all_transitions ();
++		[Version (since = "1.10")]
++		public void remove_child (Clutter.Actor child);
++		public void remove_clip ();
++		[Version (since = "1.4")]
++		public void remove_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void remove_constraint_by_name (string name);
++		[Version (since = "1.4")]
++		public void remove_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void remove_effect_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_transition (string name);
++		[Version (since = "1.10")]
++		public void replace_child (Clutter.Actor old_child, Clutter.Actor new_child);
++		[Version (since = "1.10")]
++		public void restore_easing_state ();
++		[Version (since = "1.10")]
++		public void save_easing_state ();
++		[Version (since = "1.10")]
++		public void set_allocation (Clutter.ActorBox box);
++		[Version (since = "1.10")]
++		public void set_background_color (Clutter.Color? color);
++		[Version (since = "1.10")]
++		public void set_child_above_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void set_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void set_child_below_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.12")]
++		public void set_child_transform (Graphene.Matrix? transform);
++		[Version (since = "0.6")]
++		public void set_clip (float xoff, float yoff, float width, float height);
++		[Version (since = "1.4")]
++		public void set_clip_to_allocation (bool clip_set);
++		[Version (since = "1.10")]
++		public void set_content (Clutter.Content? content);
++		[Version (since = "1.10")]
++		public void set_content_gravity (Clutter.ContentGravity gravity);
++		[Version (since = "1.12")]
++		public void set_content_repeat (Clutter.ContentRepeat repeat);
++		[Version (since = "1.10")]
++		public void set_content_scaling_filters (Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_easing_delay (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_duration (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_mode (Clutter.AnimationMode mode);
++		[Version (since = "0.8")]
++		public void set_fixed_position_set (bool is_set);
++		[Version (since = "1.0")]
++		public void set_flags (Clutter.ActorFlags flags);
++		[Version (since = "0.2")]
++		public void set_height (float height);
++		[Version (since = "1.10")]
++		public void set_layout_manager (Clutter.LayoutManager? manager);
++		[Version (since = "1.10")]
++		public void set_margin (Clutter.Margin margin);
++		[Version (since = "1.10")]
++		public void set_margin_bottom (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_left (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_right (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_top (float margin);
++		public void set_name (string name);
++		[Version (since = "1.8")]
++		public void set_offscreen_redirect (Clutter.OffscreenRedirect redirect);
++		public void set_opacity (uint8 opacity);
++		public void set_opacity_override (int opacity);
++		[Version (since = "1.12")]
++		public void set_pivot_point (float pivot_x, float pivot_y);
++		[Version (since = "1.12")]
++		public void set_pivot_point_z (float pivot_z);
++		public void set_position (float x, float y);
++		[Version (since = "0.6")]
++		public void set_reactive (bool reactive);
++		[Version (since = "1.2")]
++		public void set_request_mode (Clutter.RequestMode mode);
++		[Version (since = "1.12")]
++		public void set_rotation_angle (Clutter.RotateAxis axis, double angle);
++		[Version (since = "0.2")]
++		public void set_scale (double scale_x, double scale_y);
++		[Version (since = "1.12")]
++		public void set_scale_z (double scale_z);
++		public void set_size (float width, float height);
++		[Version (since = "1.2")]
++		public void set_text_direction (Clutter.TextDirection text_dir);
++		[Version (since = "1.12")]
++		public void set_transform (Graphene.Matrix? transform);
++		[Version (since = "1.12")]
++		public void set_translation (float translate_x, float translate_y, float translate_z);
++		[Version (since = "0.2")]
++		public void set_width (float width);
++		[Version (since = "0.6")]
++		public void set_x (float x);
++		[Version (since = "1.10")]
++		public void set_x_align (Clutter.ActorAlign x_align);
++		[Version (since = "1.12")]
++		public void set_x_expand (bool expand);
++		[Version (since = "0.6")]
++		public void set_y (float y);
++		[Version (since = "1.10")]
++		public void set_y_align (Clutter.ActorAlign y_align);
++		[Version (since = "1.12")]
++		public void set_y_expand (bool expand);
++		[Version (since = "1.12")]
++		public void set_z_position (float z_position);
++		public bool should_pick (Clutter.PickContext pick_context);
++		[Version (since = "0.6")]
++		public bool transform_stage_point (float x, float y, out float x_out, out float y_out);
++		public void uninhibit_culling ();
++		[Version (since = "1.0")]
++		public virtual void unmap ();
++		[Version (since = "1.0")]
++		public void unset_flags (Clutter.ActorFlags flags);
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Action actions { set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public Clutter.ActorBox allocation { owned get; }
++		[Version (since = "1.10")]
++		public Clutter.Color background_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.10")]
++		public bool background_color_set { get; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix child_transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool child_transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Rect clip_rect { owned get; set; }
++		[Version (since = "1.0")]
++		public bool clip_to_allocation { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Constraint constraints { set; }
++		[Version (since = "1.10")]
++		public Clutter.Content content { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorBox content_box { get; }
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity content_gravity { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat content_repeat { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Effect effect { set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor first_child { get; }
++		[Version (since = "0.8")]
++		public bool fixed_position_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_y { get; set; }
++		[NoAccessorMethod]
++		public bool has_clip { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public bool has_pointer { get; }
++		public float height { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor last_child { get; }
++		[Version (since = "1.10")]
++		public Clutter.LayoutManager layout_manager { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter magnification_filter { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool mapped { get; }
++		[Version (since = "1.10")]
++		public float margin_bottom { get; set; }
++		[Version (since = "1.10")]
++		public float margin_left { get; set; }
++		[Version (since = "1.10")]
++		public float margin_right { get; set; }
++		[Version (since = "1.10")]
++		public float margin_top { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_width_set { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter minification_filter { get; set; }
++		[Version (since = "0.2")]
++		public string name { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_width_set { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect offscreen_redirect { get; set; }
++		public uint opacity { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point pivot_point { owned get; set; }
++		[Version (since = "1.12")]
++		public float pivot_point_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point position { owned get; set; }
++		[Version (since = "0.6")]
++		public bool reactive { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool realized { get; }
++		[Version (since = "0.8")]
++		public Clutter.RequestMode request_mode { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_y { get; set; }
++		[Version (since = "1.12")]
++		public double scale_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool show_on_set_parent { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Size size { owned get; set; }
++		[Version (since = "1.0")]
++		public Clutter.TextDirection text_direction { get; set; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_z { get; set; }
++		[NoAccessorMethod]
++		public bool visible { get; set; }
++		public float width { get; set; }
++		public float x { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign x_align { get; set; }
++		[Version (since = "1.12")]
++		public bool x_expand { get; set; }
++		public float y { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign y_align { get; set; }
++		[Version (since = "1.12")]
++		public bool y_expand { get; set; }
++		[Version (since = "1.12")]
++		public float z_position { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal bool button_press_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool button_release_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool captured_event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void destroy ();
++		[Version (since = "0.6")]
++		public virtual signal bool enter_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void hide ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_in ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_out ();
++		[Version (since = "0.6")]
++		public virtual signal bool key_press_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool key_release_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool leave_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool motion_event (Clutter.MotionEvent event);
++		[Version (since = "0.2")]
++		public virtual signal void parent_set (Clutter.Actor? old_parent);
++		[HasEmitter]
++		[Version (since = "1.0")]
++		public virtual signal void pick (Clutter.PickContext pick_context);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public virtual signal void queue_relayout ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void realize ();
++		public virtual signal void resource_scale_changed ();
++		[Version (since = "0.6")]
++		public virtual signal bool scroll_event (Clutter.ScrollEvent event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void show ();
++		public signal void stage_views_changed ();
++		[Version (since = "1.12")]
++		public virtual signal bool touch_event (Clutter.Event event);
++		[Version (since = "1.12")]
++		public signal void transition_stopped (string name, bool is_finished);
++		[Version (since = "1.10")]
++		public signal void transitions_completed ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void unrealize ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_meta_get_type ()")]
++	public abstract class ActorMeta : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected ActorMeta ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public bool get_enabled ();
++		[Version (since = "1.4")]
++		public unowned string get_name ();
++		[NoWrapper]
++		public virtual void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.4")]
++		public virtual void set_enabled (bool is_enabled);
++		[Version (since = "1.4")]
++		public void set_name (string name);
++		[Version (since = "1.4")]
++		public Clutter.Actor actor { get; }
++		[Version (since = "1.4")]
++		public bool enabled { get; set; }
++		[Version (since = "1.4")]
++		public string name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_node_get_type ()")]
++	public class ActorNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ActorNode (Clutter.Actor actor, int opacity);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class AlignConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
++		public Clutter.AlignAxis get_align_axis ();
++		public float get_factor ();
++		public Graphene.Point get_pivot_point ();
++		public unowned Clutter.Actor get_source ();
++		public void set_align_axis (Clutter.AlignAxis axis);
++		public void set_factor (float factor);
++		public void set_pivot_point (Graphene.Point pivot_point);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.AlignAxis align_axis { get; set construct; }
++		public float factor { get; set construct; }
++		public Graphene.Point pivot_point { get; set; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class AnyEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_backend_get_type ()")]
++	[Version (since = "0.4")]
++	public abstract class Backend : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
++		public unowned Clutter.Seat get_default_seat ();
++		[Version (since = "0.8")]
++		public unowned Cairo.FontOptions get_font_options ();
++		public unowned Clutter.InputMethod get_input_method ();
++		public double get_resolution ();
++		[Version (since = "0.8")]
++		public void set_font_options (Cairo.FontOptions options);
++		public void set_input_method (Clutter.InputMethod method);
++		[Version (since = "1.0")]
++		public signal void font_changed ();
++		[Version (since = "1.0")]
++		public signal void resolution_changed ();
++		[Version (since = "1.4")]
++		public signal void settings_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BinLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BinLayout (Clutter.BinAlignment x_align = Clutter.BinAlignment.START, Clutter.BinAlignment y_align = Clutter.BinAlignment.START);
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment x_align { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment y_align { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class BindConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
++		public Clutter.BindCoordinate get_coordinate ();
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_coordinate (Clutter.BindCoordinate coordinate);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.BindCoordinate coordinate { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
++	[Version (since = "1.0")]
++	public class BindingPool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public BindingPool (string name);
++		public bool activate (uint key_val, Clutter.ModifierType modifiers, GLib.Object gobject);
++		public void block_action (string action_name);
++		public static unowned Clutter.BindingPool find (string name);
++		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
++		public static unowned Clutter.BindingPool get_for_class (void* klass);
++		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
++		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
++		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void remove_action (uint key_val, Clutter.ModifierType modifiers);
++		public void unblock_action (string action_name);
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blit_node_get_type ()")]
++	public class BlitNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlitNode (Cogl.Framebuffer src);
++		public void add_blit_rectangle (int src_x, int src_y, int dst_x, int dst_y, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class BlurEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BlurEffect ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_node_get_type ()")]
++	public class BlurNode : Clutter.LayerNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlurNode (uint width, uint height, float sigma);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BoxLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BoxLayout ();
++		[Version (since = "1.4")]
++		public bool get_homogeneous ();
++		[Version (since = "1.12")]
++		public Clutter.Orientation get_orientation ();
++		public bool get_pack_start ();
++		public uint get_spacing ();
++		[Version (since = "1.4")]
++		public void set_homogeneous (bool homogeneous);
++		[Version (since = "1.12")]
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_pack_start (bool pack_start);
++		public void set_spacing (uint spacing);
++		[Version (since = "1.4")]
++		public bool homogeneous { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.Orientation orientation { get; set; }
++		public bool pack_start { get; set; }
++		public uint spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_brightness_contrast_effect_get_type ()")]
++	[Version (since = "1.10")]
++	public class BrightnessContrastEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BrightnessContrastEffect ();
++		public void get_brightness (out float red, out float green, out float blue);
++		public void get_contrast (out float red, out float green, out float blue);
++		public void set_brightness (float brightness);
++		public void set_brightness_full (float red, float green, float blue);
++		public void set_contrast (float contrast);
++		public void set_contrast_full (float red, float green, float blue);
++		[NoAccessorMethod]
++		public Clutter.Color brightness { owned get; set; }
++		[NoAccessorMethod]
++		public Clutter.Color contrast { owned get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ButtonEvent : Clutter.Event {
++		public double axes;
++		public uint32 button;
++		public uint click_count;
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")]
++	[Version (since = "1.10")]
++	public class Canvas : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Canvas ();
++		public float get_scale_factor ();
++		public void set_scale_factor (float scale);
++		public bool set_size (int width, int height);
++		[NoAccessorMethod]
++		public int height { get; set; }
++		public float scale_factor { get; set; }
++		[NoAccessorMethod]
++		public int width { get; set; }
++		public virtual signal bool draw (Cairo.Context cr, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
++	[Version (since = "0.8")]
++	public abstract class ChildMeta : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected ChildMeta ();
++		public unowned Clutter.Actor get_actor ();
++		public unowned Clutter.Container get_container ();
++		public Clutter.Actor actor { get; construct; }
++		public Clutter.Container container { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_action_get_type ()")]
++	public class ClickAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.4")]
++		public ClickAction ();
++		[Version (since = "1.4")]
++		public uint get_button ();
++		[Version (since = "1.8")]
++		public void get_coords (out float press_x, out float press_y);
++		[Version (since = "1.6")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.4")]
++		public void release ();
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool held { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_threshold { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool pressed { get; }
++		[Version (since = "1.4")]
++		public virtual signal void clicked (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool long_press (Clutter.Actor actor, Clutter.LongPressState state);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clip_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ClipNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ClipNode ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")]
++	[Version (since = "1.0")]
++	public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Clone (Clutter.Actor source);
++		public unowned Clutter.Actor get_source ();
++		public void set_source (Clutter.Actor? source);
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_color_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ColorNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ColorNode (Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ColorizeEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public ColorizeEffect (Clutter.Color tint);
++		public Clutter.Color get_tint ();
++		public void set_tint (Clutter.Color tint);
++		public Clutter.Color tint { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Constraint : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Constraint ();
++		[NoWrapper]
++		public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
++		public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, ref float minimum_size, ref float natural_size);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class CrossingEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor related;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class DeformEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false)]
++		protected DeformEffect ();
++		[NoWrapper]
++		public virtual void deform_vertex (float width, float height, Cogl.TextureVertex vertex);
++		public unowned Cogl.Handle get_back_material ();
++		public void get_n_tiles (out uint x_tiles, out uint y_tiles);
++		public void invalidate ();
++		public void set_back_material (Cogl.Handle? material);
++		public void set_n_tiles (uint x_tiles, uint y_tiles);
++		[NoAccessorMethod]
++		public uint x_tiles { get; set; }
++		[NoAccessorMethod]
++		public uint y_tiles { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_desaturate_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class DesaturateEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public DesaturateEffect (double factor);
++		public double get_factor ();
++		public void set_factor (double factor);
++		public double factor { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Effect : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Effect ();
++		[NoWrapper]
++		public virtual bool modify_paint_volume (Clutter.PaintVolume volume);
++		[NoWrapper]
++		public virtual void paint (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void pick (Clutter.PickContext pick_context);
++		[NoWrapper]
++		public virtual void post_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual bool pre_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.8")]
++		public void queue_repaint ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")]
++	[Compact]
++	[Version (since = "0.2")]
++	public class Event {
++		public Clutter.EventType type;
++		[CCode (has_construct_function = false)]
++		public Event (Clutter.EventType type);
++		[Version (since = "1.18")]
++		public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
++		public Clutter.Event copy ();
++		public void free ();
++		[Version (since = "0.4")]
++		public static Clutter.Event @get ();
++		[Version (since = "1.12")]
++		public double get_angle (Clutter.Event target);
++		[Version (since = "1.6")]
++		public double get_axes (out uint n_axes);
++		[Version (since = "1.0")]
++		public uint32 get_button ();
++		[Version (since = "1.0")]
++		public uint get_click_count ();
++		[Version (since = "0.4")]
++		public void get_coords (out float x, out float y);
++		[Version (since = "1.0")]
++		public unowned Clutter.InputDevice get_device ();
++		[Version (since = "1.28")]
++		public unowned Clutter.InputDeviceTool get_device_tool ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.12")]
++		public float get_distance (Clutter.Event target);
++		public uint32 get_event_code ();
++		[Version (since = "1.10")]
++		public unowned Clutter.EventSequence get_event_sequence ();
++		[Version (since = "1.0")]
++		public Clutter.EventFlags get_flags ();
++		[Version (since = "1.24")]
++		public void get_gesture_motion_delta (out double dx, out double dy);
++		public Clutter.TouchpadGesturePhase get_gesture_phase ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_angle_delta ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_scale ();
++		[Version (since = "1.0")]
++		public uint16 get_key_code ();
++		[Version (since = "1.0")]
++		public uint get_key_symbol ();
++		public unichar get_key_unicode ();
++		public uint get_mode_group ();
++		public bool get_pad_event_details (out uint number, out uint mode, out double value);
++		[Version (since = "1.12")]
++		public Graphene.Point get_position ();
++		[Version (since = "1.0")]
++		public unowned Clutter.Actor get_related ();
++		public bool get_relative_motion (double dx, double dy, double dx_unaccel, double dy_unaccel);
++		[Version (since = "1.10")]
++		public void get_scroll_delta (out double dx, out double dy);
++		[Version (since = "1.0")]
++		public Clutter.ScrollDirection get_scroll_direction ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollFinishFlags get_scroll_finish_flags ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollSource get_scroll_source ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_source ();
++		[Version (since = "1.6")]
++		public unowned Clutter.InputDevice get_source_device ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "0.4")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.16")]
++		public void get_state_full (out Clutter.ModifierType button_state, out Clutter.ModifierType base_state, out Clutter.ModifierType latched_state, out Clutter.ModifierType locked_state, out Clutter.ModifierType effective_state);
++		[Version (since = "0.4")]
++		public uint32 get_time ();
++		public int64 get_time_us ();
++		[Version (since = "1.24")]
++		public uint get_touchpad_gesture_finger_count ();
++		[CCode (cname = "clutter_event_type")]
++		public Clutter.EventType get_type ();
++		[Version (since = "1.12")]
++		public bool has_control_modifier ();
++		[Version (since = "1.12")]
++		public bool has_shift_modifier ();
++		[Version (since = "1.12")]
++		public bool is_pointer_emulated ();
++		[Version (since = "0.6")]
++		public void put ();
++		[Version (since = "1.18")]
++		public static void remove_filter (uint id);
++		[Version (since = "1.8")]
++		public void set_button (uint32 button);
++		[Version (since = "1.8")]
++		public void set_coords (float x, float y);
++		[Version (since = "1.6")]
++		public void set_device (Clutter.InputDevice? device);
++		[Version (since = "1.28")]
++		public void set_device_tool (Clutter.InputDeviceTool? tool);
++		[Version (since = "1.8")]
++		public void set_flags (Clutter.EventFlags flags);
++		[Version (since = "1.8")]
++		public void set_key_code (uint16 key_code);
++		[Version (since = "1.8")]
++		public void set_key_symbol (uint key_sym);
++		[Version (since = "1.8")]
++		public void set_key_unicode (unichar key_unicode);
++		[Version (since = "1.8")]
++		public void set_related (Clutter.Actor? actor);
++		[Version (since = "1.10")]
++		public void set_scroll_delta (double dx, double dy);
++		[Version (since = "1.8")]
++		public void set_scroll_direction (Clutter.ScrollDirection direction);
++		[Version (since = "1.8")]
++		public void set_source (Clutter.Actor? actor);
++		[Version (since = "1.8")]
++		public void set_source_device (Clutter.InputDevice? device);
++		[Version (since = "1.8")]
++		public void set_stage (Clutter.Stage? stage);
++		[Version (since = "1.8")]
++		public void set_state (Clutter.ModifierType state);
++		[Version (since = "1.8")]
++		public void set_time (uint32 time_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_sequence_get_type ()")]
++	[Compact]
++	[Version (since = "1.12")]
++	public class EventSequence {
++		public int32 get_slot ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fixed_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FixedLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FixedLayout ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FlowLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FlowLayout (Clutter.FlowOrientation orientation);
++		public float get_column_spacing ();
++		public void get_column_width (out float min_width, out float max_width);
++		public bool get_homogeneous ();
++		public Clutter.FlowOrientation get_orientation ();
++		public void get_row_height (out float min_height, out float max_height);
++		public float get_row_spacing ();
++		[Version (since = "1.16")]
++		public bool get_snap_to_grid ();
++		public void set_column_spacing (float spacing);
++		public void set_column_width (float min_width, float max_width);
++		public void set_homogeneous (bool homogeneous);
++		public void set_orientation (Clutter.FlowOrientation orientation);
++		public void set_row_height (float min_height, float max_height);
++		public void set_row_spacing (float spacing);
++		[Version (since = "1.16")]
++		public void set_snap_to_grid (bool snap_to_grid);
++		public float column_spacing { get; set; }
++		public bool homogeneous { get; set; }
++		[NoAccessorMethod]
++		public float max_column_width { get; set; }
++		[NoAccessorMethod]
++		public float max_row_height { get; set; }
++		[NoAccessorMethod]
++		public float min_column_width { get; set; }
++		[NoAccessorMethod]
++		public float min_row_height { get; set; }
++		public Clutter.FlowOrientation orientation { get; set construct; }
++		public float row_spacing { get; set; }
++		[Version (since = "1.16")]
++		public bool snap_to_grid { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++		public bool has_result ();
++		public void set_result (Clutter.FrameResult result);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
++	public class FrameClock : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameClock ();
++		public void add_timeline (Clutter.Timeline timeline);
++		public float get_refresh_rate ();
++		public void inhibit ();
++		public void notify_ready ();
++		public void remove_timeline (Clutter.Timeline timeline);
++		public void schedule_update ();
++		public void schedule_update_now ();
++		public void uninhibit ();
++		[HasEmitter]
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_gesture_action_get_type ()")]
++	public class GestureAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.8")]
++		public GestureAction ();
++		[Version (since = "1.12")]
++		public void cancel ();
++		[NoWrapper]
++		public virtual bool gesture_prepare (Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public unowned Clutter.InputDevice get_device (uint point);
++		[Version (since = "1.14")]
++		public unowned Clutter.Event get_last_event (uint point);
++		[Version (since = "1.8")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.12")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		[Version (since = "1.12")]
++		public uint get_n_current_points ();
++		[Version (since = "1.12")]
++		public int get_n_touch_points ();
++		[Version (since = "1.8")]
++		public void get_press_coords (uint point, out float press_x, out float press_y);
++		[Version (since = "1.8")]
++		public void get_release_coords (uint point, out float release_x, out float release_y);
++		[Version (since = "1.12")]
++		public unowned Clutter.EventSequence get_sequence (uint point);
++		[Version (since = "1.18")]
++		public void get_threshold_trigger_distance (out float x, out float y);
++		[Version (since = "1.20")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_edge ();
++		[Version (deprecated = true, deprecated_since = "1.20", since = "1.18")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_egde ();
++		[Version (since = "1.12")]
++		public float get_velocity (uint point, out float velocity_x, out float velocity_y);
++		[Version (since = "1.12")]
++		public void set_n_touch_points (int nb_points);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_distance (float x, float y);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_edge (Clutter.GestureTriggerEdge edge);
++		[Version (since = "1.16")]
++		public int n_touch_points { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_x { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_y { get; construct; }
++		[Version (since = "1.18")]
++		public Clutter.GestureTriggerEdge threshold_trigger_edge { get; construct; }
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_begin (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_cancel (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_end (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_progress (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")]
++	[Version (since = "1.12")]
++	public class GridLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public GridLayout ();
++		public void attach (Clutter.Actor child, int left, int top, int width, int height);
++		public void attach_next_to (Clutter.Actor child, Clutter.Actor? sibling, Clutter.GridPosition side, int width, int height);
++		public unowned Clutter.Actor get_child_at (int left, int top);
++		public bool get_column_homogeneous ();
++		public uint get_column_spacing ();
++		public Clutter.Orientation get_orientation ();
++		public bool get_row_homogeneous ();
++		public uint get_row_spacing ();
++		public void insert_column (int position);
++		public void insert_next_to (Clutter.Actor sibling, Clutter.GridPosition side);
++		public void insert_row (int position);
++		public void set_column_homogeneous (bool homogeneous);
++		public void set_column_spacing (uint spacing);
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_row_homogeneous (bool homogeneous);
++		public void set_row_spacing (uint spacing);
++		public bool column_homogeneous { get; set; }
++		public uint column_spacing { get; set; }
++		public Clutter.Orientation orientation { get; set; }
++		public bool row_homogeneous { get; set; }
++		public uint row_spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
++	[Version (since = "1.10")]
++	public class Image : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Image ();
++		public unowned Cogl.Texture get_texture ();
++		public bool set_area ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, Cairo.RectangleInt rect, uint row_stride) throws GLib.Error;
++		[Version (since = "1.12")]
++		public bool set_bytes (GLib.Bytes data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++		public bool set_data ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")]
++	public class InputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDevice ();
++		public Clutter.InputAxis get_axis (uint index_);
++		public bool get_axis_value (double axes, Clutter.InputAxis axis, double value);
++		[Version (since = "1.6")]
++		public Clutter.InputMode get_device_mode ();
++		[Version (since = "1.2")]
++		public unowned string get_device_name ();
++		public unowned string get_device_node ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_grabbed_actor ();
++		public virtual int get_group_n_modes (int group);
++		[Version (since = "1.6")]
++		public bool get_has_cursor ();
++		public int get_mode_switch_button_group (uint button);
++		public uint get_n_axes ();
++		public int get_n_buttons ();
++		public int get_n_mode_groups ();
++		public int get_n_rings ();
++		public int get_n_strips ();
++		public virtual int get_pad_feature_group (Clutter.InputDevicePadFeature feature, int n_feature);
++		[Version (since = "1.22")]
++		public unowned string get_product_id ();
++		public unowned Clutter.Seat get_seat ();
++		[Version (since = "1.22")]
++		public unowned string get_vendor_id ();
++		[Version (since = "1.10")]
++		public void grab (Clutter.Actor actor);
++		public virtual bool is_grouped (Clutter.InputDevice other_device);
++		public virtual bool is_mode_switch_button (uint group, uint button);
++		[Version (since = "1.12")]
++		public unowned Clutter.Actor sequence_get_grabbed_actor (Clutter.EventSequence sequence);
++		[Version (since = "1.12")]
++		public void sequence_grab (Clutter.EventSequence sequence, Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public void sequence_ungrab (Clutter.EventSequence sequence);
++		[Version (since = "1.10")]
++		public void ungrab ();
++		[NoAccessorMethod]
++		[Version (since = "1.6")]
++		public Clutter.Backend backend { owned get; construct; }
++		public Clutter.InputMode device_mode { get; construct; }
++		public string device_node { get; construct; }
++		[Version (since = "1.2")]
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[Version (since = "1.6")]
++		public bool has_cursor { get; construct; }
++		public int n_buttons { get; construct; }
++		public int n_mode_groups { get; construct; }
++		public int n_rings { get; construct; }
++		public int n_strips { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public string name { owned get; construct; }
++		[Version (since = "1.22")]
++		public string product_id { get; construct; }
++		public Clutter.Seat seat { get; construct; }
++		[Version (since = "1.22")]
++		public string vendor_id { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_tool_get_type ()")]
++	public abstract class InputDeviceTool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDeviceTool ();
++		public Clutter.InputAxisFlags get_axes ();
++		public uint64 get_id ();
++		[Version (since = "1.28")]
++		public uint64 get_serial ();
++		[Version (since = "1.28")]
++		public Clutter.InputDeviceToolType get_tool_type ();
++		public Clutter.InputAxisFlags axes { get; construct; }
++		public uint64 id { get; construct; }
++		public uint64 serial { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.InputDeviceToolType type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_focus_get_type ()")]
++	public abstract class InputFocus : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputFocus ();
++		[NoWrapper]
++		public virtual void commit_text (string text);
++		[NoWrapper]
++		public virtual void delete_surrounding (int offset, uint len);
++		public bool filter_event (Clutter.Event event);
++		[NoWrapper]
++		public virtual void focus_in (Clutter.InputMethod input_method);
++		[NoWrapper]
++		public virtual void focus_out ();
++		public bool is_focused ();
++		[NoWrapper]
++		public virtual void request_surrounding ();
++		public void reset ();
++		public void set_can_show_preedit (bool can_show_preedit);
++		public void set_content_hints (Clutter.InputContentHintFlags hint);
++		public void set_content_purpose (Clutter.InputContentPurpose purpose);
++		public void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		[NoWrapper]
++		public virtual void set_preedit_text (string preedit, uint cursor);
++		public void set_surrounding (string text, uint cursor, uint anchor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_method_get_type ()")]
++	public abstract class InputMethod : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputMethod ();
++		[NoWrapper]
++		public virtual bool filter_key_event (Clutter.Event key);
++		public virtual void focus_in (Clutter.InputFocus actor);
++		public virtual void focus_out ();
++		public void forward_key (uint32 keyval, uint32 keycode, uint32 state, uint64 time_, bool press);
++		public void notify_key_event (Clutter.Event event, bool filtered);
++		[NoWrapper]
++		public virtual void reset ();
++		[NoWrapper]
++		public virtual void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		public void set_preedit_text (string? preedit, uint cursor);
++		[NoWrapper]
++		public virtual void set_surrounding (string text, uint cursor, uint anchor);
++		[NoWrapper]
++		public virtual void update_content_hints (Clutter.InputContentHintFlags hint);
++		[NoWrapper]
++		public virtual void update_content_purpose (Clutter.InputContentPurpose purpose);
++		[NoAccessorMethod]
++		public bool can_show_preedit { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentHintFlags content_hints { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentPurpose content_purpose { get; set; }
++		[HasEmitter]
++		public signal void commit (string text);
++		public signal void cursor_location_changed (Graphene.Rect object);
++		[HasEmitter]
++		public signal void delete_surrounding (int offset, uint len);
++		public signal void input_panel_state (Clutter.InputPanelState object);
++		[HasEmitter]
++		public signal void request_surrounding ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")]
++	[Version (since = "1.0")]
++	public class Interval : GLib.InitiallyUnowned, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		public Interval (GLib.Type gtype, ...);
++		public Clutter.Interval clone ();
++		[Version (since = "1.4")]
++		public unowned GLib.Value? compute (double factor);
++		public virtual bool compute_value (double factor, out GLib.Value value);
++		public GLib.Value get_final_value ();
++		public GLib.Value get_initial_value ();
++		public void get_interval (...);
++		public GLib.Type get_value_type ();
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public unowned GLib.Value? peek_final_value ();
++		public unowned GLib.Value? peek_initial_value ();
++		public static void register_progress_func (GLib.Type value_type, Clutter.ProgressFunc func);
++		[Version (since = "1.10")]
++		public void set_final (...);
++		public void set_final_value (GLib.Value value);
++		[Version (since = "1.10")]
++		public void set_initial (...);
++		public void set_initial_value (GLib.Value value);
++		public void set_interval (...);
++		public virtual bool validate (GLib.ParamSpec pspec);
++		[CCode (has_construct_function = false)]
++		public Interval.with_values (GLib.Type gtype, GLib.Value? initial, GLib.Value? final);
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value final { owned get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value initial { owned get; set; }
++		public GLib.Type value_type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class KeyEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public uint16 hardware_keycode;
++		public uint keyval;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public unichar unicode_value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keyframe_transition_get_type ()")]
++	[Version (since = "1.12")]
++	public class KeyframeTransition : Clutter.PropertyTransition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public KeyframeTransition (string property_name);
++		public void clear ();
++		public void get_key_frame (uint index_, out double key, out Clutter.AnimationMode mode, out GLib.Value value);
++		public uint get_n_key_frames ();
++		public void set_key_frame (uint index_, double key, Clutter.AnimationMode mode, GLib.Value value);
++		public void set_key_frames ([CCode (array_length_cname = "n_key_frames", array_length_pos = 0.5, array_length_type = "guint")] double[] key_frames);
++		public void set_modes ([CCode (array_length_cname = "n_modes", array_length_pos = 0.5, array_length_type = "guint")] Clutter.AnimationMode[] modes);
++		public void set_values ([CCode (array_length_cname = "n_values", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keymap_get_type ()")]
++	public abstract class Keymap : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Keymap ();
++		public virtual bool get_caps_lock_state ();
++		public virtual Pango.Direction get_direction ();
++		public virtual bool get_num_lock_state ();
++		public signal void state_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layer_node_get_type ()")]
++	public class LayerNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode (Graphene.Matrix projection, Cairo.Rectangle viewport, float width, float height, uint8 opacity);
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode.to_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_manager_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutManager : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected LayoutManager ();
++		public virtual void allocate (Clutter.Container container, Clutter.ActorBox allocation);
++		public void child_get (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_get_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		public void child_set (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_set_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		[NoWrapper]
++		public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Container container, Clutter.Actor actor);
++		public unowned GLib.ParamSpec find_child_property (string name);
++		[Version (since = "1.0")]
++		public unowned Clutter.LayoutMeta get_child_meta (Clutter.Container container, Clutter.Actor actor);
++		[NoWrapper]
++		public virtual GLib.Type get_child_meta_type ();
++		public virtual void get_preferred_height (Clutter.Container container, float for_width, out float min_height_p, out float nat_height_p);
++		public virtual void get_preferred_width (Clutter.Container container, float for_height, out float min_width_p, out float nat_width_p);
++		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
++		public GLib.ParamSpec[] list_child_properties ();
++		public virtual void set_container (Clutter.Container? container);
++		[HasEmitter]
++		public virtual signal void layout_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutMeta : Clutter.ChildMeta {
++		[CCode (has_construct_function = false)]
++		protected LayoutMeta ();
++		public unowned Clutter.LayoutManager get_manager ();
++		public Clutter.LayoutManager manager { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class MotionEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public double dx;
++		public double dx_unaccel;
++		public double dy;
++		public double dy_unaccel;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public int64 time_us;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_offscreen_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class OffscreenEffect : Clutter.Effect {
++		[CCode (has_construct_function = false)]
++		protected OffscreenEffect ();
++		public virtual Cogl.Handle create_texture (float width, float height);
++		public unowned Cogl.Pipeline? get_pipeline ();
++		[Version (since = "1.8")]
++		public bool get_target_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Cogl.Handle get_texture ();
++		public virtual void paint_target (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class PageTurnEffect : Clutter.DeformEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public PageTurnEffect (double period, double angle, float radius);
++		public double get_angle ();
++		public double get_period ();
++		public float get_radius ();
++		public void set_angle (double angle);
++		public void set_period (double period);
++		public void set_radius (float radius);
++		public double angle { get; set; }
++		public double period { get; set; }
++		public float radius { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_paint_context_ref", type_id = "clutter_paint_context_get_type ()", unref_function = "clutter_paint_context_unref")]
++	[Compact]
++	public class PaintContext {
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public unowned Cairo.Region get_redraw_clip ();
++		public void pop_framebuffer ();
++		public void push_framebuffer (Cogl.Framebuffer framebuffer);
++		public unowned Clutter.PaintContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_paint_node_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class PaintNode {
++		[CCode (has_construct_function = false)]
++		protected PaintNode ();
++		public void add_child (Clutter.PaintNode child);
++		public void add_multitexture_rectangle (Clutter.ActorBox rect, float text_coords, uint text_coords_len);
++		public void add_rectangle (Clutter.ActorBox rect);
++		public void add_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public void add_texture_rectangle (Clutter.ActorBox rect, float x_1, float y_1, float x_2, float y_2);
++		public void add_texture_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void paint (Clutter.PaintContext paint_context);
++		public unowned Clutter.PaintNode @ref ();
++		public void set_name (string name);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class PanAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public PanAction ();
++		public double get_acceleration_factor ();
++		[Version (since = "1.24")]
++		public float get_constrained_motion_delta (uint point, out float delta_x, out float delta_y);
++		public double get_deceleration ();
++		public bool get_interpolate ();
++		public void get_interpolated_coords (out float interpolated_x, out float interpolated_y);
++		public float get_interpolated_delta (out float delta_x, out float delta_y);
++		[Version (since = "1.14")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.14")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		public Clutter.PanAxis get_pan_axis ();
++		public void set_acceleration_factor (double factor);
++		public void set_deceleration (double rate);
++		public void set_interpolate (bool should_interpolate);
++		public void set_pan_axis (Clutter.PanAxis axis);
++		public double acceleration_factor { get; set; }
++		public double deceleration { get; set; }
++		public bool interpolate { get; set; }
++		public Clutter.PanAxis pan_axis { get; set; }
++		public virtual signal bool pan (Clutter.Actor actor, bool is_interpolated);
++		public virtual signal void pan_stopped (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", lower_case_csuffix = "param_units", type_id = "clutter_param_units_get_type ()")]
++	public class ParamSpecUnit : GLib.ParamSpec {
++		[CCode (has_construct_function = false)]
++		protected ParamSpecUnit ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")]
++	[Version (since = "1.0")]
++	public class Path : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		public Path ();
++		public void add_cairo_path (Cairo.Path cpath);
++		public void add_close ();
++		public void add_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_line_to (int x, int y);
++		public void add_move_to (int x, int y);
++		public void add_node (Clutter.PathNode node);
++		public void add_rel_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_rel_line_to (int x, int y);
++		public void add_rel_move_to (int x, int y);
++		public bool add_string (string str);
++		public void clear ();
++		public void @foreach (Clutter.PathCallback callback);
++		public string get_description ();
++		public uint get_length ();
++		public uint get_n_nodes ();
++		public Clutter.PathNode get_node (uint index_);
++		public GLib.SList<weak Clutter.PathNode?> get_nodes ();
++		public uint get_position (double progress, out Clutter.Knot position);
++		public void insert_node (int index_, Clutter.PathNode node);
++		public void remove_node (uint index_);
++		public void replace_node (uint index_, Clutter.PathNode node);
++		public bool set_description (string str);
++		public void to_cairo_path (Cairo.Context cr);
++		[CCode (has_construct_function = false)]
++		public Path.with_description (string desc);
++		public string description { owned get; set; }
++		public uint length { get; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class PathConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public PathConstraint (Clutter.Path? path, float offset);
++		public float get_offset ();
++		public unowned Clutter.Path get_path ();
++		public void set_offset (float offset);
++		public void set_path (Clutter.Path? path);
++		public float offset { get; set; }
++		public Clutter.Path path { get; set; }
++		public signal void node_reached (Clutter.Actor actor, uint index);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_pick_context_ref", type_id = "clutter_pick_context_get_type ()", unref_function = "clutter_pick_context_unref")]
++	[Compact]
++	public class PickContext {
++		public void destroy ();
++		public Graphene.Matrix get_transform ();
++		public void log_pick (Clutter.ActorBox box, Clutter.Actor actor);
++		public void pop_clip ();
++		public void pop_transform ();
++		public void push_clip (Clutter.ActorBox box);
++		public void push_transform (Graphene.Matrix transform);
++		public unowned Clutter.PickContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pipeline_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class PipelineNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public PipelineNode (Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public class PropertyTransition : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition (string? property_name);
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition.for_actor (Clutter.Actor actor, string? property_name);
++		public unowned string get_property_name ();
++		public void set_property_name (string? property_name);
++		public string property_name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
++	public class RootNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public RootNode (Cogl.Framebuffer framebuffer, Clutter.Color clear_color, Cogl.BufferBit clear_flags);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rotate_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class RotateAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public RotateAction ();
++		public virtual signal bool rotate (Clutter.Actor actor, double angle);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")]
++	[Version (since = "0.6")]
++	public class Script : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Script ();
++		[Version (since = "0.8")]
++		public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize")] string[] paths);
++		public void connect_signals (void* user_data);
++		public void connect_signals_full (Clutter.ScriptConnectFunc func);
++		public void ensure_objects ();
++		public unowned GLib.Object get_object (string name);
++		public int get_objects (...);
++		[Version (since = "1.10")]
++		public unowned string get_translation_domain ();
++		public virtual GLib.Type get_type_from_name (string type_name);
++		[Version (since = "0.8")]
++		public GLib.List<weak GLib.Object> list_objects ();
++		public uint load_from_data (string data, ssize_t length) throws GLib.Error;
++		public uint load_from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public uint load_from_resource (string resource_path) throws GLib.Error;
++		[Version (since = "0.8")]
++		public string lookup_filename (string filename);
++		[Version (since = "1.10")]
++		public void set_translation_domain (string? domain);
++		public void unmerge_objects (uint merge_id);
++		[NoAccessorMethod]
++		public string filename { owned get; }
++		[NoAccessorMethod]
++		public bool filename_set { get; }
++		[Version (since = "1.10")]
++		public string translation_domain { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scroll_actor_get_type ()")]
++	[Version (since = "1.12")]
++	public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public ScrollActor ();
++		public Clutter.ScrollMode get_scroll_mode ();
++		public void scroll_to_point (Graphene.Point point);
++		public void scroll_to_rect (Graphene.Rect rect);
++		public void set_scroll_mode (Clutter.ScrollMode mode);
++		public Clutter.ScrollMode scroll_mode { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ScrollEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.ScrollDirection direction;
++		public Clutter.ScrollFinishFlags finish_flags;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public Clutter.ScrollSource scroll_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_seat_get_type ()")]
++	public abstract class Seat : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Seat ();
++		public virtual void bell_notify ();
++		public virtual Clutter.VirtualInputDevice create_virtual_device (Clutter.InputDeviceType device_type);
++		public void ensure_a11y_state ();
++		public virtual unowned Clutter.InputDevice get_keyboard ();
++		public virtual unowned Clutter.Keymap get_keymap ();
++		public virtual unowned Clutter.InputDevice get_pointer ();
++		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public bool get_touch_mode ();
++		public virtual bool handle_event_post (Clutter.Event event);
++		public void inhibit_unfocus ();
++		public bool is_unfocus_inhibited ();
++		public GLib.List<weak Clutter.InputDevice> list_devices ();
++		public virtual bool query_state (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point coords, Clutter.ModifierType modifiers);
++		public void set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType click_type);
++		public void set_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public void uninhibit_unfocus ();
++		public virtual void warp_pointer (int x, int y);
++		[NoAccessorMethod]
++		public Clutter.Backend backend { owned get; construct; }
++		public bool touch_mode { get; }
++		public signal void device_added (Clutter.InputDevice object);
++		public signal void device_removed (Clutter.InputDevice object);
++		public signal void is_unfocus_inhibited_changed ();
++		public signal void kbd_a11y_flags_changed (uint settings_flags, uint changed_mask);
++		public signal void kbd_a11y_mods_state_changed (uint latched_mask, uint locked_mask);
++		public signal void ptr_a11y_dwell_click_type_changed (Clutter.PointerA11yDwellClickType click_type);
++		public signal void ptr_a11y_timeout_started (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, uint delay);
++		public signal void ptr_a11y_timeout_stopped (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, bool clicked);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
++	[Version (since = "1.4")]
++	public class Settings : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Settings ();
++		public static unowned Clutter.Settings get_default ();
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "1.4")]
++		public Clutter.Backend backend { construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int dnd_drag_threshold { get; set; }
++		[NoAccessorMethod]
++		public int double_click_distance { get; set; }
++		[NoAccessorMethod]
++		public int double_click_time { get; set; }
++		[NoAccessorMethod]
++		public int font_antialias { get; set; }
++		[NoAccessorMethod]
++		public int font_dpi { get; set; }
++		[NoAccessorMethod]
++		public string font_hint_style { owned get; set; }
++		[NoAccessorMethod]
++		public int font_hinting { get; set; }
++		[NoAccessorMethod]
++		public string font_name { owned get; set; }
++		[NoAccessorMethod]
++		public string font_subpixel_order { owned get; set; }
++		[NoAccessorMethod]
++		public uint fontconfig_timestamp { set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		public uint password_hint_time { get; set; }
++		[NoAccessorMethod]
++		public int unscaled_font_dpi { set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Shader {
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ShaderEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		[Version (since = "1.8")]
++		public ShaderEffect (Clutter.ShaderType shader_type);
++		public unowned Cogl.Handle get_program ();
++		public unowned Cogl.Handle get_shader ();
++		[NoWrapper]
++		public virtual string get_static_shader_source ();
++		public bool set_shader_source (string source);
++		public void set_uniform_value (string name, GLib.Value value);
++		[NoAccessorMethod]
++		public Clutter.ShaderType shader_type { construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_float_get_type ()")]
++	public class ShaderFloat {
++		[CCode (has_construct_function = false)]
++		protected ShaderFloat ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_int_get_type ()")]
++	public class ShaderInt {
++		[CCode (has_construct_function = false)]
++		protected ShaderInt ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_matrix_get_type ()")]
++	public class ShaderMatrix {
++		[CCode (has_construct_function = false)]
++		protected ShaderMatrix ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class SnapConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
++		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_edges (Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		[NoAccessorMethod]
++		public Clutter.SnapEdge from_edge { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.SnapEdge to_edge { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")]
++	[Version (since = "0.2")]
++	public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public void capture_into (Cairo.RectangleInt rect, uint8 data);
++		public void clear_stage_views ();
++		[CCode (cname = "clutter_stage_event")]
++		public bool emit_event (Clutter.Event event);
++		[Version (since = "1.0")]
++		public void ensure_viewport ();
++		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int out_width, out int out_height, out float out_scale);
++		public unowned Clutter.Actor get_device_actor (Clutter.InputDevice device, Clutter.EventSequence? sequence);
++		public int64 get_frame_counter ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_key_focus ();
++		[Version (since = "1.2")]
++		public void get_minimum_size (out uint width, out uint height);
++		[Version (since = "1.8")]
++		public bool get_motion_events_enabled ();
++		public Clutter.Perspective get_perspective ();
++		[Version (since = "1.0")]
++		public bool get_throttle_motion_events ();
++		[Version (since = "0.4")]
++		public unowned string get_title ();
++		public bool get_use_alpha ();
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
++		[CCode (array_length = false)]
++		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
++		public void repick_device (Clutter.InputDevice device);
++		public void schedule_update ();
++		[Version (since = "0.6")]
++		public void set_key_focus (Clutter.Actor? actor);
++		[Version (since = "1.2")]
++		public void set_minimum_size (uint width, uint height);
++		[Version (since = "1.8")]
++		public void set_motion_events_enabled (bool enabled);
++		[Version (since = "1.0")]
++		public void set_throttle_motion_events (bool throttle);
++		[Version (since = "0.4")]
++		public void set_title (string title);
++		public void set_use_alpha (bool use_alpha);
++		public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point point, uint32 time, Clutter.Actor new_actor, bool emit_crossing);
++		[Version (since = "1.2")]
++		public Clutter.Actor key_focus { get; set; }
++		[Version (since = "0.8")]
++		public Clutter.Perspective perspective { get; }
++		[Version (since = "0.4")]
++		public string title { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal void activate ();
++		[Version (since = "1.20")]
++		public signal void after_paint (Clutter.StageView view);
++		public signal void after_update (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
++		public signal void before_update (Clutter.StageView view);
++		[Version (since = "0.6")]
++		public virtual signal void deactivate ();
++		public virtual signal void paint_view (Clutter.StageView view, Cairo.Region redraw_clip);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")]
++	[Version (since = "1.0")]
++	public class StageManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageManager ();
++		[Version (since = "0.8")]
++		public static unowned Clutter.StageManager get_default ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_default_stage ();
++		[Version (since = "0.8")]
++		public GLib.SList<weak Clutter.Stage> list_stages ();
++		public unowned GLib.SList<Clutter.Stage> peek_stages ();
++		[Version (since = "0.8")]
++		public Clutter.Stage default_stage { get; }
++		[Version (since = "0.8")]
++		public virtual signal void stage_added (Clutter.Stage stage);
++		[Version (since = "0.8")]
++		public virtual signal void stage_removed (Clutter.Stage stage);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_view_get_type ()")]
++	public class StageView : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageView ();
++		public void assign_next_scanout (Cogl.Scanout scanout);
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void get_layout (Cairo.RectangleInt rect);
++		public virtual void get_offscreen_transformation_matrix (Graphene.Matrix matrix);
++		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
++		public float get_scale ();
++		public void invalidate_offscreen_blit_pipeline ();
++		[NoWrapper]
++		public virtual void setup_offscreen_blit_pipeline (Cogl.Pipeline pipeline);
++		[NoWrapper]
++		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
++		[NoAccessorMethod]
++		public Cogl.Framebuffer framebuffer { owned get; set construct; }
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++		[NoAccessorMethod]
++		public Cogl.Offscreen offscreen { owned get; construct; }
++		[NoAccessorMethod]
++		public float refresh_rate { get; set construct; }
++		[NoAccessorMethod]
++		public float scale { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.Stage stage { owned get; construct; }
++		[NoAccessorMethod]
++		public bool use_shadowfb { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_swipe_action_get_type ()")]
++	[Version (since = "1.8")]
++	public class SwipeAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public SwipeAction ();
++		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
++		public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction);
++		[Version (since = "1.14")]
++		public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_tap_action_get_type ()")]
++	[Version (since = "1.14")]
++	public class TapAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public TapAction ();
++		public virtual signal void tap (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")]
++	[Version (since = "1.0")]
++	public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text ();
++		[Version (since = "1.10")]
++		public int coords_to_position (float x, float y);
++		public void delete_chars (uint n_chars);
++		public bool delete_selection ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.full (string font_name, string text, Clutter.Color color);
++		public bool get_activatable ();
++		public unowned Pango.AttrList get_attributes ();
++		[Version (since = "1.10")]
++		public unowned Clutter.TextBuffer get_buffer ();
++		public string get_chars (ssize_t start_pos, ssize_t end_pos);
++		public Clutter.Color get_color ();
++		public Clutter.Color get_cursor_color ();
++		public int get_cursor_position ();
++		[Version (since = "1.16")]
++		public Graphene.Rect get_cursor_rect ();
++		public uint get_cursor_size ();
++		public bool get_cursor_visible ();
++		public bool get_editable ();
++		public Pango.EllipsizeMode get_ellipsize ();
++		[Version (since = "1.2")]
++		public Pango.FontDescription get_font_description ();
++		public unowned string get_font_name ();
++		public Clutter.InputContentHintFlags get_input_hints ();
++		public Clutter.InputContentPurpose get_input_purpose ();
++		[Version (since = "0.6")]
++		public bool get_justify ();
++		public unowned Pango.Layout get_layout ();
++		[Version (since = "1.8")]
++		public void get_layout_offsets (out int x, out int y);
++		public Pango.Alignment get_line_alignment ();
++		public bool get_line_wrap ();
++		public Pango.WrapMode get_line_wrap_mode ();
++		public int get_max_length ();
++		public unichar get_password_char ();
++		public bool get_selectable ();
++		[Version (since = "1.8")]
++		public Clutter.Color get_selected_text_color ();
++		public string get_selection ();
++		public int get_selection_bound ();
++		public Clutter.Color get_selection_color ();
++		public bool get_single_line_mode ();
++		public unowned string get_text ();
++		public bool get_use_markup ();
++		public bool has_preedit ();
++		public void insert_text (string text, ssize_t position);
++		public void insert_unichar (unichar wc);
++		public bool position_to_coords (int position, out float x, out float y, out float line_height = null);
++		public void set_activatable (bool activatable);
++		public void set_attributes (Pango.AttrList? attrs);
++		[Version (since = "1.10")]
++		public void set_buffer (Clutter.TextBuffer buffer);
++		public void set_color (Clutter.Color color);
++		public void set_cursor_color (Clutter.Color? color);
++		public void set_cursor_position (int position);
++		public void set_cursor_size (int size);
++		public void set_cursor_visible (bool cursor_visible);
++		public void set_editable (bool editable);
++		public void set_ellipsize (Pango.EllipsizeMode mode);
++		[Version (since = "1.2")]
++		public void set_font_description (Pango.FontDescription font_desc);
++		public void set_font_name (string? font_name);
++		public void set_input_hints (Clutter.InputContentHintFlags hints);
++		public void set_input_purpose (Clutter.InputContentPurpose purpose);
++		public void set_justify (bool justify);
++		public void set_line_alignment (Pango.Alignment alignment);
++		public void set_line_wrap (bool line_wrap);
++		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
++		public void set_markup (string? markup);
++		public void set_max_length (int max);
++		public void set_password_char (unichar wc);
++		[Version (since = "1.2")]
++		public void set_preedit_string (string? preedit_str, Pango.AttrList? preedit_attrs, uint cursor_pos);
++		public void set_selectable (bool selectable);
++		[Version (since = "1.8")]
++		public void set_selected_text_color (Clutter.Color? color);
++		public void set_selection (ssize_t start_pos, ssize_t end_pos);
++		public void set_selection_bound (int selection_bound);
++		public void set_selection_color (Clutter.Color? color);
++		public void set_single_line_mode (bool single_line);
++		public void set_text (string? text);
++		public void set_use_markup (bool setting);
++		[CCode (cname = "clutter_text_activate")]
++		public bool try_activate ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		[Version (since = "1.10")]
++		public Text.with_buffer (Clutter.TextBuffer buffer);
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.with_text (string? font_name, string text);
++		public bool activatable { get; set; }
++		public Pango.AttrList attributes { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.TextBuffer buffer { get; set; }
++		public Clutter.Color color { get; set; }
++		public Clutter.Color cursor_color { get; set; }
++		[NoAccessorMethod]
++		public bool cursor_color_set { get; }
++		[Version (since = "1.12")]
++		public int cursor_position { get; set; }
++		public int cursor_size { get; set; }
++		public bool cursor_visible { get; set; }
++		public bool editable { get; set; }
++		public Pango.EllipsizeMode ellipsize { get; set; }
++		[Version (since = "1.2")]
++		public Pango.FontDescription font_description { owned get; set; }
++		public string font_name { get; set; }
++		public Clutter.InputContentHintFlags input_hints { get; set; }
++		public Clutter.InputContentPurpose input_purpose { get; set; }
++		public bool justify { get; set; }
++		public Pango.Alignment line_alignment { get; set; }
++		public bool line_wrap { get; set; }
++		public Pango.WrapMode line_wrap_mode { get; set; }
++		public int max_length { get; set; }
++		public uint password_char { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.0")]
++		public int position { get; set; }
++		public bool selectable { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.Color selected_text_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public bool selected_text_color_set { get; }
++		public int selection_bound { get; set; }
++		public Clutter.Color selection_color { get; set; }
++		[NoAccessorMethod]
++		public bool selection_color_set { get; }
++		public bool single_line_mode { get; set; }
++		public string text { get; set; }
++		public bool use_markup { get; set; }
++		public virtual signal void activate ();
++		[Version (since = "1.16")]
++		public virtual signal void cursor_changed ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public virtual signal void cursor_event (Graphene.Rect rect);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public signal void delete_text (int start_pos, int end_pos);
++		public virtual signal void text_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_buffer_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextBuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public TextBuffer ();
++		public virtual uint delete_text (uint position, uint n_chars);
++		public void emit_deleted_text (uint position, uint n_chars);
++		public void emit_inserted_text (uint position, string chars, uint n_chars);
++		public size_t get_bytes ();
++		public virtual uint get_length ();
++		public int get_max_length ();
++		public unowned string get_text ();
++		[CCode (vfunc_name = "get_text")]
++		[NoWrapper]
++		public virtual unowned string get_text_with_length (size_t n_bytes);
++		public virtual uint insert_text (uint position, string chars, uint n_chars);
++		public void set_max_length (int max_length);
++		public void set_text (string chars, int n_chars);
++		[CCode (has_construct_function = false)]
++		public TextBuffer.with_text (string? text, ssize_t text_len);
++		public uint length { get; }
++		public int max_length { get; set; }
++		public string text { get; }
++		public virtual signal void deleted_text (uint position, uint n_chars);
++		public virtual signal void inserted_text (uint position, string chars, uint n_chars);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextNode (Pango.Layout? layout, Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextureNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextureNode (Cogl.Texture texture, Clutter.Color? color, Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")]
++	[Version (since = "0.2")]
++	public class Timeline : GLib.Object, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		[Version (since = "0.6")]
++		public Timeline (uint duration_ms);
++		[Version (since = "1.14")]
++		public void add_marker (string marker_name, double progress);
++		[Version (since = "0.8")]
++		public void add_marker_at_time (string marker_name, uint msecs);
++		public void advance (uint msecs);
++		[Version (since = "0.8")]
++		public void advance_to_marker (string marker_name);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_actor (Clutter.Actor actor, uint duration_ms);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_frame_clock (Clutter.FrameClock frame_clock, uint duration_ms);
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.6")]
++		public bool get_auto_reverse ();
++		[Version (since = "1.12")]
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
++		[Version (since = "1.10")]
++		public int get_current_repeat ();
++		[Version (since = "0.4")]
++		public uint get_delay ();
++		[Version (since = "0.6")]
++		public uint get_delta ();
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection get_direction ();
++		[Version (since = "0.6")]
++		public uint get_duration ();
++		[Version (since = "1.10")]
++		public int64 get_duration_hint ();
++		public uint get_elapsed_time ();
++		[Version (since = "0.6")]
++		public double get_progress ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_progress_mode ();
++		[Version (since = "1.10")]
++		public int get_repeat_count ();
++		[Version (since = "1.12")]
++		public bool get_step_progress (out int n_steps, out Clutter.StepMode step_mode);
++		[Version (since = "0.8")]
++		public bool has_marker (string marker_name);
++		public bool is_playing ();
++		[CCode (array_length = true, array_length_pos = 1.1, array_length_type = "gsize", array_null_terminated = true)]
++		[Version (since = "0.8")]
++		public string[] list_markers (int msecs);
++		public void pause ();
++		[Version (since = "0.8")]
++		public void remove_marker (string marker_name);
++		public void rewind ();
++		public void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.6")]
++		public void set_auto_reverse (bool reverse);
++		[Version (since = "1.12")]
++		public void set_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		[Version (since = "0.4")]
++		public void set_delay (uint msecs);
++		[Version (since = "0.6")]
++		public void set_direction (Clutter.TimelineDirection direction);
++		[Version (since = "0.6")]
++		public void set_duration (uint msecs);
++		public void set_frame_clock (Clutter.FrameClock frame_clock);
++		[Version (since = "1.10")]
++		public void set_progress_func (owned Clutter.TimelineProgressFunc? func);
++		[Version (since = "1.10")]
++		public void set_progress_mode (Clutter.AnimationMode mode);
++		[Version (since = "1.10")]
++		public void set_repeat_count (int count);
++		[Version (since = "1.12")]
++		public void set_step_progress (int n_steps, Clutter.StepMode step_mode);
++		public void skip (uint msecs);
++		public void start ();
++		public void stop ();
++		public Clutter.Actor actor { get; set construct; }
++		[Version (since = "1.6")]
++		public bool auto_reverse { get; set; }
++		[Version (since = "0.4")]
++		public uint delay { get; set; }
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection direction { get; set; }
++		[Version (since = "0.6")]
++		public uint duration { get; set; }
++		[NoAccessorMethod]
++		public Clutter.FrameClock frame_clock { owned get; set construct; }
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode progress_mode { get; set; }
++		[Version (since = "1.10")]
++		public int repeat_count { get; set; }
++		public virtual signal void completed ();
++		[Version (since = "0.8")]
++		public virtual signal void marker_reached (string marker_name, int msecs);
++		public virtual signal void new_frame (int msecs);
++		public virtual signal void paused ();
++		public virtual signal void started ();
++		[Version (since = "1.12")]
++		public virtual signal void stopped (bool is_finished);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.10")]
++	public class TouchEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadPinchEvent : Clutter.Event {
++		public float angle_delta;
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public float scale;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadSwipeEvent : Clutter.Event {
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transform_node_get_type ()")]
++	public class TransformNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TransformNode (Graphene.Matrix projection);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class Transition : Clutter.Timeline, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Transition ();
++		[NoWrapper]
++		public virtual void attached (Clutter.Animatable animatable);
++		[NoWrapper]
++		public virtual void compute_value (Clutter.Animatable animatable, Clutter.Interval interval, double progress);
++		[NoWrapper]
++		public virtual void detached (Clutter.Animatable animatable);
++		public unowned Clutter.Animatable get_animatable ();
++		public unowned Clutter.Interval get_interval ();
++		public bool get_remove_on_complete ();
++		public void set_animatable (Clutter.Animatable? animatable);
++		[Version (since = "1.12")]
++		public void set_from_value (GLib.Value value);
++		public void set_interval (Clutter.Interval? interval);
++		public void set_remove_on_complete (bool remove_complete);
++		[Version (since = "1.12")]
++		public void set_to_value (GLib.Value value);
++		public Clutter.Animatable animatable { get; set; }
++		public Clutter.Interval interval { get; set; }
++		public bool remove_on_complete { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")]
++	[Version (since = "1.12")]
++	public class TransitionGroup : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public TransitionGroup ();
++		public void add_transition (Clutter.Transition transition);
++		public void remove_all ();
++		public void remove_transition (Clutter.Transition transition);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_virtual_input_device_get_type ()")]
++	public class VirtualInputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected VirtualInputDevice ();
++		public int get_device_type ();
++		public virtual void notify_absolute_motion (uint64 time_us, double x, double y);
++		public virtual void notify_button (uint64 time_us, uint32 button, Clutter.ButtonState button_state);
++		public virtual void notify_discrete_scroll (uint64 time_us, Clutter.ScrollDirection direction, Clutter.ScrollSource scroll_source);
++		public virtual void notify_key (uint64 time_us, uint32 key, Clutter.KeyState key_state);
++		public virtual void notify_keyval (uint64 time_us, uint32 keyval, Clutter.KeyState key_state);
++		public virtual void notify_relative_motion (uint64 time_us, double dx, double dy);
++		public virtual void notify_scroll_continuous (uint64 time_us, double dx, double dy, Clutter.ScrollSource scroll_source, Clutter.ScrollFinishFlags finish_flags);
++		public virtual void notify_touch_down (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_motion (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_up (uint64 time_us, int slot);
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.Seat seat { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_zoom_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class ZoomAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public ZoomAction ();
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
++		public Clutter.ZoomAxis get_zoom_axis ();
++		public void set_zoom_axis (Clutter.ZoomAxis axis);
++		public Clutter.ZoomAxis zoom_axis { get; set; }
++		public virtual signal bool zoom (Clutter.Actor actor, Graphene.Point focal_point, double factor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterAnimatableInterface", type_id = "clutter_animatable_get_type ()")]
++	public interface Animatable : GLib.Object {
++		[Version (since = "1.4")]
++		public abstract unowned GLib.ParamSpec find_property (string property_name);
++		public abstract unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public abstract void get_initial_state (string property_name, GLib.Value value);
++		[Version (since = "1.8")]
++		public abstract bool interpolate_value (string property_name, Clutter.Interval interval, double progress, out GLib.Value value);
++		[Version (since = "1.4")]
++		public abstract void set_final_state (string property_name, GLib.Value value);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
++	[Version (since = "0.4")]
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (vfunc_name = "add")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void add_actor (Clutter.Actor actor);
++		[Version (since = "0.8")]
++		public void child_get (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_get_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "0.8")]
++		public void child_set (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "1.2")]
++		public virtual void create_child_meta (Clutter.Actor actor);
++		[Version (since = "1.2")]
++		public virtual void destroy_child_meta (Clutter.Actor actor);
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[Version (since = "0.8")]
++		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++		[CCode (vfunc_name = "lower")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[CCode (vfunc_name = "raise")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void raise_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public void remove (...);
++		[CCode (vfunc_name = "remove")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void remove_actor (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public abstract void sort_depth_order ();
++		public virtual signal void actor_added (Clutter.Actor actor);
++		public virtual signal void actor_removed (Clutter.Actor actor);
++		[HasEmitter]
++		[Version (since = "0.8")]
++		public virtual signal void child_notify (Clutter.Actor child, GLib.ParamSpec pspec);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterContentInterface", type_id = "clutter_content_get_type ()")]
++	public interface Content : GLib.Object {
++		[Version (since = "1.10")]
++		public abstract bool get_preferred_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public abstract void invalidate ();
++		public abstract void invalidate_size ();
++		[NoWrapper]
++		public abstract void paint_content (Clutter.Actor actor, Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.10")]
++		public virtual signal void attached (Clutter.Actor actor);
++		[Version (since = "1.10")]
++		public virtual signal void detached (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scriptable_get_type ()")]
++	[Version (since = "0.6")]
++	public interface Scriptable : GLib.Object {
++		public abstract unowned string get_id ();
++		public abstract bool parse_custom_node (Clutter.Script script, GLib.Value value, string name, Json.Node node);
++		public abstract void set_custom_property (Clutter.Script script, string name, GLib.Value value);
++		public abstract void set_id (string id_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_actor_box_get_type ()")]
++	public struct ActorBox {
++		public float x1;
++		public float y1;
++		public float x2;
++		public float y2;
++		[Version (since = "1.12")]
++		public static Clutter.ActorBox? alloc ();
++		[Version (since = "1.2")]
++		public static void clamp_to_pixel (ref Clutter.ActorBox box);
++		[Version (since = "1.0")]
++		public bool contains (float x, float y);
++		[Version (since = "1.0")]
++		public Clutter.ActorBox? copy ();
++		[Version (since = "1.0")]
++		public bool equal (Clutter.ActorBox box_b);
++		[Version (since = "1.0")]
++		public void free ();
++		[Version (since = "1.0")]
++		public float get_area ();
++		[Version (since = "1.0")]
++		public float get_height ();
++		[Version (since = "1.0")]
++		public void get_origin (out float x, out float y);
++		[Version (since = "1.0")]
++		public void get_size (out float width, out float height);
++		[Version (since = "1.0")]
++		public float get_width ();
++		[Version (since = "1.0")]
++		public float get_x ();
++		[Version (since = "1.0")]
++		public float get_y ();
++		[Version (since = "1.10")]
++		public unowned Clutter.ActorBox? init (float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void init_rect (float x, float y, float width, float height);
++		[Version (since = "1.2")]
++		public Clutter.ActorBox interpolate (Clutter.ActorBox final, double progress);
++		public bool is_initialized ();
++		[Version (since = "1.6")]
++		public void scale (float scale);
++		[Version (since = "1.6")]
++		public void set_origin (float x, float y);
++		[Version (since = "1.6")]
++		public void set_size (float width, float height);
++		[Version (since = "1.4")]
++		public Clutter.ActorBox union (Clutter.ActorBox b);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Version (since = "1.10")]
++	public struct ActorIter {
++		public void destroy ();
++		public void init (Clutter.Actor root);
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public bool next (out unowned Clutter.Actor child);
++		public bool prev (out unowned Clutter.Actor child);
++		public void remove ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++		public Cairo.ImageSurface image;
++		public Cairo.RectangleInt rect;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
++	public struct Color {
++		public uint8 red;
++		public uint8 green;
++		public uint8 blue;
++		public uint8 alpha;
++		public Clutter.Color add (Clutter.Color b);
++		[Version (since = "1.12")]
++		public static Clutter.Color? alloc ();
++		[Version (since = "0.2")]
++		public Clutter.Color? copy ();
++		public Clutter.Color darken ();
++		[Version (since = "0.2")]
++		public bool equal (Clutter.Color v2);
++		[Version (since = "0.2")]
++		public void free ();
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++		[Version (since = "1.0")]
++		public uint hash ();
++		[Version (since = "1.12")]
++		public unowned Clutter.Color? init (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "1.6")]
++		public Clutter.Color interpolate (Clutter.Color final, double progress);
++		public Clutter.Color lighten ();
++		public bool parse_string (string str);
++		public Clutter.Color shade (double factor);
++		public Clutter.Color subtract (Clutter.Color b);
++		public void to_hls (out float hue, out float luminance, out float saturation);
++		public uint32 to_pixel ();
++		[Version (since = "0.2")]
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_knot_get_type ()")]
++	[Version (since = "0.2")]
++	public struct Knot {
++		public int x;
++		public int y;
++		public Clutter.Knot? copy ();
++		public bool equal (Clutter.Knot knot_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
++	[Version (since = "1.0")]
++	public struct PathNode {
++		public Clutter.PathNodeType type;
++		[CCode (array_length = false)]
++		public weak Clutter.Knot points[3];
++		public Clutter.PathNode? copy ();
++		public bool equal (Clutter.PathNode node_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_perspective_get_type ()")]
++	[Version (since = "0.4")]
++	public struct Perspective {
++		public float fovy;
++		public float aspect;
++		public float z_near;
++		public float z_far;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	public struct PointerA11ySettings {
++		public Clutter.PointerA11yFlags controls;
++		public Clutter.PointerA11yDwellClickType dwell_click_type;
++		public Clutter.PointerA11yDwellMode dwell_mode;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_single;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_double;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_drag;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_secondary;
++		public int secondary_click_delay;
++		public int dwell_delay;
++		public int dwell_threshold;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
++	[Version (since = "1.0")]
++	public struct Units {
++		public Clutter.Units? copy ();
++		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++		public Clutter.UnitType get_unit_type ();
++		public float get_unit_value ();
++		public float to_pixels ();
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ActorAlign {
++		FILL,
++		START,
++		CENTER,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_", type_id = "clutter_actor_flags_get_type ()")]
++	[Flags]
++	public enum ActorFlags {
++		MAPPED,
++		REALIZED,
++		REACTIVE,
++		VISIBLE,
++		NO_LAYOUT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_", type_id = "clutter_align_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum AlignAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_animation_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum AnimationMode {
++		CUSTOM_MODE,
++		LINEAR,
++		EASE_IN_QUAD,
++		EASE_OUT_QUAD,
++		EASE_IN_OUT_QUAD,
++		EASE_IN_CUBIC,
++		EASE_OUT_CUBIC,
++		EASE_IN_OUT_CUBIC,
++		EASE_IN_QUART,
++		EASE_OUT_QUART,
++		EASE_IN_OUT_QUART,
++		EASE_IN_QUINT,
++		EASE_OUT_QUINT,
++		EASE_IN_OUT_QUINT,
++		EASE_IN_SINE,
++		EASE_OUT_SINE,
++		EASE_IN_OUT_SINE,
++		EASE_IN_EXPO,
++		EASE_OUT_EXPO,
++		EASE_IN_OUT_EXPO,
++		EASE_IN_CIRC,
++		EASE_OUT_CIRC,
++		EASE_IN_OUT_CIRC,
++		EASE_IN_ELASTIC,
++		EASE_OUT_ELASTIC,
++		EASE_IN_OUT_ELASTIC,
++		EASE_IN_BACK,
++		EASE_OUT_BACK,
++		EASE_IN_OUT_BACK,
++		EASE_IN_BOUNCE,
++		EASE_OUT_BOUNCE,
++		EASE_IN_OUT_BOUNCE,
++		STEPS,
++		STEP_START,
++		STEP_END,
++		CUBIC_BEZIER,
++		EASE,
++		EASE_IN,
++		EASE_OUT,
++		EASE_IN_OUT,
++		ANIMATION_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BinAlignment {
++		[Version (deprecated = true)]
++		FIXED,
++		[Version (deprecated = true)]
++		FILL,
++		START,
++		[Version (deprecated = true)]
++		END,
++		[Version (deprecated = true)]
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")]
++	[Version (since = "1.4")]
++	public enum BindCoordinate {
++		X,
++		Y,
++		WIDTH,
++		HEIGHT,
++		POSITION,
++		SIZE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BoxAlignment {
++		START,
++		END,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BUTTON_STATE_", type_id = "clutter_button_state_get_type ()")]
++	public enum ButtonState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ContentGravity {
++		TOP_LEFT,
++		TOP,
++		TOP_RIGHT,
++		LEFT,
++		CENTER,
++		RIGHT,
++		BOTTOM_LEFT,
++		BOTTOM,
++		BOTTOM_RIGHT,
++		RESIZE_FILL,
++		RESIZE_ASPECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_", type_id = "clutter_content_repeat_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ContentRepeat {
++		NONE,
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_debug_flag_get_type ()")]
++	[Flags]
++	public enum DebugFlag {
++		MISC,
++		ACTOR,
++		TEXTURE,
++		EVENT,
++		PAINT,
++		PANGO,
++		BACKEND,
++		SCHEDULER,
++		SCRIPT,
++		SHADER,
++		MULTISTAGE,
++		ANIMATION,
++		LAYOUT,
++		PICK,
++		EVENTLOOP,
++		CLIPPING,
++		OOB_TRANSFORMS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum DragAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_draw_debug_flag_get_type ()")]
++	[Flags]
++	public enum DrawDebugFlag {
++		DISABLE_SWAP_EVENTS,
++		DISABLE_CLIPPED_REDRAWS,
++		REDRAWS,
++		PAINT_VOLUMES,
++		DISABLE_CULLING,
++		DISABLE_OFFSCREEN_REDIRECT,
++		CONTINUOUS_REDRAW,
++		PAINT_DEFORM_TILES,
++		PAINT_DAMAGE_REGION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_", type_id = "clutter_effect_paint_flags_get_type ()")]
++	[Flags]
++	public enum EffectPaintFlags {
++		ACTOR_DIRTY,
++		BYPASS_EFFECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_", type_id = "clutter_event_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.6")]
++	public enum EventFlags {
++		NONE,
++		FLAG_SYNTHETIC,
++		FLAG_INPUT_METHOD,
++		FLAG_REPEATED,
++		FLAG_RELATIVE_MOTION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_event_type_get_type ()")]
++	[Version (since = "0.4")]
++	public enum EventType {
++		NOTHING,
++		KEY_PRESS,
++		KEY_RELEASE,
++		MOTION,
++		ENTER,
++		LEAVE,
++		BUTTON_PRESS,
++		BUTTON_RELEASE,
++		SCROLL,
++		TOUCH_BEGIN,
++		TOUCH_UPDATE,
++		TOUCH_END,
++		TOUCH_CANCEL,
++		TOUCHPAD_PINCH,
++		TOUCHPAD_SWIPE,
++		PROXIMITY_IN,
++		PROXIMITY_OUT,
++		PAD_BUTTON_PRESS,
++		PAD_BUTTON_RELEASE,
++		PAD_STRIP,
++		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
++		EVENT_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum FeatureFlags {
++		STAGE_STATIC,
++		STAGE_CURSOR,
++		SHADERS_GLSL,
++		OFFSCREEN,
++		STAGE_MULTIPLE,
++		SWAP_EVENTS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
++	[Version (since = "1.2")]
++	public enum FlowOrientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_RESULT_", type_id = "clutter_frame_result_get_type ()")]
++	public enum FrameResult {
++		PENDING_PRESENTED,
++		IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GESTURE_TRIGGER_EDGE_", type_id = "clutter_gesture_trigger_edge_get_type ()")]
++	[Version (since = "1.18")]
++	public enum GestureTriggerEdge {
++		NONE,
++		AFTER,
++		BEFORE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_", type_id = "clutter_gravity_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.2")]
++	public enum Gravity {
++		NONE,
++		NORTH,
++		NORTH_EAST,
++		EAST,
++		SOUTH_EAST,
++		SOUTH,
++		SOUTH_WEST,
++		WEST,
++		NORTH_WEST,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_", type_id = "clutter_grid_position_get_type ()")]
++	[Version (since = "1.12")]
++	public enum GridPosition {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_", type_id = "clutter_init_error_get_type ()")]
++	[Version (since = "0.2")]
++	public enum InitError {
++		SUCCESS,
++		ERROR_UNKNOWN,
++		ERROR_THREADS,
++		ERROR_BACKEND,
++		ERROR_INTERNAL;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_", type_id = "clutter_input_axis_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputAxis {
++		IGNORE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER,
++		LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_FLAG_", type_id = "clutter_input_axis_flags_get_type ()")]
++	[Flags]
++	public enum InputAxisFlags {
++		NONE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_HINT_", type_id = "clutter_input_content_hint_flags_get_type ()")]
++	[Flags]
++	public enum InputContentHintFlags {
++		COMPLETION,
++		SPELLCHECK,
++		AUTO_CAPITALIZATION,
++		LOWERCASE,
++		UPPERCASE,
++		TITLECASE,
++		HIDDEN_TEXT,
++		SENSITIVE_DATA,
++		LATIN,
++		MULTILINE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_PURPOSE_", type_id = "clutter_input_content_purpose_get_type ()")]
++	public enum InputContentPurpose {
++		NORMAL,
++		ALPHA,
++		DIGITS,
++		NUMBER,
++		PHONE,
++		URL,
++		EMAIL,
++		NAME,
++		PASSWORD,
++		DATE,
++		TIME,
++		DATETIME,
++		TERMINAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAD_FEATURE_", type_id = "clutter_input_device_pad_feature_get_type ()")]
++	public enum InputDevicePadFeature {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_PAD_SOURCE_", type_id = "clutter_input_device_pad_source_get_type ()")]
++	public enum InputDevicePadSource {
++		UNKNOWN,
++		FINGER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_TOOL_", type_id = "clutter_input_device_tool_type_get_type ()")]
++	[Version (since = "1.28")]
++	public enum InputDeviceToolType {
++		NONE,
++		PEN,
++		ERASER,
++		BRUSH,
++		PENCIL,
++		AIRBRUSH,
++		MOUSE,
++		LENS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_input_device_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum InputDeviceType {
++		POINTER_DEVICE,
++		KEYBOARD_DEVICE,
++		EXTENSION_DEVICE,
++		JOYSTICK_DEVICE,
++		TABLET_DEVICE,
++		TOUCHPAD_DEVICE,
++		TOUCHSCREEN_DEVICE,
++		PEN_DEVICE,
++		ERASER_DEVICE,
++		CURSOR_DEVICE,
++		PAD_DEVICE,
++		N_DEVICE_TYPES
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputMode {
++		LOGICAL,
++		PHYSICAL,
++		FLOATING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
++	public enum InputPanelState {
++		OFF,
++		ON,
++		TOGGLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_", type_id = "clutter_interpolation_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "1.2")]
++	public enum Interpolation {
++		LINEAR,
++		CUBIC
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_KEY_STATE_", type_id = "clutter_key_state_get_type ()")]
++	public enum KeyState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_", type_id = "clutter_long_press_state_get_type ()")]
++	[Version (since = "1.8")]
++	public enum LongPressState {
++		QUERY,
++		ACTIVATE,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_modifier_type_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum ModifierType {
++		SHIFT_MASK,
++		LOCK_MASK,
++		CONTROL_MASK,
++		MOD1_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK,
++		BUTTON1_MASK,
++		BUTTON2_MASK,
++		BUTTON3_MASK,
++		BUTTON4_MASK,
++		BUTTON5_MASK,
++		MODIFIER_RESERVED_13_MASK,
++		MODIFIER_RESERVED_14_MASK,
++		MODIFIER_RESERVED_15_MASK,
++		MODIFIER_RESERVED_16_MASK,
++		MODIFIER_RESERVED_17_MASK,
++		MODIFIER_RESERVED_18_MASK,
++		MODIFIER_RESERVED_19_MASK,
++		MODIFIER_RESERVED_20_MASK,
++		MODIFIER_RESERVED_21_MASK,
++		MODIFIER_RESERVED_22_MASK,
++		MODIFIER_RESERVED_23_MASK,
++		MODIFIER_RESERVED_24_MASK,
++		MODIFIER_RESERVED_25_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		META_MASK,
++		MODIFIER_RESERVED_29_MASK,
++		RELEASE_MASK,
++		MODIFIER_MASK
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_", type_id = "clutter_offscreen_redirect_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum OffscreenRedirect {
++		AUTOMATIC_FOR_OPACITY,
++		ALWAYS,
++		ON_IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_", type_id = "clutter_orientation_get_type ()")]
++	[Version (since = "1.12")]
++	public enum Orientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAINT_FLAG_", type_id = "clutter_paint_flag_get_type ()")]
++	[Flags]
++	public enum PaintFlag {
++		NONE,
++		NO_CURSORS,
++		FORCE_CURSORS,
++		CLEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum PanAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS,
++		AXIS_AUTO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PathNodeType {
++		MOVE_TO,
++		LINE_TO,
++		CURVE_TO,
++		CLOSE,
++		REL_MOVE_TO,
++		REL_LINE_TO,
++		REL_CURVE_TO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_NOP_", type_id = "clutter_pick_debug_flag_get_type ()")]
++	[Flags]
++	public enum PickDebugFlag {
++		PICKING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_", type_id = "clutter_pick_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PickMode {
++		NONE,
++		REACTIVE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_CLICK_TYPE_", type_id = "clutter_pointer_a11y_dwell_click_type_get_type ()")]
++	public enum PointerA11yDwellClickType {
++		NONE,
++		PRIMARY,
++		SECONDARY,
++		MIDDLE,
++		DOUBLE,
++		DRAG
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_DIRECTION_", type_id = "clutter_pointer_a11y_dwell_direction_get_type ()")]
++	public enum PointerA11yDwellDirection {
++		NONE,
++		LEFT,
++		RIGHT,
++		UP,
++		DOWN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_MODE_", type_id = "clutter_pointer_a11y_dwell_mode_get_type ()")]
++	public enum PointerA11yDwellMode {
++		WINDOW,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_", type_id = "clutter_pointer_a11y_flags_get_type ()")]
++	[Flags]
++	public enum PointerA11yFlags {
++		SECONDARY_CLICK_ENABLED,
++		DWELL_ENABLED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_TIMEOUT_TYPE_", type_id = "clutter_pointer_a11y_timeout_type_get_type ()")]
++	public enum PointerA11yTimeoutType {
++		SECONDARY_CLICK,
++		DWELL,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_", type_id = "clutter_repaint_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.10")]
++	public enum RepaintFlags {
++		PRE_PAINT,
++		POST_PAINT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = "clutter_request_mode_get_type ()")]
++	[Version (since = "0.8")]
++	public enum RequestMode {
++		HEIGHT_FOR_WIDTH,
++		WIDTH_FOR_HEIGHT,
++		CONTENT_SIZE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_rotate_axis_get_type ()")]
++	[Version (since = "0.4")]
++	public enum RotateAxis {
++		X_AXIS,
++		Y_AXIS,
++		Z_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_", type_id = "clutter_rotate_direction_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum RotateDirection {
++		CW,
++		CCW
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_", type_id = "clutter_scaling_filter_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ScalingFilter {
++		LINEAR,
++		NEAREST,
++		TRILINEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_direction_get_type ()")]
++	[Version (since = "0.4")]
++	public enum ScrollDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		SMOOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_FINISHED_", type_id = "clutter_scroll_finish_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.26")]
++	public enum ScrollFinishFlags {
++		NONE,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_mode_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ScrollMode {
++		NONE,
++		HORIZONTALLY,
++		VERTICALLY,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_SOURCE_", type_id = "clutter_scroll_source_get_type ()")]
++	[Version (since = "1.26")]
++	public enum ScrollSource {
++		UNKNOWN,
++		WHEEL,
++		FINGER,
++		CONTINUOUS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_shader_type_get_type ()")]
++	[Version (since = "1.4")]
++	public enum ShaderType {
++		VERTEX_SHADER,
++		FRAGMENT_SHADER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_", type_id = "clutter_snap_edge_get_type ()")]
++	[Version (since = "1.6")]
++	public enum SnapEdge {
++		TOP,
++		RIGHT,
++		BOTTOM,
++		LEFT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
++	[Version (since = "1.6")]
++	public enum StaticColor {
++		WHITE,
++		BLACK,
++		RED,
++		DARK_RED,
++		GREEN,
++		DARK_GREEN,
++		BLUE,
++		DARK_BLUE,
++		CYAN,
++		DARK_CYAN,
++		MAGENTA,
++		DARK_MAGENTA,
++		YELLOW,
++		DARK_YELLOW,
++		GRAY,
++		DARK_GRAY,
++		LIGHT_GRAY,
++		BUTTER,
++		BUTTER_LIGHT,
++		BUTTER_DARK,
++		ORANGE,
++		ORANGE_LIGHT,
++		ORANGE_DARK,
++		CHOCOLATE,
++		CHOCOLATE_LIGHT,
++		CHOCOLATE_DARK,
++		CHAMELEON,
++		CHAMELEON_LIGHT,
++		CHAMELEON_DARK,
++		SKY_BLUE,
++		SKY_BLUE_LIGHT,
++		SKY_BLUE_DARK,
++		PLUM,
++		PLUM_LIGHT,
++		PLUM_DARK,
++		SCARLET_RED,
++		SCARLET_RED_LIGHT,
++		SCARLET_RED_DARK,
++		ALUMINIUM_1,
++		ALUMINIUM_2,
++		ALUMINIUM_3,
++		ALUMINIUM_4,
++		ALUMINIUM_5,
++		ALUMINIUM_6,
++		TRANSPARENT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
++	[Version (since = "1.12")]
++	public enum StepMode {
++		START,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_", type_id = "clutter_swipe_direction_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum SwipeDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_", type_id = "clutter_text_direction_get_type ()")]
++	[Version (since = "1.2")]
++	public enum TextDirection {
++		DEFAULT,
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_", type_id = "clutter_texture_flags_get_type ()")]
++	[Flags]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum TextureFlags {
++		NONE,
++		RGB_FLAG_BGR,
++		RGB_FLAG_PREMULT,
++		YUV_FLAG_YUV2
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_", type_id = "clutter_texture_quality_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.8")]
++	public enum TextureQuality {
++		LOW,
++		MEDIUM,
++		HIGH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_", type_id = "clutter_timeline_direction_get_type ()")]
++	[Version (since = "0.6")]
++	public enum TimelineDirection {
++		FORWARD,
++		BACKWARD
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TOUCHPAD_GESTURE_PHASE_", type_id = "clutter_touchpad_gesture_phase_get_type ()")]
++	[Version (since = "1.24")]
++	public enum TouchpadGesturePhase {
++		BEGIN,
++		UPDATE,
++		END,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum UnitType {
++		PIXEL,
++		EM,
++		MM,
++		POINT,
++		CM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_VIRTUAL_DEVICE_TYPE_", type_id = "clutter_virtual_device_type_get_type ()")]
++	[Flags]
++	public enum VirtualDeviceType {
++		NONE,
++		KEYBOARD,
++		POINTER,
++		TOUCHSCREEN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ZOOM_", type_id = "clutter_zoom_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum ZoomAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_")]
++	[Version (since = "1.10")]
++	public errordomain ImageError {
++		DATA;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")]
++	[Version (since = "0.6")]
++	public errordomain ScriptError {
++		TYPE_FUNCTION,
++		PROPERTY,
++		VALUE;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.24")]
++	public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)]
++	[Version (since = "1.0")]
++	public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	public delegate void Callback (Clutter.Actor actor);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.18")]
++	public delegate bool EventFilterFunc (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.0")]
++	public delegate void PathCallback (Clutter.PathNode node);
++	[CCode (cheader_filename = "clutter/clutter.h", has_target = false)]
++	[Version (since = "1.0")]
++	public delegate bool ProgressFunc (GLib.Value a, GLib.Value b, double progress, GLib.Value retval);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 6.9)]
++	[Version (since = "0.6")]
++	public delegate void ScriptConnectFunc (Clutter.Script script, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 3.9)]
++	[Version (since = "1.10")]
++	public delegate double TimelineProgressFunc (Clutter.Timeline timeline, double elapsed, double total);
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_COGL")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string COGL;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_CURRENT_TIME")]
++	[Version (since = "0.4")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_FLAVOUR")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string FLAVOUR;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PATH_RELATIVE")]
++	public const int PATH_RELATIVE;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PRIORITY_REDRAW")]
++	[Version (since = "0.8")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void base_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.12")]
++	public static void cairo_clear (Cairo.Context cr);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.14")]
++	public static void disable_accessibility ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static void do_event (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static bool events_pending ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.4")]
++	public static bool get_accessibility_enabled ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static unowned Clutter.Event get_current_event ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static uint32 get_current_event_time ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static unowned Clutter.Backend get_default_backend ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static uint get_default_frame_rate ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static Clutter.TextDirection get_default_text_direction ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static unowned Pango.FontMap get_font_map ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.8")]
++	public static GLib.OptionGroup get_option_group_without_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static unowned string get_script_id (GLib.Object gobject);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static uint32 keysym_to_unicode (uint keyval);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void set_custom_backend_func (void* func);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.10")]
++	public static uint unicode_to_keysym (uint32 wc);
++}
+diff --git vapi/mutter-cogl-7.vapi vapi/mutter-cogl-7.vapi
+index 620c2317..1aae97d5 100644
+--- vapi/mutter-cogl-7.vapi
++++ vapi/mutter-cogl-7.vapi
+@@ -32,7 +32,9 @@ namespace Cogl {
+ 	public class Context : Cogl.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
+ 		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
+ 	}
+ 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
+ 	[Compact]
+@@ -270,6 +272,10 @@ namespace Cogl {
+ 		[Version (since = "2.0")]
+ 		public void set_user_program (Cogl.Handle program);
+ 	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
+ 	[CCode (cheader_filename = "cogl/cogl.h")]
+ 	[Compact]
+ 	public class PixelBuffer : Cogl.Handle {
+diff --git vapi/mutter-cogl-8-custom.vala vapi/mutter-cogl-8-custom.vala
+new file mode 100644
+index 00000000..c4d4b93a
+--- /dev/null
++++ vapi/mutter-cogl-8-custom.vala
+@@ -0,0 +1,119 @@
++namespace Cogl {
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class Buffer: Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++
++	[CCode (has_type_id = false)]
++	public struct Color {
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++	}
++
++	[Compact]
++	[CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++
++	[Compact]
++	public class PixelBuffer: Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	public class Program: Handle {
++		[CCode (cname = "cogl_create_program", type = "CoglHandle*", has_construct_function = false)]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	public class Shader: Handle {
++		[CCode (cname = "cogl_create_shader", type = "CoglHandle*", has_construct_function = false)]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	public class VertexBuffer: Handle {
++		[CCode (type = "CoglHandle*", has_construct_function = false)]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class VertexBufferIndices: Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++
++	[CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")]
++	public struct Matrix {
++		[CCode (cname = "cogl_matrix_init_from_array", array_length = false, array_null_terminated = false)]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++
++	[SimpleType]
++	[GIR (name = "Bool")]
++	[BooleanType]
++	public struct Bool : bool {
++	}
++
++	public static GLib.Callback get_proc_address(string s);
++}
+diff --git vapi/mutter-cogl-8.deps vapi/mutter-cogl-8.deps
+new file mode 100644
+index 00000000..98ccac5b
+--- /dev/null
++++ vapi/mutter-cogl-8.deps
+@@ -0,0 +1 @@
++pango
+diff --git vapi/mutter-cogl-8.vapi vapi/mutter-cogl-8.vapi
+new file mode 100644
+index 00000000..c17c124e
+--- /dev/null
++++ vapi/mutter-cogl-8.vapi
+@@ -0,0 +1,1091 @@
++/* mutter-cogl-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "8", lower_case_cprefix = "cogl_")]
++namespace Cogl {
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_bitmap_get_gtype ()")]
++	public class Bitmap : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Bitmap ();
++		public static uint32 error_quark ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.0")]
++		public Bitmap.from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public Cogl.PixelFormat get_format ();
++		[Version (since = "1.10")]
++		public int get_height ();
++		[Version (since = "1.10")]
++		public int get_rowstride ();
++		[Version (since = "1.0")]
++		public static bool get_size_from_file (string filename, out int width, out int height);
++		[Version (since = "1.10")]
++		public int get_width ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class Buffer : Cogl.Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_context_get_gtype ()")]
++	public class Context : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
++		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.14")]
++	public class FrameClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_frame_info_get_gtype ()")]
++	public class FrameInfo : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameInfo ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		public bool get_is_symbolic ();
++		[Version (since = "1.14")]
++		public int64 get_presentation_time ();
++		[Version (since = "1.14")]
++		public float get_refresh_rate ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_framebuffer_get_type ()")]
++	public abstract class Framebuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Framebuffer ();
++		[Version (since = "1.8")]
++		public virtual bool allocate () throws GLib.Error;
++		[Version (since = "1.8")]
++		public void clear (ulong buffers, Cogl.Color color);
++		[Version (since = "1.8")]
++		public void clear4f (ulong buffers, float red, float green, float blue, float alpha);
++		[Version (since = "1.8")]
++		public void discard_buffers (ulong buffers);
++		[Version (since = "1.10")]
++		public void draw_multitextured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, [CCode (array_length = false)] float[] tex_coords, int tex_coords_len);
++		[Version (since = "1.10")]
++		public void draw_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void draw_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, float s_1, float t_1, float s_2, float t_2);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		public static uint32 error_quark ();
++		[Version (since = "1.10")]
++		public void finish ();
++		public void flush ();
++		[Version (since = "1.10")]
++		public void frustum (float left, float right, float bottom, float top, float z_near, float z_far);
++		[Version (since = "1.8")]
++		public int get_alpha_bits ();
++		[Version (since = "1.8")]
++		public int get_blue_bits ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_context ();
++		[Version (since = "2.0")]
++		public int get_depth_bits ();
++		[Version (since = "1.18")]
++		public bool get_depth_write_enabled ();
++		[Version (since = "1.8")]
++		public bool get_dither_enabled ();
++		[Version (since = "1.8")]
++		public int get_green_bits ();
++		[Version (since = "1.8")]
++		public int get_height ();
++		public bool get_is_stereo ();
++		[Version (since = "1.10")]
++		public void get_modelview_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void get_projection_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public int get_red_bits ();
++		[Version (since = "1.10")]
++		public int get_samples_per_pixel ();
++		[Version (since = "1.20")]
++		public Cogl.StereoMode get_stereo_mode ();
++		[Version (since = "1.8")]
++		public void get_viewport4fv ([CCode (array_length = false)] out unowned float viewport[4]);
++		[Version (since = "1.8")]
++		public float get_viewport_height ();
++		[Version (since = "1.8")]
++		public float get_viewport_width ();
++		[Version (since = "1.8")]
++		public float get_viewport_x ();
++		[Version (since = "1.8")]
++		public float get_viewport_y ();
++		[Version (since = "1.8")]
++		public int get_width ();
++		[Version (since = "1.10")]
++		public void identity_matrix ();
++		[NoWrapper]
++		public virtual bool is_y_flipped ();
++		[Version (since = "1.10")]
++		public void orthographic (float x_1, float y_1, float x_2, float y_2, float near, float far);
++		[Version (since = "1.10")]
++		public void perspective (float fov_y, float aspect, float z_near, float z_far);
++		[Version (since = "1.10")]
++		public void pop_clip ();
++		[Version (since = "1.10")]
++		public void pop_matrix ();
++		[Version (since = "1.10")]
++		public void push_matrix ();
++		[Version (since = "1.10")]
++		public void push_rectangle_clip (float x_1, float y_1, float x_2, float y_2);
++		public void push_region_clip (Cairo.Region region);
++		[Version (since = "1.10")]
++		public void push_scissor_clip (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public bool read_pixels (int x, int y, int width, int height, Cogl.PixelFormat format, uint8 pixels);
++		[Version (since = "1.10")]
++		public bool read_pixels_into_bitmap (int x, int y, Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
++		[Version (since = "1.8")]
++		public void resolve_samples ();
++		[Version (since = "1.8")]
++		public void resolve_samples_region (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public void rotate (float angle, float x, float y, float z);
++		[Version (since = "2.0")]
++		public void rotate_euler (Graphene.Euler euler);
++		[Version (since = "1.10")]
++		public void scale (float x, float y, float z);
++		[Version (since = "1.18")]
++		public void set_depth_write_enabled (bool depth_write_enabled);
++		[Version (since = "1.8")]
++		public void set_dither_enabled (bool dither_enabled);
++		[Version (since = "1.10")]
++		public void set_modelview_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void set_projection_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public void set_samples_per_pixel (int samples_per_pixel);
++		[Version (since = "1.20")]
++		public void set_stereo_mode (Cogl.StereoMode stereo_mode);
++		[Version (since = "1.8")]
++		public void set_viewport (float x, float y, float width, float height);
++		[Version (since = "1.10")]
++		public void transform (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void translate (float x, float y, float z);
++		[NoAccessorMethod]
++		public void* driver_config { get; construct; }
++		[NoAccessorMethod]
++		public int height { get; set construct; }
++		[NoAccessorMethod]
++		public int width { get; set construct; }
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class FramebufferDriverConfig {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	[Compact]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_material_get_type ()")]
++	[Compact]
++	public class Material {
++		[CCode (has_construct_function = false)]
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public Material ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_alpha_test_function (Cogl.MaterialAlphaFunc alpha_func, float alpha_reference);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color (Cogl.Color color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer (int layer_index, Cogl.Handle texture);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_filters (int layer_index, Cogl.MaterialFilter min_filter, Cogl.MaterialFilter mag_filter);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_point_size (float point_size);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class MaterialLayer {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_object_get_gtype ()")]
++	public abstract class Object {
++		[CCode (has_construct_function = false)]
++		protected Object ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_type ()")]
++	public class Offscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Offscreen ();
++		[CCode (has_construct_function = false)]
++		public Offscreen.with_texture (Cogl.Texture texture);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_onscreen_get_type ()")]
++	public class Onscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Onscreen ();
++		[Version (since = "1.16")]
++		public Cogl.OnscreenDirtyClosure add_dirty_callback ([CCode (delegate_target_pos = 1.5)] Cogl.OnscreenDirtyCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[Version (since = "1.14")]
++		public Cogl.FrameClosure add_frame_callback ([CCode (delegate_target_pos = 1.5)] Cogl.FrameCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[NoWrapper]
++		public virtual void bind ();
++		[Version (since = "1.14")]
++		public virtual int get_buffer_age ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		[Version (since = "2.0")]
++		public void hide ();
++		[Version (since = "1.16")]
++		public void remove_dirty_callback (Cogl.OnscreenDirtyClosure closure);
++		[Version (since = "1.14")]
++		public void remove_frame_callback (Cogl.FrameClosure closure);
++		[Version (since = "2.0")]
++		public void show ();
++		[Version (since = "1.10")]
++		public void swap_buffers (Cogl.FrameInfo frame_info, void* user_data);
++		[Version (since = "1.16")]
++		public virtual void swap_buffers_with_damage (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++		[Version (since = "1.10")]
++		public virtual void swap_region (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_onscreen_dirty_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.16")]
++	public class OnscreenDirtyClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_pipeline_get_gtype ()")]
++	public class Pipeline : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Pipeline (Cogl.Context context);
++		[Version (since = "2.0")]
++		public Cogl.Pipeline copy ();
++		[Version (since = "2.0")]
++		public void foreach_layer (Cogl.PipelineLayerCallback callback);
++		[Version (since = "2.0")]
++		public Cogl.PipelineAlphaFunc get_alpha_test_function ();
++		[Version (since = "2.0")]
++		public float get_alpha_test_reference ();
++		[Version (since = "2.0")]
++		public Cogl.Color get_color ();
++		[Version (since = "2.0")]
++		public Cogl.PipelineCullFaceMode get_cull_face_mode ();
++		[Version (since = "2.0")]
++		public Cogl.Winding get_front_face_winding ();
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_mag_filter (int layer_index);
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_min_filter (int layer_index);
++		[Version (since = "2.0")]
++		public bool get_layer_point_sprite_coords_enabled (int layer_index);
++		[Version (since = "1.10")]
++		public unowned Cogl.Texture get_layer_texture (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_s (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_t (int layer_index);
++		[Version (since = "2.0")]
++		public int get_n_layers ();
++		[Version (since = "2.0")]
++		public bool get_per_vertex_point_size ();
++		[Version (since = "2.0")]
++		public float get_point_size ();
++		[Version (since = "2.0")]
++		public int get_uniform_location (string uniform_name);
++		[Version (since = "2.0")]
++		public unowned Cogl.Handle get_user_program ();
++		[Version (since = "1.10")]
++		public void remove_layer (int layer_index);
++		[Version (since = "2.0")]
++		public void set_alpha_test_function (Cogl.PipelineAlphaFunc alpha_func, float alpha_reference);
++		[Version (since = "2.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (since = "2.0")]
++		public void set_color (Cogl.Color color);
++		[Version (since = "2.0")]
++		public void set_color4f (float red, float green, float blue, float alpha);
++		[Version (since = "2.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "2.0")]
++		public void set_cull_face_mode (Cogl.PipelineCullFaceMode cull_face_mode);
++		[Version (since = "2.0")]
++		public void set_front_face_winding (Cogl.Winding front_winding);
++		[Version (since = "2.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (since = "1.10")]
++		public void set_layer_filters (int layer_index, Cogl.PipelineFilter min_filter, Cogl.PipelineFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		public void set_layer_max_mipmap_level (int layer, int max_level);
++		[Version (since = "1.10")]
++		public void set_layer_null_texture (int layer_index);
++		[Version (since = "2.0")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		public void set_layer_texture (int layer_index, Cogl.Texture texture);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_s (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_t (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public bool set_per_vertex_point_size (bool enable) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_point_size (float point_size);
++		[Version (since = "2.0")]
++		public void set_uniform_1f (int uniform_location, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_1i (int uniform_location, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_float (int uniform_location, int n_components, int count, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_int (int uniform_location, int n_components, int count, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_matrix (int uniform_location, int dimensions, int count, bool transpose, float value);
++		[Version (since = "2.0")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Compact]
++	public class PixelBuffer : Cogl.Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	[Compact]
++	public class Program : Cogl.Handle {
++		[CCode (cname = "cogl_create_program", has_construct_function = false, type = "CoglHandle*")]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class Scanout {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	[Compact]
++	public class Shader : Cogl.Handle {
++		[CCode (cname = "cogl_create_shader", has_construct_function = false, type = "CoglHandle*")]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d", type_id = "cogl_texture_2d_get_gtype ()")]
++	public class Texture2D : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2D ();
++		public void egl_image_external_alloc_finish (void* user_data, GLib.DestroyNotify destroy);
++		public void egl_image_external_bind ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Texture2D.from_bitmap (Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d_sliced", type_id = "cogl_texture_2d_sliced_get_gtype ()")]
++	public class Texture2DSliced : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2DSliced ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.16")]
++		public Texture2DSliced.from_bitmap (Cogl.Bitmap bmp, int max_waste);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	[Compact]
++	public class VertexBuffer : Cogl.Handle {
++		[CCode (has_construct_function = false, type = "CoglHandle*")]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void @delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, Cogl.VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class VertexBufferIndices : Cogl.Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_texture_get_gtype ()")]
++	public interface Texture : Cogl.Object {
++		public bool allocate () throws GLib.Error;
++		public static uint32 error_quark ();
++		[Version (since = "1.18")]
++		public Cogl.TextureComponents get_components ();
++		public int get_data (Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[]? data);
++		public bool get_gl_texture (out uint out_gl_handle, out uint out_gl_target);
++		public uint get_height ();
++		public int get_max_waste ();
++		[Version (since = "1.18")]
++		public bool get_premultiplied ();
++		public uint get_width ();
++		public bool is_sliced ();
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++		public static Cogl.Texture new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.2")]
++		public Cogl.Texture new_from_sub_texture (int sub_x, int sub_y, int sub_width, int sub_height);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (since = "1.18")]
++		public void set_components (Cogl.TextureComponents components);
++		public bool set_data (Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uint8[] data, int level) throws GLib.Error;
++		[Version (since = "1.18")]
++		public void set_premultiplied (bool premultiplied);
++		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (since = "1.8")]
++		public bool set_region_from_bitmap (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[SimpleType]
++	public struct Angle : int32 {
++	}
++	[BooleanType]
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[GIR (name = "Bool")]
++	[SimpleType]
++	public struct Bool : bool {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.0")]
++	public struct Color {
++		[CCode (has_construct_function = false, type = "CoglColor*")]
++		public Color ();
++		public Cogl.Color? copy ();
++		public void free ();
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public float get_alpha ();
++		public uint8 get_alpha_byte ();
++		public float get_alpha_float ();
++		public float get_blue ();
++		public uint8 get_blue_byte ();
++		public float get_blue_float ();
++		public float get_green ();
++		public uint8 get_green_byte ();
++		public float get_green_float ();
++		public float get_red ();
++		public uint8 get_red_byte ();
++		public float get_red_float ();
++		[Version (since = "1.4")]
++		public void init_from_4f (float red, float green, float blue, float alpha);
++		[Version (since = "1.4")]
++		public void init_from_4fv (float color_array);
++		[Version (since = "1.4")]
++		public void init_from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public void premultiply ();
++		[Version (since = "1.4")]
++		public void set_alpha (float alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_byte (uint8 alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_float (float alpha);
++		[Version (since = "1.4")]
++		public void set_blue (float blue);
++		[Version (since = "1.4")]
++		public void set_blue_byte (uint8 blue);
++		[Version (since = "1.4")]
++		public void set_blue_float (float blue);
++		[Version (since = "1.4")]
++		public void set_green (float green);
++		[Version (since = "1.4")]
++		public void set_green_byte (uint8 green);
++		[Version (since = "1.4")]
++		public void set_green_float (float green);
++		[Version (since = "1.4")]
++		public void set_red (float red);
++		[Version (since = "1.4")]
++		public void set_red_byte (uint8 red);
++		[Version (since = "1.4")]
++		public void set_red_float (float red);
++		[Version (since = "1.16")]
++		public void to_hsl (out float hue, out float saturation, out float luminance);
++		[Version (since = "1.4")]
++		public void unpremultiply ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.8")]
++	public struct DebugObjectTypeInfo {
++		public weak string name;
++		public ulong instance_count;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_MATRIX")]
++	public struct Matrix {
++		[CCode (array_length = false, array_null_terminated = false, cname = "cogl_matrix_init_from_array")]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.16")]
++	public struct OnscreenDirtyInfo {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	public struct TextureVertex {
++		public float x;
++		public float y;
++		public float z;
++		public float tx;
++		public float ty;
++		public Cogl.Color color;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.4")]
++	public struct UserDataKey {
++		public int unused;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglColorSizeCheck", has_type_id = false)]
++	public struct _ColorSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglColor_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglTextureVertexSizeCheck", has_type_id = false)]
++	public struct _TextureVertexSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglTextureVertex_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum AttributeType {
++		BYTE,
++		UNSIGNED_BYTE,
++		SHORT,
++		UNSIGNED_SHORT,
++		FLOAT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BITMAP_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum BitmapError {
++		FAILED,
++		UNKNOWN_TYPE,
++		CORRUPT_IMAGE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BLEND_STRING_ERROR_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum BlendStringError {
++		PARSE_ERROR,
++		ARGUMENT_PARSE_ERROR,
++		INVALID_ERROR,
++		GPU_UNSUPPORTED_ERROR;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_BIT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum BufferBit {
++		COLOR,
++		DEPTH,
++		STENCIL
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum BufferTarget {
++		WINDOW_BUFFER,
++		OFFSCREEN_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false)]
++	public enum DepthTestFunction {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_EGL_IMAGE_FLAG_", has_type_id = false)]
++	[Flags]
++	public enum EglImageFlags {
++		NONE,
++		NO_GET_DATA
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FEATURE_ID_", has_type_id = false)]
++	[Version (since = "1.10")]
++	public enum FeatureID {
++		[CCode (cname = "COGL_FEATURE_ID_UNSIGNED_INT_INDICES")]
++		OGL_FEATURE_ID_UNSIGNED_INT_INDICES,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_READ")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
++		[CCode (cname = "COGL_FEATURE_ID_FENCE")]
++		OGL_FEATURE_ID_FENCE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_RG")]
++		OGL_FEATURE_ID_TEXTURE_RG,
++		[CCode (cname = "COGL_FEATURE_ID_BUFFER_AGE")]
++		OGL_FEATURE_ID_BUFFER_AGE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL")]
++		OGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
++		[CCode (cname = "COGL_FEATURE_ID_BLIT_FRAMEBUFFER")]
++		OGL_FEATURE_ID_BLIT_FRAMEBUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FILTER_", has_type_id = false)]
++	public enum FilterReturn {
++		CONTINUE,
++		REMOVE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAME_EVENT_", has_type_id = false)]
++	[Version (since = "1.14")]
++	public enum FrameEvent {
++		SYNC,
++		COMPLETE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAMEBUFFER_ERROR_", has_type_id = false)]
++	public enum FramebufferError {
++		[CCode (cname = "COGL_FRAMEBUFFER_ERROR_ALLOCATE")]
++		FRAMEBUFFER_ERROR_ALLOCATE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_GRAPHICS_RESET_STATUS_", has_type_id = false)]
++	public enum GraphicsResetStatus {
++		NO_ERROR,
++		GUILTY_CONTEXT_RESET,
++		INNOCENT_CONTEXT_RESET,
++		UNKNOWN_CONTEXT_RESET,
++		PURGED_CONTEXT_RESET
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false)]
++	public enum IndicesType {
++		BYTE,
++		SHORT,
++		INT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false)]
++	public enum MaterialAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false)]
++	public enum MaterialFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum MaterialWrapMode {
++		REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_ALPHA_FUNC_", has_type_id = false)]
++	public enum PipelineAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_CULL_FACE_MODE_", has_type_id = false)]
++	public enum PipelineCullFaceMode {
++		NONE,
++		FRONT,
++		BACK,
++		BOTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_FILTER_", has_type_id = false)]
++	public enum PipelineFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "2.0")]
++	public enum PipelineWrapMode {
++		REPEAT,
++		MIRRORED_REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum PixelFormat {
++		ANY,
++		A_8,
++		RGB_565,
++		RGBA_4444,
++		RGBA_5551,
++		YUV,
++		G_8,
++		RG_88,
++		RGB_888,
++		BGR_888,
++		RGBA_8888,
++		BGRA_8888,
++		ARGB_8888,
++		ABGR_8888,
++		RGBA_1010102,
++		BGRA_1010102,
++		ARGB_2101010,
++		ABGR_2101010,
++		RGBA_FP_16161616,
++		BGRA_FP_16161616,
++		ARGB_FP_16161616,
++		ABGR_FP_16161616,
++		RGBA_8888_PRE,
++		BGRA_8888_PRE,
++		ARGB_8888_PRE,
++		ABGR_8888_PRE,
++		RGBA_4444_PRE,
++		RGBA_5551_PRE,
++		RGBA_1010102_PRE,
++		BGRA_1010102_PRE,
++		ARGB_2101010_PRE,
++		ABGR_2101010_PRE,
++		RGBA_FP_16161616_PRE,
++		BGRA_FP_16161616_PRE,
++		ARGB_FP_16161616_PRE,
++		ABGR_FP_16161616_PRE,
++		DEPTH_16,
++		DEPTH_32,
++		DEPTH_24_STENCIL_8;
++		public int get_bytes_per_pixel (int plane);
++		public int get_n_planes ();
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum ReadPixelsFlags {
++		[CCode (cname = "COGL_READ_PIXELS_COLOR_BUFFER")]
++		READ_PIXELS_COLOR_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_RENDERER_ERROR_", has_type_id = false)]
++	public enum RendererError {
++		XLIB_DISPLAY_OPEN,
++		BAD_CONSTRAINT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SHADER_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum ShaderType {
++		VERTEX,
++		FRAGMENT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_STEREO_", has_type_id = false)]
++	public enum StereoMode {
++		BOTH,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SYSTEM_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum SystemError {
++		UNSUPPORTED,
++		NO_MEMORY
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_COMPONENTS_", has_type_id = false)]
++	[Version (since = "1.18")]
++	public enum TextureComponents {
++		A,
++		RG,
++		RGB,
++		RGBA,
++		DEPTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_ERROR_", has_type_id = false)]
++	[Version (since = "1.8")]
++	public enum TextureError {
++		SIZE,
++		FORMAT,
++		BAD_PARAMETER,
++		TYPE;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum TextureFlags {
++		NONE,
++		NO_AUTO_MIPMAP,
++		NO_SLICING,
++		NO_ATLAS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_VERTICES_MODE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum VerticesMode {
++		POINTS,
++		LINES,
++		LINE_LOOP,
++		LINE_STRIP,
++		TRIANGLES,
++		TRIANGLE_STRIP,
++		TRIANGLE_FAN
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINDING_", has_type_id = false)]
++	public enum Winding {
++		CLOCKWISE,
++		COUNTER_CLOCKWISE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINSYS_FEATURE_", has_type_id = false)]
++	public enum WinsysFeature {
++		MULTIPLE_ONSCREEN,
++		VBLANK_COUNTER,
++		VBLANK_WAIT,
++		TEXTURE_FROM_PIXMAP,
++		SWAP_BUFFERS_EVENT,
++		SWAP_REGION,
++		SWAP_REGION_THROTTLE,
++		SWAP_REGION_SYNCHRONIZED,
++		BUFFER_AGE,
++		SYNC_AND_COMPLETE_EVENT,
++		N_FEATURES
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SCANOUT_ERROR_")]
++	public errordomain ScanoutError {
++		[CCode (cname = "COGL_SCANOUT_ERROR_INHIBITED")]
++		SCANOUT_ERROR_INHIBITED;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "1.8")]
++	public delegate void DebugObjectForeachTypeCallback (Cogl.DebugObjectTypeInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "0.10")]
++	public delegate void FeatureCallback (Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 3.9)]
++	[Version (since = "1.14")]
++	public delegate void FrameCallback (Cogl.Onscreen onscreen, Cogl.FrameEvent event, Cogl.FrameInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "1.16")]
++	public delegate void OnscreenDirtyCallback (Cogl.Onscreen onscreen, Cogl.OnscreenDirtyInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "2.0")]
++	public delegate bool PipelineLayerCallback (Cogl.Pipeline pipeline, int layer_index);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	public delegate bool Texture2DEGLImageExternalAlloc (Cogl.Texture2D tex_2d) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h", has_target = false)]
++	public delegate void UserDataDestroyCallback (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_AFIRST_BIT")]
++	public const int AFIRST_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_A_BIT")]
++	public const int A_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_BGR_BIT")]
++	public const int BGR_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_DEPTH_BIT")]
++	public const int DEPTH_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PIXEL_FORMAT_MAX_PLANES")]
++	public const int PIXEL_FORMAT_MAX_PLANES;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PREMULT_BIT")]
++	public const int PREMULT_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_STENCIL_BIT")]
++	public const int STENCIL_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_TEXTURE_MAX_WASTE")]
++	public const int TEXTURE_MAX_WASTE;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool blit_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Framebuffer dst, int src_x, int src_y, int dst_x, int dst_y, int width, int height) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool clutter_winsys_has_feature_CLUTTER (Cogl.WinsysFeature feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool color_equal (void* v1, void* v2);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.16")]
++	public static void color_init_from_hsl (out Cogl.Color color, float hue, float saturation, float luminance);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_program ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_shader (Cogl.ShaderType shader_type);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_foreach_type (Cogl.DebugObjectForeachTypeCallback func);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_print_instances ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static void flush ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static void foreach_feature (Cogl.Context context, Cogl.FeatureCallback callback);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_backface_culling_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.14")]
++	public static int64 get_clock_time (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_depth_test_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static Cogl.GraphicsResetStatus get_graphics_reset_status (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static GLib.Callback get_proc_address (string s);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool has_feature (Cogl.Context context, Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool is_bitmap (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_context (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_frame_info (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_framebuffer (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_pipeline (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_program (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_shader (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture_2d (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_texture_2d_sliced (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_attach_shader (Cogl.Handle program_handle, Cogl.Handle shader_handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static int program_get_uniform_location (Cogl.Handle handle, string uniform_name);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_link (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1f (Cogl.Handle program, int uniform_location, float value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1i (Cogl.Handle program, int uniform_location, int value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_float (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_int (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] int[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_matrix (Cogl.Handle program, int uniform_location, int dimensions, bool transpose, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_backface_culling_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_depth_test_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_disabled_on_thread (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread (void* data, string group, string filename);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread_with_fd (void* data, string group, int fd);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static Cogl.ShaderType shader_get_type (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void shader_source (Cogl.Handle shader, string source);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++	public static Cogl.Texture texture_new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++}
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 5f9833ca9cbf..e989feaea31e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.5.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

From e0e039465742403b4f29372e3b6626076ceb9df6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 9 Apr 2021 22:46:46 +0200
Subject: [PATCH 143/386] linux*: don't use front LED as hdd LED on apple/ppc32
 + refresh

Closes https://github.com/void-ppc/void-packages/pull/48
---
 srcpkgs/linux4.14/files/ppc-dotconfig |  4 ++--
 srcpkgs/linux4.19/files/ppc-dotconfig |  7 +++----
 srcpkgs/linux4.4/files/ppc-dotconfig  |  3 ++-
 srcpkgs/linux4.9/files/ppc-dotconfig  |  2 +-
 srcpkgs/linux5.10/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.11/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.4/files/ppc-dotconfig  | 13 +++----------
 7 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 9e68df353c07..69ea5d411540 100644
--- a/srcpkgs/linux4.14/files/ppc-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.217 Kernel Configuration
+# Linux/powerpc 4.14.225 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -2082,7 +2082,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index a84d0bbe95c0..489d1fbb5b32 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.169 Kernel Configuration
+# Linux/powerpc 4.19.185 Kernel Configuration
 #
 
 #
@@ -540,9 +540,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -2099,7 +2098,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index 396b70bc042b..28549f49431f 100644
--- a/srcpkgs/linux4.4/files/ppc-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.253 Kernel Configuration
+# Linux/powerpc 4.4.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -441,6 +441,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9039011c89a2..7a95057509e2 100644
--- a/srcpkgs/linux4.9/files/ppc-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.253 Kernel Configuration
+# Linux/powerpc 4.9.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 49cfd6e6f5d1..32cef8a304dc 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.10 Kernel Configuration
+# Linux/powerpc 5.10.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -532,7 +531,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1654,7 +1652,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2255,7 +2252,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3858,7 +3855,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5937,7 +5933,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7009,7 +7004,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
diff --git a/srcpkgs/linux5.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
index a15dc18fb3f6..9d3e11bd0511 100644
--- a/srcpkgs/linux5.11/files/ppc-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.11.2 Kernel Configuration
+# Linux/powerpc 5.11.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -1656,7 +1655,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2260,7 +2258,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3861,7 +3859,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5950,7 +5947,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7034,7 +7030,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
@@ -7857,7 +7852,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 857125d15a5d..f16d80306325 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.108 Kernel Configuration
+# Linux/powerpc 5.4.110 Kernel Configuration
 #
 
 #
@@ -522,12 +522,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -2214,7 +2210,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -6959,9 +6955,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

From 4594bc2640161845e042b8617e52d6bc1d645bf9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:07:01 +0200
Subject: [PATCH 144/386] libguestfs: update to 1.44.1.

---
 srcpkgs/libguestfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8fd4f17921af..b3df393d76e0 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,6 +1,6 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.44.0
+version=1.44.1
 revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license=" GPL-2.0-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
+checksum=72b7dcdd32da1c17c932cf5a0a70b3bd68bc93e94828ad66a539f2e616adb025
 
 conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.conf

From 666a2f1ba7def702ea9c2abcc2d031c68517da60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:15:23 +0200
Subject: [PATCH 145/386] vagrant: update to 2.2.15.

---
 srcpkgs/vagrant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 77b3ae8889ac..c7f3cdcd2de9 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.10
+version=2.2.15
 revision=1
 archs="i686 x86_64*"
 hostmakedepends="ruby"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=722db22b431c68030e046c7c6c90629763d86a2473caa0fe8834d5742a91941f
+checksum=98c9c726d5cb7e46793b4505f3d907b2a0673e0f6e43997c218a0be5330cc83f
 nocross=yes
 
 post_extract() {

From 077f89d2fd15ebe68f6d6d250a31d2b9582edc56 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:11 +0200
Subject: [PATCH 146/386] pinktrace: update to 0.9.6.

---
 srcpkgs/pinktrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 0759732f55aa..235d2f97454a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -1,6 +1,6 @@
 # Template file for 'pinktrace'
 pkgname=pinktrace
-version=0.9.3
+version=0.9.6
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/pinktrace/"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=260fba87c3c1d8a296295bab9ddaf9ff393f5c961ee7567f86fb5751d9f7a125
+checksum=5d2670607f70da397c6da06fbb1844020b44b63c8aea8a725771aac02235b27a
 
 pre_configure() {
 	./autogen.sh

From 1e8c8c1c9637784caaf28fc86b6b6f055e6838cf Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:33 +0200
Subject: [PATCH 147/386] sydbox: update to 1.1.0.

---
 srcpkgs/sydbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index e9f043c0678f..ffaabf73d2de 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,6 +1,6 @@
 # Template file for 'sydbox'
 pkgname=sydbox
-version=1.0.8
+version=1.1.0
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=237dd9765ba869698e8d2c3a170857081a0569a042e3f0f581c28f0abd0f4b2b
+checksum=765fd5ce4b3a48270c7ea7b8b3d0dbf43f103ce0214c1ae7126579310f571bd2
 python_version=2 #unverified
 
 # seccomp only implemented on x86

From 3f4caaf90ac38fa91e70d0da7b589170fa52fc44 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 19:27:46 +0300
Subject: [PATCH 148/386] libmatroska: update to 1.6.3, - project uses github
 for the official git repos, changing distfiles to github to take advantage, -
 change homepage, - adjust wrksrc.

---
 srcpkgs/libmatroska/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index b569bbd4dd01..5385183627d2 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -1,16 +1,17 @@
 # Template file for 'libmatroska'
 pkgname=libmatroska
-version=1.6.2
+version=1.6.3
 revision=1
+wrksrc="${pkgname}-release-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://dl.matroska.org/downloads/libmatroska/"
-distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
-checksum=bc4479aa8422ab07643df6a1fa5a19e4bed4badfd41ca77e081628620d1e1990
+homepage="https://www.matroska.org/downloads/libraries.html"
+distfiles="https://github.com/Matroska-Org/libmatroska/archive/refs/tags/release-${version}.tar.gz"
+checksum=0c8c875ae26ac69a722f7fd0f4a4fecb4fdff681f2a165f09c06a40cbf1d0de6
 
 libmatroska-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From bb398afb19477aee803cbddc5c2c8ff4a78d210c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:22:10 +0300
Subject: [PATCH 149/386] mk-configure: update to 0.37.0.

---
 srcpkgs/mk-configure/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index dad5f0e0e21f..b7c019b828d3 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,6 +1,6 @@
 # Template file for 'mk-configure'
 pkgname=mk-configure
-version=0.36.0
+version=0.37.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -10,20 +10,28 @@ make_install_args="${make_build_args} MANDIR=/usr/share/man"
 make_check_target="test"
 hostmakedepends="bmake bmkdep tar texinfo"
 depends="bmake bmkdep"
-checkdepends="automake glib-devel groff pkg-config bison flex"
+checkdepends="automake glib-devel groff pkg-config bison flex libbsd-devel"
 short_desc="Lightweight replacement for GNU autotools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/cheusov/mk-configure/"
 distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=48188e9305b7b1e2f81d3a70e0af1112affa8a7871b01335b86829ffed746177
+checksum=7aff2a94b66c5b0d622665af561d3474e321d7c42f8c1e4a274e290b43da26ea
 disable_parallel_build=yes
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		checkdepends+=" musl-fts-devel"
+esac
+
+
 post_extract() {
 	rm -r tests/pkg_config_2  # different wording
 	rm -r tests/*lua*
 	rm -r examples/*lua*
 	rm -r examples/*lex*
+	rm -r tests/test_subprj_dash
+	rm -r tests/test_mkc_vs_*
 	vsed -i -e 's/-Wabi//g' mk/mkc_imp.platform.sys.mk
 }
 pre_build() {
@@ -31,10 +39,6 @@ pre_build() {
 }
 pre_check() {
 	unset CC CFLAGS CXXFLAGS
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i 's|Cannot allocate|Out of|g' examples/hello_errwarn/expect.out ;;
-	esac
 }
 post_install() {
 	vlicense doc/LICENSE

From 8d61ed2476b04983fcef40f7d6218dccbd3adf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 23:58:28 -0300
Subject: [PATCH 150/386] pinktrace: restrict arch list to supported platforms.

This has the side effect of disabling the build for aarch64, which was
previously not restricted in the template but wasn't available in repos
anyway (builder scheduling issues led to it not being noticed).
---
 srcpkgs/pinktrace/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 235d2f97454a..3fbb5a48a58a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -2,6 +2,8 @@
 pkgname=pinktrace
 version=0.9.6
 revision=1
+# arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
+archs="x86_64* i686* ppc* arm*"
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
 configure_args="--enable-python"

From bbc3f0cf18361353b459233873a0c0d816ef4cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 00:09:29 -0300
Subject: [PATCH 151/386] libguestfs: mark broken on musl.

Our musl-legacy-compat package should provide static inline versions of
error(3), but it's erroring out during linking:

/usr/bin/ld: ../lib/.libs/libguestfs.so: undefined reference to `error'
collect2: error: ld returned 1 exit status
---
 srcpkgs/libguestfs/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index b3df393d76e0..81afe313d203 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -30,6 +30,9 @@ conf_files="etc/libguestfs-tools.conf
 
 nocross=yes
 archs="i686* x86_64* ppc64le*"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/35666/steps/shell_3/logs/stdio"
+fi
 
 build_options="ruby python go php lua fuse"
 build_options_default="ruby fuse"

From 3db3f998e3608aa9f98f91bc26ce5fd6c49ac252 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 08:19:44 +0200
Subject: [PATCH 152/386] evolution: provide libevolution-mail-formatter.so

---
 srcpkgs/evolution/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index f3b3656921bb..4ccbb8149d14 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.40.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
@@ -21,7 +21,7 @@ changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
- libevolution-mail.so libevolution-shell.so"
+ libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel

From fb77406cad9ef2232bdf65ec9833dc9bda913df1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:38:48 +0200
Subject: [PATCH 153/386] gwenhywfar: update to 5.6.0.

---
 srcpkgs/gwenhywfar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index 89adfe051249..c6e01f4bea86 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,9 +1,9 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
-version=5.4.0
-revision=2
+version=5.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-visibility --disable-binreloc
+configure_args="--disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"
 hostmakedepends="automake pkg-config libgcrypt-devel libtool which"
 makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/aqbanking/gwenhywfar"
 distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz"
-checksum=e46c3450d610b36f51b46ab97640ae340e8b68850f03b23b98c4ab682a5027c0
+checksum=9f2876770824a283d02fd730bb1f7a98970fa6f20121f4af433d6698831c3a84
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 1fca76dcc3012607b803837bec415e9932264100 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:51:18 +0200
Subject: [PATCH 154/386] aqbanking: update to 6.2.10.

---
 srcpkgs/aqbanking/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index 3d2289d73684..cf453189601c 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,6 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-version=6.2.5
+version=6.2.10
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar tar"
@@ -9,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="https://www.aquamaniac.de/rdm/attachments/download/342/${pkgname}-${version}.tar.gz"
-checksum=cf5b060e3ec7e3fc925687caf044d4df3dbf9595f23c4fe8ffad78f44af0d6df
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/368/${pkgname}-${version}.tar.gz"
+checksum=78435ff3211353e24791e2f96943c82949c48aef3704f5b57d09f08a4abcab8d
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then

From b64869e60104a14730ad2ddfad70af251a10192c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 10:59:30 +0200
Subject: [PATCH 155/386] wesnoth: update to 1.14.16.

---
 srcpkgs/wesnoth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 7b9b5bd64a0b..e79d37bf6b34 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.14.13
-revision=3
+version=1.14.16
+revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
@@ -14,7 +14,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=3824a6c2828a866ede7caab81287382d5e95969e240d9e22364500a83291b8de
+checksum=0f52d427e2fb58f4d1961847be4e3564a3c4ad78190042b6d04f83cedac030b5
 replaces="wesnoth-data>=0"
 
 post_install() {

From 4d2b9e43d96d9bfcfc0bc1939de6ce6804d5291a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 14:58:48 +0200
Subject: [PATCH 156/386] linux5.10: update to 5.10.29.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e283aa86771c..1159ae5b9639 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.28
+version=5.10.29
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4dfc3aea719556e63e90b8692e9d4b779ad1cb2a9a4823bf721e30004e7ac354
+checksum=158c6746c11a90645b4d40bdb5c049d9fac7e4c9ed381c9b7aa94db1a8e7e9ec
 python_version=3
 patch_args="-Np1"
 

From 0a3f1deb4dcfa1e5e8a24f4ede2d989eaafd61af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 15:40:30 +0200
Subject: [PATCH 157/386] New package: vala-language-server-0.48.1

---
 srcpkgs/vala-language-server/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/vala-language-server/template

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
new file mode 100644
index 000000000000..870fe215fb92
--- /dev/null
+++ b/srcpkgs/vala-language-server/template
@@ -0,0 +1,13 @@
+# Template file for 'vala-language-server'
+pkgname=vala-language-server
+version=0.48.1
+revision=1
+build_style=meson
+hostmakedepends="gettext pkg-config vala"
+makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
+short_desc="Code Intelligence for Vala & Genie"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-3.0-only"
+homepage="https://github.com/benwaffle/vala-language-server"
+distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45

From d455796ed5b012b1b2e58eea776918a2e817aaa6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 11:32:03 +0200
Subject: [PATCH 158/386] =?UTF-8?q?srcpkgs:=20remove=20pullmoll=20from=20m?=
 =?UTF-8?q?aintainers=20field.=20=F0=9F=98=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set them to Orphaned for now.

If you'd like to pick up a package, feel free.
---
 srcpkgs/CoinMP/template                      | 2 +-
 srcpkgs/Maelstrom/template                   | 2 +-
 srcpkgs/MonkeysAudio/template                | 2 +-
 srcpkgs/SDL2_net/template                    | 2 +-
 srcpkgs/SMC/template                         | 2 +-
 srcpkgs/TSC/template                         | 2 +-
 srcpkgs/WiringPi/template                    | 2 +-
 srcpkgs/Z80Explorer/template                 | 2 +-
 srcpkgs/actiona/template                     | 2 +-
 srcpkgs/aisleriot/template                   | 2 +-
 srcpkgs/apulse/template                      | 2 +-
 srcpkgs/assimp/template                      | 2 +-
 srcpkgs/assimp_qt_viewer/template            | 2 +-
 srcpkgs/astromenace/template                 | 2 +-
 srcpkgs/atomix/template                      | 2 +-
 srcpkgs/avidemux/template                    | 2 +-
 srcpkgs/axel/template                        | 2 +-
 srcpkgs/bcal/template                        | 2 +-
 srcpkgs/bcunit/template                      | 2 +-
 srcpkgs/boinc/template                       | 2 +-
 srcpkgs/botan/template                       | 2 +-
 srcpkgs/broadcom-bt-firmware/template        | 2 +-
 srcpkgs/cbang/template                       | 2 +-
 srcpkgs/cegui/template                       | 2 +-
 srcpkgs/cegui07/template                     | 2 +-
 srcpkgs/choqok/template                      | 2 +-
 srcpkgs/ckmame/template                      | 2 +-
 srcpkgs/clamav/template                      | 2 +-
 srcpkgs/cld2/template                        | 2 +-
 srcpkgs/codeblocks/template                  | 2 +-
 srcpkgs/cpp-hocon/template                   | 2 +-
 srcpkgs/cross-i686-linux-musl/template       | 2 +-
 srcpkgs/cross-i686-pc-linux-gnu/template     | 2 +-
 srcpkgs/cross-powerpc64-linux-gnu/template   | 2 +-
 srcpkgs/cubietruck-base/template             | 2 +-
 srcpkgs/devil/template                       | 2 +-
 srcpkgs/dialogbox/template                   | 2 +-
 srcpkgs/dm-zoned-tools/template              | 2 +-
 srcpkgs/enigma/template                      | 2 +-
 srcpkgs/ent/template                         | 2 +-
 srcpkgs/fah/template                         | 2 +-
 srcpkgs/fbida/template                       | 2 +-
 srcpkgs/ffmpegthumbnailer/template           | 2 +-
 srcpkgs/firebird3/template                   | 2 +-
 srcpkgs/firefox-esr-i18n/template            | 2 +-
 srcpkgs/firefox-esr/template                 | 2 +-
 srcpkgs/five-or-more/template                | 2 +-
 srcpkgs/flexprop/template                    | 2 +-
 srcpkgs/flightgear/template                  | 2 +-
 srcpkgs/four-in-a-row/template               | 2 +-
 srcpkgs/freedroidRPG/template                | 2 +-
 srcpkgs/freeimage/template                   | 2 +-
 srcpkgs/freerouting/template                 | 2 +-
 srcpkgs/gconfmm/template                     | 2 +-
 srcpkgs/gdash/template                       | 2 +-
 srcpkgs/geda/template                        | 2 +-
 srcpkgs/gifsicle/template                    | 2 +-
 srcpkgs/glyphy/template                      | 2 +-
 srcpkgs/gnome-chess/template                 | 2 +-
 srcpkgs/gnome-icon-theme-xfce/template       | 2 +-
 srcpkgs/gnome-klotski/template               | 2 +-
 srcpkgs/gnome-mahjongg/template              | 2 +-
 srcpkgs/gnome-mines/template                 | 2 +-
 srcpkgs/gnome-nibbles/template               | 2 +-
 srcpkgs/gnome-robots/template                | 2 +-
 srcpkgs/gnome-sudoku/template                | 2 +-
 srcpkgs/gnome-tetravex/template              | 2 +-
 srcpkgs/gnurobbo/template                    | 2 +-
 srcpkgs/grub-customizer/template             | 2 +-
 srcpkgs/grub-terminus/template               | 2 +-
 srcpkgs/hitori/template                      | 2 +-
 srcpkgs/iagno/template                       | 2 +-
 srcpkgs/icu4lua/template                     | 2 +-
 srcpkgs/iniparser/template                   | 2 +-
 srcpkgs/injeqt/template                      | 2 +-
 srcpkgs/iselect/template                     | 2 +-
 srcpkgs/javahelp2/template                   | 2 +-
 srcpkgs/json-c++/template                    | 2 +-
 srcpkgs/kea/template                         | 2 +-
 srcpkgs/kobodeluxe/template                  | 2 +-
 srcpkgs/leatherman/template                  | 2 +-
 srcpkgs/leptonica/template                   | 2 +-
 srcpkgs/libclc/template                      | 2 +-
 srcpkgs/libe-book/template                   | 2 +-
 srcpkgs/libepubgen/template                  | 2 +-
 srcpkgs/libfreehand/template                 | 2 +-
 srcpkgs/libgadu/template                     | 2 +-
 srcpkgs/libgdal/template                     | 2 +-
 srcpkgs/libgnome-games-support/template      | 2 +-
 srcpkgs/libgta/template                      | 2 +-
 srcpkgs/libixion/template                    | 2 +-
 srcpkgs/libnumbertext/template               | 2 +-
 srcpkgs/libomxil-bellagio/template           | 2 +-
 srcpkgs/libopenraw/template                  | 2 +-
 srcpkgs/liborcus/template                    | 2 +-
 srcpkgs/libqxp/template                      | 2 +-
 srcpkgs/libreoffice/template                 | 2 +-
 srcpkgs/libsidplayfp/template                | 2 +-
 srcpkgs/libsoxr/template                     | 2 +-
 srcpkgs/libtorrent-rasterbar-python/template | 2 +-
 srcpkgs/libtorrent-rasterbar/template        | 2 +-
 srcpkgs/libucontext/template                 | 2 +-
 srcpkgs/lightsoff/template                   | 2 +-
 srcpkgs/lightzone/template                   | 2 +-
 srcpkgs/linux-firmware-dvb/template          | 2 +-
 srcpkgs/loadp2/template                      | 2 +-
 srcpkgs/log4cplus/template                   | 2 +-
 srcpkgs/lollypop/template                    | 2 +-
 srcpkgs/lzf/template                         | 2 +-
 srcpkgs/mame/template                        | 2 +-
 srcpkgs/mmv/template                         | 2 +-
 srcpkgs/mog/template                         | 2 +-
 srcpkgs/mruby/template                       | 2 +-
 srcpkgs/musl-fts/template                    | 2 +-
 srcpkgs/musl-obstack/template                | 2 +-
 srcpkgs/musl-rpmatch/template                | 2 +-
 srcpkgs/mxml/template                        | 2 +-
 srcpkgs/nasm-doc/template                    | 2 +-
 srcpkgs/nasm/template                        | 2 +-
 srcpkgs/netbsd-rumpkernel/template           | 2 +-
 srcpkgs/notepadqq/template                   | 2 +-
 srcpkgs/nrg2iso/template                     | 2 +-
 srcpkgs/nyx/template                         | 2 +-
 srcpkgs/ois/template                         | 2 +-
 srcpkgs/opencollada/template                 | 2 +-
 srcpkgs/openlierox/template                  | 2 +-
 srcpkgs/openttd/template                     | 2 +-
 srcpkgs/opentyrian/template                  | 2 +-
 srcpkgs/osg/template                         | 2 +-
 srcpkgs/osmid/template                       | 2 +-
 srcpkgs/paprefs/template                     | 2 +-
 srcpkgs/parole/template                      | 2 +-
 srcpkgs/pcb/template                         | 2 +-
 srcpkgs/pcsc-ccid/template                   | 2 +-
 srcpkgs/pdmenu/template                      | 2 +-
 srcpkgs/perl-File-Rename/template            | 2 +-
 srcpkgs/pilot-link/template                  | 2 +-
 srcpkgs/pipenightdreams/template             | 2 +-
 srcpkgs/python3-pylast/template              | 2 +-
 srcpkgs/qbittorrent/template                 | 2 +-
 srcpkgs/qmmp/template                        | 2 +-
 srcpkgs/qoauth-qt5/template                  | 2 +-
 srcpkgs/qqwing/template                      | 2 +-
 srcpkgs/qrcodegen/template                   | 2 +-
 srcpkgs/qt5-styleplugins/template            | 2 +-
 srcpkgs/quadrapassel/template                | 2 +-
 srcpkgs/quake4/template                      | 2 +-
 srcpkgs/qupzilla/template                    | 2 +-
 srcpkgs/qxmpp/template                       | 2 +-
 srcpkgs/rocksndiamonds/template              | 2 +-
 srcpkgs/seabios/template                     | 2 +-
 srcpkgs/silly/template                       | 2 +-
 srcpkgs/simgear/template                     | 2 +-
 srcpkgs/spin2cpp/template                    | 2 +-
 srcpkgs/stk/template                         | 2 +-
 srcpkgs/swell-foop/template                  | 2 +-
 srcpkgs/tali/template                        | 2 +-
 srcpkgs/tesseract-ocr/template               | 2 +-
 srcpkgs/tinyclipboard/template               | 2 +-
 srcpkgs/toluapp/template                     | 2 +-
 srcpkgs/tracebox/template                    | 2 +-
 srcpkgs/tslib/template                       | 2 +-
 srcpkgs/ttyqr/template                       | 2 +-
 srcpkgs/twaindsm/template                    | 2 +-
 srcpkgs/ucpp/template                        | 2 +-
 srcpkgs/ufoai/template                       | 2 +-
 srcpkgs/vgmplay/template                     | 2 +-
 srcpkgs/vino/template                        | 2 +-
 srcpkgs/virtuoso/template                    | 2 +-
 srcpkgs/widelands-maps/template              | 2 +-
 srcpkgs/widelands/template                   | 2 +-
 srcpkgs/wildmidi/template                    | 2 +-
 srcpkgs/xerces-c/template                    | 2 +-
 srcpkgs/xf86-video-mga/template              | 2 +-
 srcpkgs/xfce4-plugins/template               | 2 +-
 srcpkgs/xnec2c/template                      | 2 +-
 srcpkgs/xsane/template                       | 2 +-
 srcpkgs/ytnef/template                       | 2 +-
 srcpkgs/zbar/template                        | 2 +-
 srcpkgs/zynaddsubfx/template                 | 2 +-
 180 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/srcpkgs/CoinMP/template b/srcpkgs/CoinMP/template
index 43d8cb3fa3b5..995353eee428 100644
--- a/srcpkgs/CoinMP/template
+++ b/srcpkgs/CoinMP/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="doxygen graphviz pkg-config"
 short_desc="Library that supports most of Coin CLP, CBC and CGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CPL-1.0"
 homepage="https://projects.coin-or.org/CoinMP"
 distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz"
diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 4cb1f301b4ec..7c4be8c13b2a 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool SDL2_net-devel"
 makedepends="SDL2_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/MonkeysAudio/template b/srcpkgs/MonkeysAudio/template
index 44bcf5ceaa7c..6b9f47eda5e6 100644
--- a/srcpkgs/MonkeysAudio/template
+++ b/srcpkgs/MonkeysAudio/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style="gnu-makefile"
 depends="libMAC>=${version}_${revision}"
 short_desc="Fast and powerful lossless audio (de)compressor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://monkeysaudio.com/"
 distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip
diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template
index 206372e2bb66..71d1b17af693 100644
--- a/srcpkgs/SDL2_net/template
+++ b/srcpkgs/SDL2_net/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel"
 short_desc="SDL2 networking module"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.libsdl.org/projects/SDL_net/"
 distfiles="https://www.libsdl.org/projects/SDL_net/release/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
index 6484c332d53f..d67469fc18a8 100644
--- a/srcpkgs/SMC/template
+++ b/srcpkgs/SMC/template
@@ -8,7 +8,7 @@ hostmakedepends="automake libtool gettext-devel pkg-config unzip"
 makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel
  SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Two-dimensional platform game similar to Super Mario"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.secretmaryo.org/"
 distfiles="
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index d4d636dabd56..71534315cf7c 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -13,7 +13,7 @@ makedepends="SFML-devel boost-devel cegui-devel devil-devel gettext-devel
  mruby"
 depends="mruby>=0"
 short_desc="OSS 2D platform game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.secretchronicles.org/"
 distfiles="https://ftp.secretchronicles.org/releases/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/WiringPi/template b/srcpkgs/WiringPi/template
index 243956c2bca0..be844c979a43 100644
--- a/srcpkgs/WiringPi/template
+++ b/srcpkgs/WiringPi/template
@@ -12,7 +12,7 @@ depends="libwiringPi-${version}_${revision}
  WiringPi-gpio-${version}_${revision}
  WiringPi-examples-${version}_${revision}"
 short_desc="GPIO Interface library for the Raspberry Pi"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://wiringpi.com/"
 distfiles="https://github.com/WiringPi/WiringPi/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index f11a0e970695..7e5be704ade7 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -7,7 +7,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools p7zip"
 makedepends="qt5-devel qt5-script-devel"
 short_desc="Visual Zilog Z-80 netlist-level simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gdevic/Z80Explorer"
 distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index e520d1eac996..6ce3ccdc6b41 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -9,7 +9,7 @@ makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel"
 depends="qt5-plugin-mysql"
 short_desc="Cross platform automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index a26d8c2f0cf0..e31845d7fe61 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/apulse/template b/srcpkgs/apulse/template
index 154ec778969e..160bd9aebaa2 100644
--- a/srcpkgs/apulse/template
+++ b/srcpkgs/apulse/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel glib-devel"
 short_desc="PulseAudio emulation for ALSA"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/i-rinat/apulse"
 distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index f521d3922e05..7d45161ede5d 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
 depends="libassimp>=${version}_${revision}"
 short_desc="Import library for various well-known 3D model formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template
index 11838e028ae0..6caa2b4c7f0e 100644
--- a/srcpkgs/assimp_qt_viewer/template
+++ b/srcpkgs/assimp_qt_viewer/template
@@ -9,7 +9,7 @@ build_wrksrc="${pkgname}"
 hostmakedepends="qt5-host-tools qt5-devel"
 makedepends="qt5-devel libassimp-devel"
 short_desc="Qt-Widget-based viewer for assimp"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/assimp/assimp_qt_viewer"
 distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index 5008426e40b2..b3217129293c 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
  fontconfig-devel freetype-devel libXinerama-devel"
 short_desc="Hardcore 3D space shooter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
 homepage="http://www.viewizard.com/"
 distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 392b68f995e6..a59e134ebd91 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 25747b767a8a..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -13,7 +13,7 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
  liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
 depends="python"
 short_desc="Video editing and processing application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 9fbfb8237b69..c8469ee809cc 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -7,7 +7,7 @@ conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
 makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template
index 3fbf97ccaf61..c2c34e650984 100644
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 makedepends="readline-devel"
 depends="bc"
 short_desc="Byte CALculator for storage conversions and calculations"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
diff --git a/srcpkgs/bcunit/template b/srcpkgs/bcunit/template
index 29a8171ae65d..445ae1a092a6 100644
--- a/srcpkgs/bcunit/template
+++ b/srcpkgs/bcunit/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-DENABLE_DOC=ON"
 short_desc="Lightweight unit tests in C"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/BelledonneCommunications/bcunit"
 distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index d3fde8b73b6b..1eba13495c2a 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -12,7 +12,7 @@ makedepends="glu-devel libfreeglut-devel libcurl-devel
 depends="curl ca-certificates"
 conf_files="/etc/default/boinc-client"
 short_desc="Berkely Infrastructure for Network Computing"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index ee196bbe4eec..d2e6ffb9ccda 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -8,7 +8,7 @@ pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
 makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 93314460c88b..fe83eb64d3c5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -6,7 +6,7 @@ _patch=_p1
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Broadcom"
 homepage="https://github.com/winterheart/broadcom-bt-firmware"
 distfiles="https://github.com/winterheart/broadcom-bt-firmware/archive/v${version}${_patch}.tar.gz"
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index c4b45f44f2e6..63388b2aa828 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
 openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/CauldronDevelopmentLLC/cbang"
 distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index e2a4be0f9a49..070fa66aff81 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -17,7 +17,7 @@ makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-deve
  $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
 short_desc="Crazy Eddie's Graphical User Interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index 24b148e75070..3fa7f80a2ea7 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -15,7 +15,7 @@ makedepends="boost-devel devil-devel freeimage-devel freetype-devel
  $(vopt_if python 'python-devel')"
 depends="cegui07-data"
 short_desc="Crazy Eddie's Graphical User Interface (0.7.x)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
diff --git a/srcpkgs/choqok/template b/srcpkgs/choqok/template
index 080e1d589e2d..75a2c16f63e0 100644
--- a/srcpkgs/choqok/template
+++ b/srcpkgs/choqok/template
@@ -7,7 +7,7 @@ hostmakedepends="extra-cmake-modules gettext pkg-config"
 makedepends="kcmutils-devel kdewebkit-devel kemoticons-devel knotifyconfig-devel
  kparts-devel qca-qt5-devel qt5-networkauth-devel qt5-devel purpose-devel telepathy-qt5-devel"
 short_desc="Twitter, Pump.io, GNU social client for KDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://choqok.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version%.*}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ckmame/template b/srcpkgs/ckmame/template
index 7140737d051e..1b88f6a965cb 100644
--- a/srcpkgs/ckmame/template
+++ b/srcpkgs/ckmame/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="libxml2-devel libzip-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Program to check ROM sets for MAME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-clause"
 homepage="https://nih.at/ckmame/"
 distfiles="https://github.com/nih-at/ckmame/archive/rel-${version//./-}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e65ed2c9ed8e..2dcc86015d9f 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -15,7 +15,7 @@ hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
  ncurses-devel pcre-devel tcl-devel"
 short_desc="Clam Anti-Virus scanner"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cld2/template b/srcpkgs/cld2/template
index 5c7b638f29fe..85999552be41 100644
--- a/srcpkgs/cld2/template
+++ b/srcpkgs/cld2/template
@@ -5,7 +5,7 @@ revision=1
 _gitrev=b56fa78a2fe44ac2851bae5bf4f4693a0644da7b
 wrksrc="${pkgname}-${_gitrev}"
 short_desc="Compact Language Detector 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/CLD2Owners/cld2"
 distfiles="https://github.com/CLD2Owners/cld2/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 43c9e4127a56..33b9b9a77853 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool pkg-config zip"
 makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
  gamin-devel boost-devel boost-build"
 short_desc="Free C, C++ and Fortran IDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://www.codeblocks.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template
index 181463376996..1e050aeb41aa 100644
--- a/srcpkgs/cpp-hocon/template
+++ b/srcpkgs/cpp-hocon/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel leatherman-devel libcurl-devel"
 depends="leatherman"
 short_desc="C++ port of the Typesafe Config library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/cpp-hocon/"
 distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6864371d1c83..4561bc7ff8b6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,7 +12,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index d63680b65726..263a43f7a7b8 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -11,7 +11,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index c99c7dd1e97a..35cfcaa6f02e 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -13,7 +13,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cubietruck-base/template b/srcpkgs/cubietruck-base/template
index fa80bb39bbc0..93dc21d8db3c 100644
--- a/srcpkgs/cubietruck-base/template
+++ b/srcpkgs/cubietruck-base/template
@@ -5,7 +5,7 @@ revision=2
 build_style=meta
 homepage="http://www.voidlinux.org"
 short_desc="Void Linux Cubietruck (Cubieboard 3) platform package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 
 archs="armv7l"
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 95bc542c6d6e..1dffc7bdd52c 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
  glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
 short_desc="Developer's Image Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="http://openil.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template
index bdf95c2ad451..31d985e61769 100644
--- a/srcpkgs/dialogbox/template
+++ b/srcpkgs/dialogbox/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
 short_desc="Scriptable engine with customizable GUI for shell scripts"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/martynets/dialogbox"
 distfiles="https://github.com/martynets/dialogbox/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dm-zoned-tools/template b/srcpkgs/dm-zoned-tools/template
index 2df918003a4f..d76e4cbe1834 100644
--- a/srcpkgs/dm-zoned-tools/template
+++ b/srcpkgs/dm-zoned-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="device-mapper-devel libblkid-devel libkmod-devel"
 short_desc="Userspace tool for the dm-zoned device mapper"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hgst/dm-zoned-tools/"
 distfiles="https://github.com/hgst/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index b913c6f514c6..d04fa5112492 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config"
 makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Puzzle game inspired by Oxyd on the Atari ST"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/enigma/"
 distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ent/template b/srcpkgs/ent/template
index 0505ecfbfa97..e8c50ee0681c 100644
--- a/srcpkgs/ent/template
+++ b/srcpkgs/ent/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Evaluate pseudo random number generators"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.fourmilab.ch/random/"
 distfiles="${homepage}/random.zip"
diff --git a/srcpkgs/fah/template b/srcpkgs/fah/template
index ad717b51f862..8fb277fef313 100644
--- a/srcpkgs/fah/template
+++ b/srcpkgs/fah/template
@@ -6,7 +6,7 @@ archs="x86_64"
 hostmakedepends="python"
 depends="python desktop-file-utils hicolor-icon-theme"
 short_desc="Folding@home distributed computation power for research"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary, GPL-2.0-only"
 homepage="https://foldingathome.org"
 distfiles="https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${version%.*}/fahclient_${version}_amd64.deb
diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 170baf031b71..347632343733 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -10,7 +10,7 @@ freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-de
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
 short_desc="Display and elementary edit images using fbdev"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e2..039eea7622b3 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
 depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dirkvdb/${pkgname}"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index df02ac1379c7..a84cc7ef9234 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -30,7 +30,7 @@ hostmakedepends="automake libtool pkg-config icu"
 makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 32724397ee39..5d62a9f8a99a 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -4,7 +4,7 @@ version=78.8.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 56c0ae7cb4bc..61f36d2058e8 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -18,7 +18,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
 depends="nss>=3.53 desktop-file-utils hicolor-icon-theme"
 short_desc="Firefox browser - Extended Support Release"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index eadab37b26af..bb137c32d42c 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel librsvg-devel libgee08-devel libgnome-games-support-devel"
 short_desc="GNOME align five or more objects game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/flexprop/template b/srcpkgs/flexprop/template
index 3b8ce55d3c82..4529640916df 100644
--- a/srcpkgs/flexprop/template
+++ b/srcpkgs/flexprop/template
@@ -6,7 +6,7 @@ hostmakedepends="loadp2 which"
 makedepends="tk-devel"
 depends="loadp2 tk xterm"
 short_desc="Simple GUI for creating applications on the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/flexprop/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 5313f97d0c5e..e5528205b9e0 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -12,7 +12,7 @@ makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
  $(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')"
 depends="flightgear-data>=${version}"
 short_desc="Sophisticated flight simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="
diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template
index b39ae1dc1850..cc6f458b44d4 100644
--- a/srcpkgs/four-in-a-row/template
+++ b/srcpkgs/four-in-a-row/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME four in a row game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Four-in-a-row"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template
index e3e7a01fd33c..9ed80a8b1267 100644
--- a/srcpkgs/freedroidRPG/template
+++ b/srcpkgs/freedroidRPG/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python"
 makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel
  libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel"
 short_desc="Role playing game featuring Tux and evil robots"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.freedroid.org/"
 distfiles="http://ftp.osuosl.org/pub/freedroid/${pkgname}-${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freeimage/template b/srcpkgs/freeimage/template
index d06403bfd747..c45052a67b17 100644
--- a/srcpkgs/freeimage/template
+++ b/srcpkgs/freeimage/template
@@ -6,7 +6,7 @@ wrksrc=FreeImage
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Support library for popular graphics image formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, FreeImage"
 homepage="http://freeimage.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 6c7655a9ea72..123cb60b2daf 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gconfmm/template b/srcpkgs/gconfmm/template
index 23995ac0bdaa..4411ea02ccae 100644
--- a/srcpkgs/gconfmm/template
+++ b/srcpkgs/gconfmm/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="GConf-devel glibmm-devel"
 short_desc="C++ bindings for GConf"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gconfmm.sourceforge.net"
 distfiles="${GNOME_SITE}/gconfmm/${version%.*}/gconfmm-${version}.tar.xz"
diff --git a/srcpkgs/gdash/template b/srcpkgs/gdash/template
index ba997f875fd8..04d55d085a66 100644
--- a/srcpkgs/gdash/template
+++ b/srcpkgs/gdash/template
@@ -9,7 +9,7 @@ makedepends="glu-devel gtk+-devel SDL2_image-devel SDL2_mixer-devel"
 configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
 
 short_desc="Boulder Dash clone close to the original"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitbucket.org/czirkoszoltan/gdash"
 distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz"
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index d3ee7d151d6f..6626bc91fd94 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -11,7 +11,7 @@ makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_
 depends="guile"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index 119c18fc4eb0..9844c5783405 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Command-line tool for information about GIF images"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.lcdf.org/gifsicle/"
 distfiles="https://github.com/kohler/gifsicle/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/glyphy/template b/srcpkgs/glyphy/template
index 15079905c59a..e2af47e04429 100644
--- a/srcpkgs/glyphy/template
+++ b/srcpkgs/glyphy/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config which"
 makedepends="freetype-devel"
 short_desc="Signed-distance-field (SDF) text renderer using OpenGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/behdad/glyphy"
 distfiles="https://codeload.github.com/behdad/glyphy/tar.gz/${_gitrev}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 2e3cfa721d4f..4ed9e8bc914e 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel"
 makedepends="gtk+3-devel librsvg-devel"
 depends="gnuchess"
 short_desc="GNOME chess user interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-icon-theme-xfce/template b/srcpkgs/gnome-icon-theme-xfce/template
index f8a78eb2027f..54efb083c544 100644
--- a/srcpkgs/gnome-icon-theme-xfce/template
+++ b/srcpkgs/gnome-icon-theme-xfce/template
@@ -4,7 +4,7 @@ version=0.6
 revision=3
 wrksrc="gnome-icon-theme-xfce"
 short_desc="Theme adding missing icons for Xfce"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/gnome-icon-theme-xfce"
 distfiles="https://launchpad.net/gnome-icon-theme-xfce/trunk/${version}/+download/gnome-icon-theme-xfce-source-${version}.tar.gz"
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index c1ddd4a7d117..f07c1ea0105a 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you move blocks"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 3c8f2e7039e6..9cf1ef18d634 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -7,7 +7,7 @@ configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
 short_desc="GNOME Mahjongg solitaire game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index 31813fef3648..bb3377650691 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME puzzle game where you locate mines in the ocean"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 7a23c7e70ee9..e09a03a81ca2 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel intltool itstool pkg-config vala"
 makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
  libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 1c370caf5fa4..1d85efb012db 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index 2348ba05e49d..86c314e7f147 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -7,7 +7,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index 78f0ef176f39..f9879dcdfcce 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext itstool pkg-config vala glib-devel"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="GNOME puzzle game where you align pieces with numbers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index ea4d14790583..49d4b52577f2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 37a8467653f4..67f3cfb3e7ee 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -9,7 +9,7 @@ depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"
 short_desc="Graphical grub2 settings manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/grub-customizer/"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/grub-terminus/template b/srcpkgs/grub-terminus/template
index 7e4e8c2e2f7e..2275e5a6d224 100644
--- a/srcpkgs/grub-terminus/template
+++ b/srcpkgs/grub-terminus/template
@@ -4,7 +4,7 @@ version=0.3
 revision=1
 hostmakedepends="grub-utils terminus-font"
 short_desc="Terminus bold fonts for GRUB"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1, GPL-2.0-or-later"
 homepage="https://voidlinux.org"
 
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 10b7d2ac4951..061990af5058 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="GNOME eponymous puzzle game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index 6867e5334510..c70fb8250785 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel gdk-pixbuf itstool pkg-config vala"
 makedepends="gsound-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME Reversi (Othello) game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Iagno"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 58a1800279d4..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="icu-devel lua51-devel"
 short_desc="Binary module for providing Unicode support to Lua"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT,X"
 homepage="http://luaforge.net/projects/icu-lua/"
 distfiles="
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index a780d47dbdd8..fb813c7d870d 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-makefile
 hostmakedepends="doxygen chrpath"
 short_desc="Free stand-alone ini file parsing library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://ndevilla.free.fr/iniparser/"
 distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template
index 78eba09a0249..3efad365a492 100644
--- a/srcpkgs/injeqt/template
+++ b/srcpkgs/injeqt/template
@@ -7,7 +7,7 @@ configure_args="-DDISABLE_COVERAGE=ON"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Dependency injection framework for Qt"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/vogel/injeqt/"
 distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 7b0737f37747..37318b036b7e 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/javahelp2/template b/srcpkgs/javahelp2/template
index 5418d08075af..8db0e13810b2 100644
--- a/srcpkgs/javahelp2/template
+++ b/srcpkgs/javahelp2/template
@@ -6,7 +6,7 @@ _gitver=3ca862d8626096770598a3a256886d205246f4a4
 wrksrc=javahelp-${_gitver}
 short_desc="Java based help system"
 hostmakedepends="openjdk8 apache-ant unzip which"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CDDL-1.1, GPL-2.0-only"
 homepage="https://javahelp.java.net/"
 distfiles="https://github.com/javaee/javahelp/archive/${_gitver}.zip>${pkgname}-${version}.zip"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 23c0d56fc8e8..87d68e676c8d 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index aab6022e4957..dc0bcc5de3fc 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -16,7 +16,7 @@ depends="libkea>=0"
 checkdepends="procps-ng" #needs pgrep
 conf_files="/etc/kea/*.conf"
 short_desc="Next generation DHCPv4/v6 server"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 3de0311b8e52..94e3e8329728 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -8,7 +8,7 @@ configure_args="--sharedstatedir=/var/games"
 hostmakedepends="pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Space shooter in 2D"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index 5f28459fd73c..b61fcd5dc205 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -7,7 +7,7 @@ configure_args="-DLEATHERMAN_SHARED=ON"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel libcurl-devel"
 short_desc="Collection of C++ and CMake utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/leatherman/"
 distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index 9461bb050d39..cc24df74e47d 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
 short_desc="Image processing and analysis library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
 distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index a1ff860eacd2..b73aac741dc0 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="cmake clang llvm python3 libedit-devel libffi-devel
  ncurses-devel zlib-devel"
 short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://libclc.llvm.org"
 distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 0ea778589437..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -7,7 +7,7 @@ configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
 makedepends="boost-devel icu-devel libcppunit-devel libxml2-devel librevenge-devel liblangtag-devel"
 short_desc="Import reflowable e-book formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="http://sourceforge.net/projects/libebook/"
 distfiles="${SOURCEFORGE_SITE}/project/libebook/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libepubgen/template b/srcpkgs/libepubgen/template
index 1c46ef658e6f..9990fa39449e 100644
--- a/srcpkgs/libepubgen/template
+++ b/srcpkgs/libepubgen/template
@@ -7,7 +7,7 @@ hostmakedepends="doxygen pkg-config"
 makedepends="boost-devel libxml2-devel librevenge-devel"
 checkdepends="libcppunit-devel"
 short_desc="EPUB generator for librevenge"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://sourceforge.net/projects/libepubgen/"
 distfiles="${SOURCEFORGE_SITE}/../project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libfreehand/template b/srcpkgs/libfreehand/template
index 61202d61ca81..10282b4bd0d4 100644
--- a/srcpkgs/libfreehand/template
+++ b/srcpkgs/libfreehand/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="doxygen gperf perl pkg-config"
 makedepends="icu-devel lcms2-devel librevenge-devel"
 short_desc="Parser for Aldus/Macromedia/Adobe FreeHand documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgadu/template b/srcpkgs/libgadu/template
index f075c0cd2bf9..3775a273ca97 100644
--- a/srcpkgs/libgadu/template
+++ b/srcpkgs/libgadu/template
@@ -7,7 +7,7 @@ configure_args="--with-c99-vsnprintf"
 hostmakedepends="automake libtool pkg-config perl protobuf-c"
 makedepends="gnutls-devel libcurl-devel expat-devel libxml2-devel zlib-devel"
 short_desc="Gadu-Gadu instant messaging protocol library"
-maintainer="Jürgen Buchüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.wasilczyk.pl/en/projects/libgadu/"
 distfiles="https://github.com/wojtekka/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc6..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -11,7 +11,7 @@ makedepends="freexl-devel geos-devel jasper-devel json-c-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
  proj-devel sqlite-devel ocl-icd-devel"
 short_desc="Geospatial Data Abstraction Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.gdal.org/"
 distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 69e2cadc6e54..60a1aba20271 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="intltool pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://git.gnome.org/browse/libgnome-games-support/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgta/template b/srcpkgs/libgta/template
index b055b91b2b85..cae699f1b481 100644
--- a/srcpkgs/libgta/template
+++ b/srcpkgs/libgta/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="bzip2-devel liblzma-devel zlib-devel"
 short_desc="Generic Tagged Arrays"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://marlam.de/gta/"
 distfiles="https://marlam.de/gta/releases/libgta-${version}.tar.xz"
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 6ffb939d830b..60a21b07ac94 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
 short_desc="General purpose formula parser and interpreter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/ixion/ixion/"
 distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libnumbertext/template b/srcpkgs/libnumbertext/template
index ad68e52442ed..11611f5c3810 100644
--- a/srcpkgs/libnumbertext/template
+++ b/srcpkgs/libnumbertext/template
@@ -4,7 +4,7 @@ version=1.0.7
 revision=1
 build_style=gnu-configure
 short_desc="Language-neutral NUMBERTEXT and MONEYTEXT for LibreOffice Calc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Numbertext/libnumbertext"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libomxil-bellagio/template b/srcpkgs/libomxil-bellagio/template
index 966de521c471..6b120a2a87c4 100644
--- a/srcpkgs/libomxil-bellagio/template
+++ b/srcpkgs/libomxil-bellagio/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool doxygen"
 short_desc="Opensource implementation of the OpenMAX Integration Layer API"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://omxil.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/omxil/omxil/Bellagio%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b385..5b2f7bbd814f 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -7,7 +7,7 @@ configure_args="--with-boost=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config curl"
 makedepends="glib-devel gdk-pixbuf-devel boost-devel libxml2-devel libjpeg-turbo-devel"
 short_desc="Library for camera RAW files decoding"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
 homepage="https://${pkgname}.freedesktop.org/wiki/"
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 6d083ba48ff2..8c4ca51cf9f3 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
 short_desc="Library for processing spreadsheet documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/orcus/orcus"
 distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index ebe4dc44f914..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
 short_desc="Parser for QuarkXPress file format documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 distfiles="https://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 048355cfb171..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -44,7 +44,7 @@ depends+=" libreoffice-i18n-it>=${version}_${revision}"
 depends+=" libreoffice-i18n-pl>=${version}_${revision}"
 depends+=" libreoffice-i18n-pt>=${version}_${revision}"
 short_desc="Productivity suite"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
 
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index 2c4004c11d3c..945d635780ad 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
 short_desc="Library to play Commodore 64 SID music"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/p/sidplay-residfp/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libsoxr/template b/srcpkgs/libsoxr/template
index cafab40d280c..e74cb5d81dc3 100644
--- a/srcpkgs/libsoxr/template
+++ b/srcpkgs/libsoxr/template
@@ -9,7 +9,7 @@ configure_args="-Wno-dev -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON
  -DWITH_LSR_BINDINGS=ON -DWITH_OPENMP=ON -DWITH_PFFFT=ON"
 makedepends="libgomp-devel"
 short_desc="SoX resampler library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://sourceforge.net/p/soxr/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/soxr/soxr-${version}-Source.tar.xz"
diff --git a/srcpkgs/libtorrent-rasterbar-python/template b/srcpkgs/libtorrent-rasterbar-python/template
index 993c61d13cfb..3698780659e4 100644
--- a/srcpkgs/libtorrent-rasterbar-python/template
+++ b/srcpkgs/libtorrent-rasterbar-python/template
@@ -4,6 +4,6 @@ version=1.2.2
 revision=1
 build_style=meta
 short_desc="Obsolete package: switch to libtorrent-rasterbar-python3"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://voidlinux.org/"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 0588acd81bd8..8cef116f9aff 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -9,7 +9,7 @@ configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
 hostmakedepends="pkg-config intltool libtool python3-devel"
 makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index aa3f130d1e4a..3552b3c741e2 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -5,7 +5,7 @@ revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template
index 90fa9b34bf1d..48a6475a6a67 100644
--- a/srcpkgs/lightsoff/template
+++ b/srcpkgs/lightsoff/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel librsvg-devel"
 short_desc="GNOME puzzlle game where you turn off lights"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lightsoff"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 2fe82302d8e4..13242f01cc77 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -8,7 +8,7 @@ hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
 makedepends="libgomp-devel lcms2-devel libjpeg-turbo-devel tiff-devel libX11-devel lensfun-devel"
 depends="openjdk11 javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index ccbc83c8d262..332ee32405dc 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -4,7 +4,7 @@ version=20170329
 revision=4
 _gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
 short_desc="Linux TV firmware package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Multiple"
 homepage="https://linuxtv.org/"
 distfiles="
diff --git a/srcpkgs/loadp2/template b/srcpkgs/loadp2/template
index 02a982ce0a95..cb30cc2c210d 100644
--- a/srcpkgs/loadp2/template
+++ b/srcpkgs/loadp2/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="spin2cpp"
 depends="spin2cpp"
 short_desc="Loader for the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/loadp2"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/log4cplus/template b/srcpkgs/log4cplus/template
index ce018b8e1368..8babb2a412bb 100644
--- a/srcpkgs/log4cplus/template
+++ b/srcpkgs/log4cplus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-working-locale"
 short_desc="C++ logger very close to Java's log4j"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/log4cplus/log4cplus"
 #changelog="https://raw.githubusercontent.com/log4cplus/log4cplus/master/ChangeLog"
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index becd5dacec19..1c38cb23aea4 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -9,7 +9,7 @@ depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-dbus python3-gobject python3-pylast python3-youtube-dl
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1"
 short_desc="Music player for GNOME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lzf/template b/srcpkgs/lzf/template
index 91aa6bde417f..1d4e437dc1d4 100644
--- a/srcpkgs/lzf/template
+++ b/srcpkgs/lzf/template
@@ -6,7 +6,7 @@ wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
 short_desc="Extremely fast compression algorithm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://software.schmorp.de/pkg/liblzf.html"
 distfiles="http://dist.schmorp.de/liblzf/lib${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index bc498d82863a..b13571dd4cd3 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -9,7 +9,7 @@ makedepends="SDL2_ttf-devel fontconfig-devel glm libgomp-devel libjpeg-turbo-dev
  pugixml-devel rapidjson $(vopt_if qt 'qt5-devel')"
 depends="liberation-fonts-ttf"
 short_desc="Multiple Arcade Machine Emulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f43221fc1a95..f9f3fb3aa00e 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/mog/template b/srcpkgs/mog/template
index 7dae24a66f12..88421ccef317 100644
--- a/srcpkgs/mog/template
+++ b/srcpkgs/mog/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 makedepends="SDL_image-devel SDL_mixer-devel SDL_sound-devel"
 depends="mog-data>=${version}_${revision}"
 short_desc="Remake of classic MSX game The Maze of Galious"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.braingames.getput.com/mog/"
 distfiles="http://urchlay.naptime.net/~urchlay/src/mog.src_${version}-${_build}.tgz"
diff --git a/srcpkgs/mruby/template b/srcpkgs/mruby/template
index 3749ebf1c254..5648a4c9ea78 100644
--- a/srcpkgs/mruby/template
+++ b/srcpkgs/mruby/template
@@ -4,7 +4,7 @@ version=2.1.2
 revision=1
 hostmakedepends="ruby"
 short_desc="Lightweight implementation of the Ruby language (Ruby 1.9)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://mruby.org/"
 distfiles="https://github.com/mruby/mruby/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-fts/template b/srcpkgs/musl-fts/template
index 1f8228ecfd7e..fe6cb20c857f 100644
--- a/srcpkgs/musl-fts/template
+++ b/srcpkgs/musl-fts/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 archs="*-musl"
 short_desc="Implementation of fts(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/void-linux/musl-fts"
 distfiles="https://github.com/void-linux/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 09ba95e86148..7da24d223970 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -6,7 +6,7 @@ archs="*-musl"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Implementation of obstack for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/void-linux/musl-obstack"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-rpmatch/template b/srcpkgs/musl-rpmatch/template
index 40b62aff87d8..754d017afa73 100644
--- a/srcpkgs/musl-rpmatch/template
+++ b/srcpkgs/musl-rpmatch/template
@@ -7,7 +7,7 @@ configure_args="--enable-shared --enable-static"
 hostmakedepends="automake libtool gettext-devel"
 makedepends="gettext-devel"
 short_desc="Implementation of rpmatch(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
 homepage="https://github.com/pullmoll/musl-rpmatch"
 distfiles="https://github.com/pullmoll/musl-rpmatch/archive/v${version}.tar.gz"
diff --git a/srcpkgs/mxml/template b/srcpkgs/mxml/template
index d94622caa7ff..f49a04c6b052 100644
--- a/srcpkgs/mxml/template
+++ b/srcpkgs/mxml/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 make_build_args="libmxml.a all"
 configure_args="--enable-static --enable-shared"
 short_desc="Minimal XML library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="http://www.minixml.org/"
 distfiles="https://github.com/michaelrsweet/mxml/releases/download/v${version}/mxml-${version}.tar.gz"
diff --git a/srcpkgs/nasm-doc/template b/srcpkgs/nasm-doc/template
index 8d82491dc10f..943ff2cd6ac4 100644
--- a/srcpkgs/nasm-doc/template
+++ b/srcpkgs/nasm-doc/template
@@ -9,7 +9,7 @@ make_build_args="doc"
 hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions
  ghostscript source-sans-pro liberation-fonts-ttf"
 short_desc="80x86 assembler designed for portability and modularity - documentation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 88c62ca5da98..6f54506f5a6c 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -6,7 +6,7 @@ revision=1
 build_style=gnu-configure
 make_build_args="all"
 short_desc="80x86 assembler designed for portability and modularity"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 changelog="https://nasm.us/doc/nasmdocc.html"
diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template
index 0920c395d744..630bcf1fb30f 100644
--- a/srcpkgs/netbsd-rumpkernel/template
+++ b/srcpkgs/netbsd-rumpkernel/template
@@ -6,7 +6,7 @@ archs="x86_64* i686*"
 wrksrc="buildrump.sh-${version}"
 hostmakedepends="git tar"
 short_desc="NetBSD rump kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/anttikantee/buildrump.sh"
 distfiles="https://github.com/rumpkernel/buildrump.sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template
index 8a16e31d31e5..194588600db8 100644
--- a/srcpkgs/notepadqq/template
+++ b/srcpkgs/notepadqq/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Text editor for developers"
 homepage="https://notepadqq.com"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nrg2iso/template b/srcpkgs/nrg2iso/template
index b2b553c4ac62..3257be3dbef8 100644
--- a/srcpkgs/nrg2iso/template
+++ b/srcpkgs/nrg2iso/template
@@ -4,7 +4,7 @@ version=0.4
 revision=1
 build_style=gnu-makefile
 short_desc="Simple tool to convert from Nero Burning Rom (NRG) to ISO"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
 distfiles="http://gregory.kokanosky.free.fr/v4/linux/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index 7edee5a30b7a..d961d945e74e 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -7,7 +7,7 @@ pycompile_module="nyx"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-stem tor"
 short_desc="Command-line status monitor for tor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nyx.torproject.org/"
 distfiles="${PYPI_SITE}/n/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ois/template b/srcpkgs/ois/template
index 27e59464fb27..83536adcb588 100644
--- a/srcpkgs/ois/template
+++ b/srcpkgs/ois/template
@@ -7,7 +7,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
 short_desc="Object oriented input system"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="zlib-acknowledgement"
 homepage="https://wgois.github.io/OIS/"
 distfiles="https://github.com/wgois/OIS/archive/v${version}.tar.gz"
diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template
index 6b3ffed1d17b..6041120059b1 100644
--- a/srcpkgs/opencollada/template
+++ b/srcpkgs/opencollada/template
@@ -8,7 +8,7 @@ configure_args="-DUSE_SHARED=TRUE"
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel pcre-devel"
 short_desc="Stream based reader and writer library for COLLADA files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/OpenCOLLADA"
 distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
index b7696b375c30..7ae0e22f2d3d 100644
--- a/srcpkgs/openlierox/template
+++ b/srcpkgs/openlierox/template
@@ -10,7 +10,7 @@ makedepends="SDL_image-devel SDL_mixer-devel freealut-devel
  gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel"
 depends="virtual?libGL python"
 short_desc="Addictive real-time excessive Worms-clone"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openlierox.net/"
 distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index a6c009606422..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -12,7 +12,7 @@ makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma
  libxdg-basedir-devel"
 depends="hicolor-icon-theme"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
 distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index f7dcb7ed5682..a9ae953da179 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,7 +9,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="SDL_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a35ce21a172d..08bf6d4b6591 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
  $(vopt_if vnc libvncserver-devel)"
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OSGPL-2.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template
index 3db52e025389..f89e27caedc4 100644
--- a/srcpkgs/osmid/template
+++ b/srcpkgs/osmid/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libX11-devel"
 short_desc="Tool to convert MIDI to OSC and OSC to MIDI"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, ISC, GPL-3.0-or-later"
 homepage="https://github.com/llloret/osmid/"
 distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/paprefs/template b/srcpkgs/paprefs/template
index 90754e82d92b..277903780bcd 100644
--- a/srcpkgs/paprefs/template
+++ b/srcpkgs/paprefs/template
@@ -9,7 +9,7 @@ makedepends="dbus-glib-devel gtkmm-devel glibmm-devel libsigc++-devel
  pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Editor for pulseaudio settings"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://0pointer.de/lennart/projects/paprefs/"
 distfiles="${FREEDESKTOP_SITE}/pulseaudio/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c902128411c8..854f8492e24c 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -9,7 +9,7 @@ makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-dev
 depends="hicolor-icon-theme gst-libav gst-plugins-good1
  gst-plugins-bad1 gst-plugins-ugly1"
 short_desc="Modern simple media player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/parole/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index d9dbb9a8fe75..f6db34b88e4b 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -11,7 +11,7 @@ makedepends="gd-devel gtkglext-devel tk-devel"
 depends="geda gerbv"
 checkdepends="ImageMagick ghostscript"
 short_desc="Interactive printed circuit board editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcb.geda-project.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index a4009021ec24..0ce97d2628a5 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -8,7 +8,7 @@ configure_args="--enable-udev --enable-twinserial"
 hostmakedepends="pkg-config perl"
 makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel"
 short_desc="PC/SC driver to support CCID compliant readers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://ccid.apdu.fr/"
 changelog="https://salsa.debian.org/rousseau/CCID/-/raw/master/README.md"
diff --git a/srcpkgs/pdmenu/template b/srcpkgs/pdmenu/template
index 492eb767a5bc..68c4de92c568 100644
--- a/srcpkgs/pdmenu/template
+++ b/srcpkgs/pdmenu/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="slang-devel"
 short_desc="Full screen menuing system for Unix"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://joeyh.name/code/pdmenu/"
 distfiles="http://http.debian.net/debian/pool/main/p/pdmenu/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Rename/template b/srcpkgs/perl-File-Rename/template
index 7788bc9fa4a0..4d34a0c67888 100644
--- a/srcpkgs/perl-File-Rename/template
+++ b/srcpkgs/perl-File-Rename/template
@@ -8,7 +8,7 @@ hostmakedepends="perl-Module-Build"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Perl module to rename filenames"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://metacpan.org/release/File-Rename"
 license="Artistic-1.0-Perl"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/pilot-link/template b/srcpkgs/pilot-link/template
index 907ec9ba14d1..5b83232cef8c 100644
--- a/srcpkgs/pilot-link/template
+++ b/srcpkgs/pilot-link/template
@@ -11,7 +11,7 @@ makedepends="libbluetooth-devel libusb-devel libpng-devel popt-devel
  python-devel tcl-devel readline-devel"
 depends="tk"
 short_desc="Suite of tools to connect your Palm or PalmOS® handheld"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.pilot-link.org/"
 # Main site is unreachable (no address record).
diff --git a/srcpkgs/pipenightdreams/template b/srcpkgs/pipenightdreams/template
index cb41b4933ea9..baf9b32f95d1 100644
--- a/srcpkgs/pipenightdreams/template
+++ b/srcpkgs/pipenightdreams/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Just another pipe trip"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/pipenightdreams"
 distfiles="${homepage}/packages/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index bc82ff5514d8..cf5b2fd81cfa 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 85519461d8a3..9ae68a2d60f8 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 8988affd2836..aafd8d860e0e 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -16,7 +16,7 @@ makedepends="enca-devel faad2-devel ffmpeg-devel jack-devel libarchive-devel
 # At least one QSql plugin should be available
 depends="qt5-plugin-sqlite"
 short_desc="Audio player based on the Qt5 libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/qoauth-qt5/template b/srcpkgs/qoauth-qt5/template
index d5f3f388e1e4..ce38576e0e4c 100644
--- a/srcpkgs/qoauth-qt5/template
+++ b/srcpkgs/qoauth-qt5/template
@@ -8,7 +8,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qca-qt5-devel"
 short_desc="Support with OAuth-powered network services"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.1"
 homepage="http://github.com/ayoy/qoauth"
 distfiles="https://github.com/ayoy/qoauth/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qqwing/template b/srcpkgs/qqwing/template
index 4e1c0f18e981..ed31e0276bff 100644
--- a/srcpkgs/qqwing/template
+++ b/srcpkgs/qqwing/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Sudoku generating and solving library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://qqwing.com/"
 distfiles="https://github.com/stephenostermiller/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index d181e9cdb529..0fd2ba01175f 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=3
 wrksrc="QR-Code-generator-${version}"
 short_desc="QR Code generator library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.nayuki.io/page/qr-code-generator-library"
 distfiles="https://github.com/nayuki/QR-Code-generator/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 98991b16fa39..9e6b476ff2ea 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
 depends="qt5-core>=5.15.2<5.15.3"
 short_desc="Additional style plugins for Qt5"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 330a6bcd16e4..02e8a514a1bd 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libglib-devel libcanberra-devel
  clutter-gtk-devel librsvg-devel libmanette-devel"
 short_desc="GNOME classic falling-block game (Tetris)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template
index 5987e41d3a80..b5e7c2b331d2 100644
--- a/srcpkgs/quake4/template
+++ b/srcpkgs/quake4/template
@@ -5,7 +5,7 @@ revision=3
 hostmakedepends="tar"
 depends="SDL libXext virtual?libudev zlib desktop-file-utils"
 short_desc="Quake 4 for Linux"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom: propietary"
 homepage="http://www.quake4game.com/"
 distfiles="http://sources.voidlinux.de/${pkgname}-${version}/quake4-linux-${version}.x86.run"
diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template
index 35eebf0b515d..06bdbfb072d1 100644
--- a/srcpkgs/qupzilla/template
+++ b/srcpkgs/qupzilla/template
@@ -6,6 +6,6 @@ revision=3
 build_style=meta
 depends="falkon>=${version}_${revision}"
 short_desc="Lightweight multiplatform browser (transitional dummy package)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"
 homepage="https://qupzilla.com/"
diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index d640ab5a3f5e..5283f8ea32ee 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_EXAMPLES=false"
 hostmakedepends="pkg-config"
 makedepends="qt5-devel opus-devel speex-devel libtheora-devel libvpx-devel"
 short_desc="Cross-platform C++ XMPP client and server library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 473813e47672..1985dee75923 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_net-devel"
 short_desc="Arcade style game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/seabios/template b/srcpkgs/seabios/template
index 29b373acffbe..bec0dcd92f2d 100644
--- a/srcpkgs/seabios/template
+++ b/srcpkgs/seabios/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="python3"
 archs="i686* x86_64*"
 short_desc="OSS implementation of a 16-bit x86 BIOS"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.seabios.org/"
 distfiles="https://www.seabios.org/downloads/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/silly/template b/srcpkgs/silly/template
index e06b0a84af4a..432cefdabc93 100644
--- a/srcpkgs/silly/template
+++ b/srcpkgs/silly/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="Simple image loading library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://sourceforge.net/projects/crayzedsgui/"
 distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz"
diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template
index eb9e1437efed..4a15e27896ef 100644
--- a/srcpkgs/simgear/template
+++ b/srcpkgs/simgear/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel
  libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel"
 short_desc="Simulation engine for FlightGear - static libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index c73220201a7a..073c70fa750d 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 hostmakedepends="bison"
 short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/spin2cpp/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index b6b6d821b334..42b5918ced65 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
 short_desc="Synthesis ToolKit in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://ccrma.stanford.edu/software/stk/"
 distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template
index 33da8d8365ad..afb8dd466c3e 100644
--- a/srcpkgs/swell-foop/template
+++ b/srcpkgs/swell-foop/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel"
 short_desc="GNOME puzzle game where you remove similar objects"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Swell%20Foop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 8de48032c975..bfd640177d27 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -7,7 +7,7 @@ hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
  desktop-file-utils itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index de0278d7afa0..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -10,7 +10,7 @@ make_build_args="all training"
 hostmakedepends="automake libtool pkg-config leptonica libxslt asciidoc"
 makedepends="cairo-devel pango-devel leptonica-devel $(vopt_if openmp libgomp-devel) icu-devel"
 short_desc="Tesseract Open Source OCR engine"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/tesseract-ocr/tesseract"
 distfiles="
diff --git a/srcpkgs/tinyclipboard/template b/srcpkgs/tinyclipboard/template
index 2dfaf68d94a4..22e90096b3e9 100644
--- a/srcpkgs/tinyclipboard/template
+++ b/srcpkgs/tinyclipboard/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 short_desc="Cross-platform C library for accessing the clipboard"
 makedepends="libXt-devel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://redmine.guelker.eu/projects/tinyclipboard"
 distfiles="https://files.guelker.eu/projects/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/toluapp/template b/srcpkgs/toluapp/template
index fb54ad329fc2..d07536814e9b 100644
--- a/srcpkgs/toluapp/template
+++ b/srcpkgs/toluapp/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua51-devel"
 short_desc="Tool to integrate C and C++ code with Lua5.1"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/LuaDist/toluapp"
 distfiles="https://github.com/LuaDist/toluapp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index f0f42c46c4c7..b76bb0123c88 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -10,7 +10,7 @@ archs="i686 x86_64"
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
 short_desc="A middlebox detection tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 nocross=yes
 homepage="http://www.tracebox.org/"
diff --git a/srcpkgs/tslib/template b/srcpkgs/tslib/template
index 8652a2a46e44..60ab1807d8b3 100644
--- a/srcpkgs/tslib/template
+++ b/srcpkgs/tslib/template
@@ -4,7 +4,7 @@ version=1.22
 revision=1
 build_style=cmake
 short_desc="Touchscreen access library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/kergoth/tslib"
 distfiles="https://github.com/kergoth/tslib/releases/download/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ttyqr/template b/srcpkgs/ttyqr/template
index 1601d553b97b..2840d1fb54e2 100644
--- a/srcpkgs/ttyqr/template
+++ b/srcpkgs/ttyqr/template
@@ -7,7 +7,7 @@ wrksrc=${pkgname}-${_githash}
 build_style=gnu-makefile
 makedepends="qrencode-devel"
 short_desc="Draw QR codes straight into the terminal"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/oskar456/ttyqr/"
 distfiles="https://github.com/oskar456/ttyqr/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/twaindsm/template b/srcpkgs/twaindsm/template
index 300c1694b8f8..5bdf8194d67f 100644
--- a/srcpkgs/twaindsm/template
+++ b/srcpkgs/twaindsm/template
@@ -8,7 +8,7 @@ build_wrksrc="TWAIN_DSM/src"
 build_style=cmake
 hostmakedepends="doxygen unzip"
 short_desc="TWAIN data source manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.twain.org/"
 distfiles="https://github.com/twain/twain-dsm/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ucpp/template b/srcpkgs/ucpp/template
index 582e607c4d3d..247c933ffac5 100644
--- a/srcpkgs/ucpp/template
+++ b/srcpkgs/ucpp/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 build_style=gnu-makefile
 nopie=yes
 short_desc="Embeddable, quck, light C preprocessor compliant to C99"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://code.google.com/archive/p/ucpp/"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-${version}.tar.bz2"
diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template
index 18fd73176198..3b36cf0d6db1 100644
--- a/srcpkgs/ufoai/template
+++ b/srcpkgs/ufoai/template
@@ -11,7 +11,7 @@ makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel
  gtkglext-devel gtksourceview2-devel"
 depends="ca-certificates"
 short_desc="UFO Alien Invasion"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ufoai.org/"
 distfiles="
diff --git a/srcpkgs/vgmplay/template b/srcpkgs/vgmplay/template
index 43a844368c9d..2792e0855a20 100644
--- a/srcpkgs/vgmplay/template
+++ b/srcpkgs/vgmplay/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 build_wrksrc="VGMPlay"
 makedepends="libao-devel zlib-devel"
 short_desc="VGM file player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/vgmrips/vgmplay/"
 distfiles="https://github.com/vgmrips/vgmplay/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index 5930a164616c..bcea8c8b6058 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel gtk+3-devel
  libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel libSM-devel"
 depends="libsoup>=2.46 desktop-file-utils"
 short_desc="VNC server for the GNOME desktop"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.gnome.org/action/show/Projects/Vino"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 77ea433a1073..01de503942c0 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -9,7 +9,7 @@ configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
 makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
 distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
diff --git a/srcpkgs/widelands-maps/template b/srcpkgs/widelands-maps/template
index 47c9c488f5ca..fd6b807ec660 100644
--- a/srcpkgs/widelands-maps/template
+++ b/srcpkgs/widelands-maps/template
@@ -3,7 +3,7 @@ pkgname=widelands-maps
 version=1.1
 revision=4
 short_desc="Additional maps for Widelands v18"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://wl.widelands.org/maps/"
 distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index cfa2c10993e0..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -11,7 +11,7 @@ makedepends="boost-devel icu-devel minizip-devel gettext-devel
  glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
  SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Real-time strategy game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.widelands.org/"
 distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index e7f6a9152235..c70f0003e8a3 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 0ead8c752643..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
 depends="lib${pkgname}>=${version}_${revision}"
 short_desc="Validating XML parser written in portable C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://xerces.apache.org/xerces-c/"
 distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 33f0f89ce2cb..39edac52798d 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1"
 short_desc="Xorg Matrox Graphics Adapter video driver"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xfce4-plugins/template b/srcpkgs/xfce4-plugins/template
index e5128eed4607..0ac4ae75ea9d 100644
--- a/srcpkgs/xfce4-plugins/template
+++ b/srcpkgs/xfce4-plugins/template
@@ -26,7 +26,7 @@ depends="
 	xfce4-whiskermenu-plugin
 	xfce4-xkb-plugin"
 short_desc="Plugins for the Xfce4 Desktop Environment"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/"
 replaces="xfce4-kbdleds-plugin>=0
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index df74e185d580..f936c70dff18 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
 makedepends="gtk+3-devel"
 depends="libglvnd"
 short_desc="GTK2 application for Numerical Electromagnetics Code generation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
 distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 65c6fd79288f..863e61dd58c7 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -6,7 +6,7 @@ hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
diff --git a/srcpkgs/ytnef/template b/srcpkgs/ytnef/template
index 7e040d9a5832..512d587fddfe 100644
--- a/srcpkgs/ytnef/template
+++ b/srcpkgs/ytnef/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Yerase's TNEF Stream Reader"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Yeraze/ytnef"
 distfiles="https://github.com/Yeraze/ytnef/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 68549362754c..f0195a7c73ae 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template
index 04e72410af82..844d14016a06 100644
--- a/srcpkgs/zynaddsubfx/template
+++ b/srcpkgs/zynaddsubfx/template
@@ -9,7 +9,7 @@ hostmakedepends="doxygen fltk pkg-config"
 makedepends="fltk-devel fftw-devel liblo-devel libXpm-devel mxml-devel
  jack-devel portaudio-devel"
 short_desc="Open Source software synthesizer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zynaddsubfx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"

From 608ec2df68d9bdcd58ec40abc0bbfefe991844fd Mon Sep 17 00:00:00 2001
From: Enno Boland <g@s01.de>
Date: Wed, 31 Mar 2021 19:31:27 +0200
Subject: [PATCH 159/386] srcpkgs: ericonr takes over packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/aisleriot/template   | 2 +-
 srcpkgs/freerouting/template | 2 +-
 srcpkgs/json-c++/template    | 2 +-
 srcpkgs/qbittorrent/template | 2 +-
 srcpkgs/wildmidi/template    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index e31845d7fe61..5bd4e53483f8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 123cb60b2daf..e8c5b371e436 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 87d68e676c8d..97f0457e88ee 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 9ae68a2d60f8..924225cf4f84 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index c70f0003e8a3..634ad5bc88a5 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"

From 6d9c6fe399e0338a9602a37068fecf8e84964ec7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:54:29 +0200
Subject: [PATCH 160/386] iselect: adopt.

---
 srcpkgs/iselect/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 37318b036b7e..3260d4836612 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -1,13 +1,13 @@
 # Template file for 'iselect'
 pkgname=iselect
 version=1.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=5b75fc5fa5407e85fa77d2a299c4e7628c0213116809f343946e62a8a25c5b1b

From d00566456451da84405a10bf0dd1e9a44bd74bb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:56:42 +0200
Subject: [PATCH 161/386] mmv: adopt.

---
 srcpkgs/mmv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f9f3fb3aa00e..1afd253685d5 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"

From fcb4326450ed673e4bea015b6a10d82f74f625ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:57:29 +0200
Subject: [PATCH 162/386] zbar: adopt.

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index f0195a7c73ae..f64d87fcfe81 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"

From 75bc6903cee046b0a4408e33cf9a62922111960a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:48 +0200
Subject: [PATCH 163/386] attica: update to 5.81.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index ca0d296e38fc..d6476b39fc7b 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3aa866b01dfcdc1f59012c57f6bd49eabfe5d920560f766116a6633b394ce71
+checksum=19430eca0ebae80902008e0ae65669ee29d06a3cda56bddff222d709fc502f74
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0b6119a52d4fb74f56ac91fbbac79898a3b858cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:51 +0200
Subject: [PATCH 164/386] baloo5: update to 5.81.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index df597bd43719..26d14d8e9e47 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=ecdf0ba93c0cfd85b16aed3817db490c85f70c8c1d13e076b461d41ffa00b571
+checksum=5ed2c781ce7603f1e798fe645427814a3f2116f3793a047a82d707560512d556
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From 88d6fbbc95baccc7245f8a8fc63c4bad57bc80f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:54 +0200
Subject: [PATCH 165/386] bluez-qt5: update to 5.81.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index e36590f3861d..371ebfad9eb3 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=96e77f80ffd3d6b7854370f5e45773d74cbc685255612e923d703e00ed33e521
+checksum=e34a03e6daccff1f6ea5cd28e3f61a3b209c25e81aa87bb409c608bcbe1d9e8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From e9baa493338111d7384d900d341b108a0899ea21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:57 +0200
Subject: [PATCH 166/386] breeze-icons: update to 5.81.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 67cac82b411b..ef78750196c5 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a266908cafc0233e5da6f11747bbbef94b7d9503e2c1f59c68013ae11f1d6584
+checksum=ef88f0e41407900b0570030dab8e6debb97e749c8aa1841d7572821c959784a0
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From acfc9c6390f716339b686d81c8c5d80b9e440d16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:00 +0200
Subject: [PATCH 167/386] extra-cmake-modules: update to 5.81.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index c5be5f2dcfe0..ee48dfec369a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2370fd80f685533d0b96efa6fa443ceea68e0ceba4e8a9d7c151d297b1c96f64
+checksum=5f57e4b843069b6098d955051bb2913558d1623fead3f3b95b7017d7e1e35b83
 python_version=3
 
 post_install() {

From 2885d7f70845c79ecf7daa4a18da771b2d9ed262 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:03 +0200
Subject: [PATCH 168/386] frameworkintegration: update to 5.81.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 990d6af065dd..f4f81f4c5e64 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=871d961ccdcc420ac63686bb522febabe9dcdd6199880f9e2e59433239b9696a
+checksum=3b98768f0bbb6f3c427a74504eae7d3045d3af20946d3bc6f5937f6206a88b6d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 52089f7ca252a1bd39b89ed7e3dcb9b5feb32d78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:06 +0200
Subject: [PATCH 169/386] kactivities5-stats: update to 5.81.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index b21320db44da..cc2d624bef76 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=d689b7e9b75debce048fa4cbbc95924a4bfb2dd0c32b5874413b2871d18573f0
+checksum=02e7ee69fe46da03ad1a95dbac4fef9494e2c8a9ce7a94722d190710bc796920
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 72caed9d4bf9c8a25df18eded28e8950c553159d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:08 +0200
Subject: [PATCH 170/386] kactivities5: update to 5.81.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 30dc528f50b9..f77844763271 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1a90e14a16e2efa5ae460843f05e88ca412c7fe078fc077dee8a1cf022303592
+checksum=78ff3d4b6448582bf3578076d05a04ad5f91a664c7fd0d91162c3a8fd875536b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 8d544b0963bc244712f1b3d67b561a9843bc7f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:11 +0200
Subject: [PATCH 171/386] kapidox: update to 5.81.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 469a5db977d3..7ba30aca033e 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7f14805350c5f0c1326b3ad2b2923c71f3d41e6782249723013a0f3ef18b1204
+checksum=42ff9da76a192cd9a9c6007ca75cb184703c888c4c141a8ac39655d982bf04f3
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From affe13c5d4e49fbd31d9d2752947454bc38d116c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:13 +0200
Subject: [PATCH 172/386] karchive: update to 5.81.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index a17ab9a49087..308a915506c7 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce08d578c5311c475f43df5c40480ddafbb065c41599c535b5e98d2175c5df5
+checksum=1e263a3e25417eca68fe59bc8b958ab4f5cf4da16d4c47d36a5230fa3cf596ba
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2ee6d32fc8ac116a4c51d25861c1b2a7751e7b35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:16 +0200
Subject: [PATCH 173/386] kauth: update to 5.81.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0d3dc13ef134..7c0ca8ee8956 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26f07de07729abf90500749d7746eee63398fe96ca00d32f845084b4c89896dd
+checksum=7e0062efe1838766890dee709b3ecd6767ced49173f9c149ac2ef492261fc9bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From a9bc183d0ea29dd284cef5e84d33ecfb7120a6c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:18 +0200
Subject: [PATCH 174/386] kbookmarks: update to 5.81.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 8a210ef4882e..630566cbff4f 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5880324922e465b66384acbdd4f6db2f26c533c2e27c1cb121ec0e0e37f53586
+checksum=f5bfcc85d58b35439252f6e3d086a4deb359c4a0649fdfa57a96960cf7a00f2f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 308e8e6762cb908a7b9aaa488b7edd50de61af06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:20 +0200
Subject: [PATCH 175/386] kcalendarcore: update to 5.81.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index f035b281cab5..53f758f35022 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5cdec2ed0b2bee08e5d5395aee1dc13626e2287a235cd9f1506ad5f96d012fd
+checksum=bac828b363a7b406b3ccdc98854fb3ebd4d06b503c298dc676215a4612451529
 replaces="kcalcore>=0"
 
 do_check() {

From 231d80a3ab173f23e7cf8a549aafea1c00cd5349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:23 +0200
Subject: [PATCH 176/386] kcmutils: update to 5.81.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5ce249e9c530..c604ad54cd9e 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c93b1a865bcfe0aa85b8ac59b7b0f214aa5fdc5767ee51657657360a8739e59
+checksum=b25ecd2e52ef1c133cbd3be87375ab4aebc7dcff5aeb2511282f68f4ede60297
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 44f028185216d9783c31c011ff88a99808529392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:25 +0200
Subject: [PATCH 177/386] kcodecs: update to 5.81.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 7af5b11cc0a4..a0f33bcd16ad 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f56744c9647096b8d403d212081afffa890b4f386eeb33d1be497cee560881a
+checksum=4392afb4a3e1a4c8d6e645e7161d2651f5b83ca8620156cf942bfc95c33ce564
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 8c4f284bed35a7ed635589386d12a0b690da2e8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 178/386] kcompletion: update to 5.81.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 93726f742347..32b42dca9989 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef4251a6196255e8b131c8dd0793b3e79f7de05449cf2d466131d30078686093
+checksum=f7ac17e57203bfee92b252b92cd31174a624620119a461fad04087a7c8337c95
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 34592da03ee67a974650f92869e6daef20027682 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 179/386] plasma-wayland-protocols: update to 1.2.1.

---
 srcpkgs/plasma-wayland-protocols/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 2d9d9300ccc0..594de71c5d31 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,15 +1,16 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.1.1
+version=1.2.1
 revision=1
+wrksrc="$pkgname-v$version"
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
 short_desc="Plasma Specific Protocols for Wayland"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
-distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5493383d115171c3435ea9a21b3966860632a844544ffac8f54890436a51d38
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-v${version}.tar.xz"
+checksum=287b90903f9a7f394c75e75cb187426862eaf64a92f1be7e2ef68e99fd8cbaaa
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 270c6e9d1165096888cb4fb40bf2cd18e271b40b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:29 +0200
Subject: [PATCH 180/386] kconfig: update to 5.81.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 4989a4e27919..10adbf9e4ac9 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2600449e6a6ccf2d9f61ba33abff7ed29c1f975b33bfe6cc7e6d8993dddd19b2
+checksum=1ddf9e384140ce72bbd555eb36a76d0db1a256391429b02b51769c08ebf0ae8f
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From 45a1193ddbeb9f71e9ca1479a211af9d2294456a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:32 +0200
Subject: [PATCH 181/386] kconfigwidgets: update to 5.81.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 903e3a62b90e..507d63b8cea3 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=479eef40642498adf5f1fd2ef5004be105e1d06d7981136d9f560b18121d2c8b
+checksum=e075022ba2db52df92fd21736e92ff73138eddc782fb765938ff84c68cedfdec
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From e1558648376edf666b7362175e8bee000af55d00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:34 +0200
Subject: [PATCH 182/386] kcontacts: update to 5.81.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 15e5ab7025e8..101d4de6ff13 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d387b909e2e52b35efef6201502cb71705a76fdcd4fda8e7e535e5c66cbf7b9c
+checksum=e431fb04a17bf86cca0e5e618b0b7170c10815c3fdb891af80df48dcdfd59397
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4014888f8f3eea2bd9746a4298429689eeb4ee2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:37 +0200
Subject: [PATCH 183/386] kcoreaddons: update to 5.81.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 2ce3d9ad82d6..f95d9bb971f3 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ece39271678b3ff3753116bce8bb6747ebadbad522782d0f8051d8bab66f3ed1
+checksum=ac0ccb1687dd159ad2c6926f766498a2450906266139ec924d7794839a8cfedb
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From bb6c6b538b017df54e0d46aeaaf97f6d2a1e98a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:39 +0200
Subject: [PATCH 184/386] kcrash: update to 5.81.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index fda993f37ff3..821f84871bcb 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=64a3e918fbf41c1bc1b708b526d2c928ac7d4c10579a10416e15788553444bb0
+checksum=0139f2630a5ad8fb8abb0fd504b1ba6d3e6f3b6a352acfaa1156f750e94a3cc7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 9e64cf8550f0522477678d9750c4b5eefeb5b12f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:42 +0200
Subject: [PATCH 185/386] kdav: update to 5.81.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index ebb12d097b7f..e0b0ab47922d 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01044dfe0427eecc4cbe60357b4ef570c9081fa9b45cd846a9d8797cef254bb1
+checksum=0b00fdf902b1aeadfefe9caa11fad52a26f18e4c0e747c1bf8d9a1758b8bb133
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4b33b72ec08e3ddd9c73e67706d2cae9214dcb9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:44 +0200
Subject: [PATCH 186/386] kdbusaddons: update to 5.81.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index b971fc4ee296..d11b15648e6f 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14924319878951a4fbbf7b93da22428274449bec2bdd93b092e89f11bfbc1bf0
+checksum=49f5234327a8975e19602e4c7cc01f5ffbbd6e14d02fbcaefa2674d4eeab793d
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From b934a047744183fefd95f9cdbf43515fc88ee0a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:47 +0200
Subject: [PATCH 187/386] kdeclarative: update to 5.81.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index e3ce275660f9..cade4690ccda 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf55ba32475f3459e32f38ca49ced27373427b679ab5dd98e03f02e6f1359d3d
+checksum=7dcce4ec31bc41958f0c2ca53134821f921b1d5ebbab75f6d41bf07b0555d368
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From 64c00247302f60e31a987d9ce6a7e328bbd4abd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:50 +0200
Subject: [PATCH 188/386] kded: update to 5.81.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 4e5de9dca164..96238e9cb50d 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4157de65d9acc6620da42f777c6fc56ef4ecb846cd3b80db5e349b35dc1f736a
+checksum=513b1bec662741e25d43c21b64b3213e0fd6f840b9f282e9024536c558960084
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 9a98fe3666175ea78d2b696106fdebb7a0e84791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:54 +0200
Subject: [PATCH 189/386] kdelibs4support: update to 5.81.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index c2f03082f828..a2eee7c2ea69 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e258cac33f5dc85438034e20dbe29627cddad3b595527fc524681d110a6d05
+checksum=6614d9d8c004e15359ef0f5ac37419d706beb0bcc53fafecc3536a340d8963b2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From d8425084cfd5894624f7a0ff9e1cadff9f864f2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:56 +0200
Subject: [PATCH 190/386] kdesignerplugin: update to 5.81.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index dede1b28e06a..67ca33028162 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e36e8ba3b0c9d84de2359c89ee332f96e6cbf7cfebd4bc81b9d9e3c7c3e9b4
+checksum=4307cd1c3bb681ec1c28cb4399ef952a1966273963f6511eb0b6256d9791f6e5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 6a61eab156c18c6e9d77cb42456c4369094602b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:58 +0200
Subject: [PATCH 191/386] kdesu: update to 5.81.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 880d03c5829f..cd7ba48a09e7 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d45ea674551bb344fc897f9d1c5500291008cd099ce71205a9949cb386a4acf
+checksum=de0b4ab6a0606e0fc00181c4295a533928ab2be9fbe24ca726abdecd6618c59c
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From d36fd20f58b65d104f9525e8e9534ae0c7b79318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:00 +0200
Subject: [PATCH 192/386] kdewebkit: update to 5.81.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8ee2cda8486c..9a53524aef56 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=917defa04b29407e8b89daedb16e1fe5dfdc1b116811b5b9815faa2a78ea0687
+checksum=e78862349a786e0969cc6934e4b99845a6bd7c66de1d94ef5893978c78bd4d08
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 0e6564e9169c10aa616d1769090d9f22b29e9363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:04 +0200
Subject: [PATCH 193/386] kdnssd: update to 5.81.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 05023a6c8c15..d6db1cfcc5e2 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afa10cdb6cc97413a045e5f152d74e1ef2f0a7bab057460a3d20ab62e098144d
+checksum=316e53ad258a08acff886a11a1f0fac69433a5df90b8c6ad5dea945c0a4f84c2
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 0acb342cf40ddd063dadf2f7d21a16b82ba739ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:06 +0200
Subject: [PATCH 194/386] kdoctools: update to 5.81.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index ae30fe179053..bb4bd7af6da2 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1eae100e641206ef01275d3577c286f73523a516854fe146121ceb302fc0ac83
+checksum=398677ebea07c6db652a735689c5e2fdb4a6fd42757dec850f90c0433af60a87
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From df63f63afeed147ee404b1dcd876ee19bc3b7044 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:09 +0200
Subject: [PATCH 195/386] kemoticons: update to 5.81.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 4891df41eca4..5ffc0924ff5b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b8affb1cd506fcc7a7582b37fac2da68fc45e8f34df32e4f5335fb79af9e549
+checksum=ec8d17115c03c7a3071b4088478819c091cb3bb237a4fa7277e9e1ea9849fb9f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 6f05852913c838e924070279f40e3363c422f5e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:12 +0200
Subject: [PATCH 196/386] kfilemetadata5: update to 5.81.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index e2b164f2598d..4ab6591f3fdf 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=75cd4d04eced8a30eb372157f0d0cfbe5dd89737b5083aceb0b650afa7f7600a
+checksum=318cd48f2b2400b2e453a4c3f373e84dc1296c972c0b0e01c5c39429353d6a31
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1b200f0b79a1168e459a310d276607b97060fe53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:14 +0200
Subject: [PATCH 197/386] kglobalaccel: update to 5.81.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 5c2f9fb11db0..cd5e507fd35e 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36f0abd93064b1b213c87d2e182649bc2f43cdd78ab45a4d686d9fb2c609bd04
+checksum=ff33288695af403eaf3ddd2a142e3ea7d3451c897e6d49a3746b6977aba3b829
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From 882571ae77801570ce661f3ca286e0ccc290a83b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:16 +0200
Subject: [PATCH 198/386] kguiaddons: update to 5.81.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index c0eaa7c4e821..d4f647b38ef8 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e563f232261b3a60c8d6c88ec5b08b6267c3c513d76d368386386192cefd4dc5
+checksum=e3f7ee35ae89f82af13e4da75d3cfa163597062c5a7b3207ed2841a9d7ca3ee1
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From a1fa939541a3c70e829126921cc52a5a6c6558aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:19 +0200
Subject: [PATCH 199/386] kholidays: update to 5.81.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 79c384e36276..6c992b4efeec 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9c0f0b652c9169b39148120d57c26d0c73c82111e8844d51e5c39fc3d7d5ce
+checksum=4ce8cee4f8e02f2f9940ef8036c5ff6a7d1f03928fee4e78bad2505f2fff98dd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 650a7587fb70eeb5f4da4eb60d0acb1f7aaff371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:22 +0200
Subject: [PATCH 200/386] khtml: update to 5.81.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index b0e488536b0f..893a3e756027 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=bd1a267013cdfcb7825d38c1ce3ad47fc52545163e1a201fa69ee2c4b50e12a1
+checksum=f7d920d5c701e38d121e912662e3eded80dcc78f7c776e3b8f303941791fe229
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 3cfcad94409380b21ab5cbd9729bd88baeff4f08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:24 +0200
Subject: [PATCH 201/386] ki18n: update to 5.81.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 7e0212bb5969..9ecaa3135080 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=883a79d7e6c795148c0fe76f44a6f9ffe34282f827e580e70937fe8259967a7a
+checksum=2c4bd5b4882890430369fa7fa47a754015e6db93277bfc8a4f1e20fe7d6ba78a
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From de77e3bab0d685fddc20ce5907e10daf70ba584c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:28 +0200
Subject: [PATCH 202/386] kiconthemes: update to 5.81.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..dee9c22d2ce0 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+checksum=fc47bee6468b91603fee0dcc166ca3dc3cea999eb4719b07fb269d17db3f6a14
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 70d106eb7f03ad11718a11deacdec35a4f7e4aed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:30 +0200
Subject: [PATCH 203/386] kidletime: update to 5.81.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index b76122decfdb..4e6d7dd5a63b 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03b9878dd11d98798a2801af3797be2c7a700bf637c7df1a5947238ae78552fa
+checksum=1be7af2cf8d1fa2a67dbec0ac4733e36f7b2d98250a5c63db3a8c323666af98b
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 80d8e51c6c863302b04689f5ee242f8fc3a30454 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:33 +0200
Subject: [PATCH 204/386] kimageformats: update to 5.81.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 45fefe561fce..d9111329cd7a 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d65641583e44c25de8ac98d7ef5925f08074a9ccf33ef7e7b504dd3a7347160
+checksum=a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e

From a6473b83f451c13453ddf0a506b251c3d0967aca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:35 +0200
Subject: [PATCH 205/386] kinit: update to 5.81.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 65e8f99795e6..267c2ab19397 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df256d1cb082de845a6f8d18b372694130c83e9b800033f0987d1929fcdc3480
+checksum=927c09cb6476143e1091e24f91cf26751ad57bab87b8cf3640d1ab4ab6c768f3
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ad4412a6341bfc3fce409201e9154e1086cbfa51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:39 +0200
Subject: [PATCH 206/386] kio: update to 5.81.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 1b44de646fb5..b10c5e967ed1 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.80.1
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d971ce61a022f9e4d2d6be9c66917be271d0fb212795a151150e208e64cd5a28
+checksum=c62bae911978d163bbb86648344708d5b963823244941de0904c2a7800ecc07e
 
 CXXFLAGS+=" -fpermissive"
 

From 2279f52ee17b990d7572539baf907b3c8fd5a55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:42 +0200
Subject: [PATCH 207/386] kirigami2: update to 5.81.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 5a5e863bf4e5..9ddac83378a0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=228ef76fa69f1d7f89f8f04be93a0528507352f3c97f6d98b6259207b2679272
+checksum=d6572cfd6effc60429fb780fd0436fa484c42a01b30c9cf0319c68b15c158cad
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From c380e31c1b2594d063ce37fda1b9691ac1495732 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:45 +0200
Subject: [PATCH 208/386] kitemmodels: update to 5.81.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index d2e73871cfb6..63225c0e3e6a 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93948d1b2a29a9d6e8c436af5bc0ac5fc59e0d7a5632a5c611ee31a648856faf
+checksum=8093617c30c99d54562f6facdeb8929a7132841f13c63c4a0ad1a78e002e476f
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 4a9c19924314135353c20a554e7f44c8d2a64576 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:47 +0200
Subject: [PATCH 209/386] kitemviews: update to 5.81.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 5085d0fe2d7e..339df951acc9 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9702a531799c5f99810beaa64efeb0683d5ae8d4c4933de6906d205f192635c9
+checksum=368039bdd5a925565a8731a2cd405a51cf8c2ef19f7397a0c234d6558e61b05a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 7965b261fc3048f8309d90659af87b28dd939209 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:50 +0200
Subject: [PATCH 210/386] kjobwidgets: update to 5.81.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index b01352491e61..a2c8ed477044 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=572a9b6475a5e07ad6b8b7e138533a84d0aaeac72bd86143814d076965b2c5fb
+checksum=eac2a1bf5a7b6f8f549096a0574ded82dc2378059d5c9ea290754954908a88be
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 7473985329e0bedc59eadda02d920305b20ff5eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:52 +0200
Subject: [PATCH 211/386] kjs: update to 5.81.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c30af1f45cc4..f66858ca04e7 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=3286281f3ebbfc78336cff73a012106f836f39b7ef1ed32e6040c4ffb98f72ec
+checksum=b9a71c912448bf24083a6b7fb509ec5fa904b2838e02ae38d49dda702bbd2a11
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 92fed271e852c72a14c663e561cb02e8d6d88ca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:55 +0200
Subject: [PATCH 212/386] kjsembed: update to 5.81.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 3b801522cdf5..7b1be930ea07 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a7446a5439c5be9ec24715c506d287379398d65ce4836937480afaa367ba6f20
+checksum=090f2e3e25f35566a4afd6a9369a867124c22a590b02d53e9d0fb49a99fb6a7e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 815661b1d75610f740462f6b75e0a0ab6d460541 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:57 +0200
Subject: [PATCH 213/386] kmediaplayer: update to 5.81.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 0b89840cf495..0c602c326d65 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=cb94adfd7fa6b24742cd958dd765fd82957bfb1cf242658cbd451e2ffdcf2628
+checksum=0b1de1e94f1ac3c0eefb976f19ec9b6d13f6a0e4c92bb14c2408f379c289327c
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 2cb5317ded0e5dd4b8aef3bf2431cf9aae0fe47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:00 +0200
Subject: [PATCH 214/386] knewstuff: update to 5.81.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 141ab05ccc84..5085b07c9b4c 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe874f7fe944fe877c0d443349102ceacb268c45dc1f666ec42ff219024735d
+checksum=d3ae54a7a8dc4293c305eb440dfe524d4ef394e2ebcb050a0abadb66ad41ae72
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From d11642618807ba8ec54e60aeada7476e12dd92ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:02 +0200
Subject: [PATCH 215/386] knotifications: update to 5.81.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 03560e2b6ca5..4e9c06b5064f 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a7c9914f868818d57e2062e27c258a94c4041e702a0b55dafe3e1067730d6e9
+checksum=1ad7f7d0e17724085c2e55f9fda34828add9ff74966aae0bc95aa1041accce13
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 3bd4e2739d33c487a69a4d24b28c7961b6abed70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:05 +0200
Subject: [PATCH 216/386] knotifyconfig: update to 5.81.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index e49a03147110..247f563d8e6f 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fd474e9d231330b141e1443f46036d5b6d884c0edb9e55f1a4e762e1e2bd812c
+checksum=7a49ef1a4416b17082cc9d56e7ee01264999289cdcf06bd2d1a08717ce492d77
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 37339feb1fc76f236e96d332017f1d9cc95d80f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:07 +0200
Subject: [PATCH 217/386] kpackage: update to 5.81.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 220b30965a1f..04493841d112 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90894de985c5acfd7a393787a295d50778a9562ad5d88725e06dc71195e79880
+checksum=6a164389b07a6f00176a985cf9f88f9d5880514ba57084281a94722d7cd93ee4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 828a991fd9ab5eba4f7c846135b87dbf910c4bec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:11 +0200
Subject: [PATCH 218/386] kparts: update to 5.81.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index f20b15bc97a4..95e4fa3ff477 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9eb464f171f219e264237bb200767c8b3c70f10004521fad2d90af93bf926eba
+checksum=eb90dee4329fbc97acf3349fe344a86b2ef742dece35edf80e44ca5b1eaf58be
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From b75a62831a35441a59b8f7f35cbc865ef724d96e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:14 +0200
Subject: [PATCH 219/386] kpeople: update to 5.81.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index e729f8ec2aed..1ac63125702c 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c99f07f1acaf6ffbf94a9c2be7564f724ec41604986a74fc4400ea82296c9b2
+checksum=305a2b5c43c8964fa88e4326ef9d8a487b56af04c858a4f18e991b9218d2c3a8
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From 25882c511797297754f5f45abf8635f1c112e82b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:16 +0200
Subject: [PATCH 220/386] kplotting: update to 5.81.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index f414dfcf867c..66c507e07650 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc5ba241d24d063d6973303eaed1dce9d2d9aba630b83c74e4e73d06fe63711c
+checksum=cbfb7207c45b2e2afae2f78f9f924ec269515d07ac93bf52ca556287ab4266e8
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 495bc033f6576e055f6b2232bbab9f2d9ff33bcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:18 +0200
Subject: [PATCH 221/386] kpty: update to 5.81.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 03bb3537ca7e..0fb2a200b176 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93d0d266db0bb249ccb4f329acc0dbfb52289e697e0a6bfbb8c98e687fb6748d
+checksum=f34a4f614e2ce5346363fc303d2cc2291fee52c9c359115e9f1a8638e7954351
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 22695e1200cb39fa51f613027c0cccd4973c5bbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:21 +0200
Subject: [PATCH 222/386] kquickcharts: update to 5.81.0.

---
 srcpkgs/kquickcharts/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 14338d2dbc1e..729e06b14982 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,16 +1,17 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel"
+checkdepends="glslang which"
 short_desc="QtQuick plugin providing high-performance charts"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=962ed2b22ccac8ae900827bc41581efea546b833495869d3e3ccc5795314c74d
+checksum=5f864d1132a11fdbd9f77419a98277cfd4b761a227f171d08d8dd2c82fa88203
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From cb8df7243a1be30272e636647ff9665667d27ab2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:24 +0200
Subject: [PATCH 223/386] kross: update to 5.81.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 81bf735b1388..e5661c59b4cb 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=29ce280dd59d2019387bbe29326dbfd2a0a66b7f73ea15149b3ee5d561c5be19
+checksum=a3522ed07a9a33013639cb36484b4745af5025ef65efb10e291bc663b3f25a0a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5cea9a43729c8c90c9f0f219a9f60f65c14949c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:26 +0200
Subject: [PATCH 224/386] krunner: update to 5.81.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 87bf57cd88d1..c3a1da63a692 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fcf6e404e4a56877751ea5dc60c7a4b58cfb8986ae4262cc77bdeeca01342d2e
+checksum=45bdc312c28c995a9a29e8212b1299bd89350ea4cab706d343bf42813826c0f9
 
 krunner-devel_package() {
 	short_desc+=" - development"

From c2d1bd7078094743cd55b6c304e135cff902901e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:29 +0200
Subject: [PATCH 225/386] kservice: update to 5.81.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 10466421046c..3fb47fc5023b 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e868f2a337e8e05a8cc596f8baaa9c310cbc51e73b3dfd4f81ed3c3ca8217319
+checksum=ec6b054942417cb8c6adb2f502c43a268f96d85d9e4477e1292b1dd4d0e766cd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From a41d8fc1a6f17fd7f09e4736d56edecdddfe377e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:31 +0200
Subject: [PATCH 226/386] ksolid: update to 5.81.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 48791cc8f7ed..c35ba77d9442 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a54fdcbcd4d7f8cc3d10808199b2c09a249e0059e70b23053c8d79a3e8997f08
+checksum=8199ec5bc1443a54632c7c3999ec574b40bb0c35b9fb0ef6c54f5e0d9b242470
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 06dd11141ace3b79fe95f158dc7bee8e1d4cfdf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:35 +0200
Subject: [PATCH 227/386] ktexteditor: update to 5.81.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 5b2dac88d17f..549fe251f632 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a081655a8ea67818be740363a9310b2972ca34659e61f879ebf0df85421d073c
+checksum=75e774bff6eb0134818dc93fc505639ce3aa8316dce45255b28892f9f19c7ddd
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From 7e483ea0d9f73f0e573f1a2184dbafaf1180daf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:37 +0200
Subject: [PATCH 228/386] ktextwidgets: update to 5.81.0.

---
 srcpkgs/ktextwidgets/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 432795e79b4a..32cfc30c64d7 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,18 +1,19 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  qt5-tools gettext python3"
-makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel"
+makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel
+ qt5-speech-devel"
 short_desc="KDE Text editing widgets"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e8d5dd11835b8245ad1cb0ce0de74d40a9e8310df93b3c64998b2e3eb29d2289
+checksum=c8274b737da6535af2bfe3b51733baaea5f1bb348ea7854658b84f58bb10b612
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From bd2c72edebf29798985f6f7324b62fc5722109f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:40 +0200
Subject: [PATCH 229/386] kunitconversion: update to 5.81.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 7f4ba3ab48c9..b96701a522b0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94ac5214e4a990ae569f2e4bdc66d2d6f46b60a225ee9f90274c4b39e69093c1
+checksum=3efc21a1438875429620a725e4bb4b8dbe40e2aa5f041f5d6557e2e1461131bd
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 08a9b9600abd60837daa161e5c461dedb0e859ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:43 +0200
Subject: [PATCH 230/386] kwallet: update to 5.81.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 913f8c6ce984..83de3e0b794e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e1c9ed012735fdea4000086c2646e2ad99f15127b399420885a7b7de25ec99df
+checksum=ff8596bf771c55bbfdc9da2736eeb4f86a63a92bc82132ce4a6b1d82809005c4
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 18eb93200b8ea8dfccf11298735c1d91624a5737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:46 +0200
Subject: [PATCH 231/386] kwayland: update to 5.81.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index ada4563d3aef..868c326c9abb 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=403bf7c8426febfda37f26addb90a31b5978d9fc76d25a22472570e8273b79ab
+checksum=de22cad7b4ddaebbfc9a9b60cbd7e41c5de5a943c89b46b077a12b651cfb43a8
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 7151853d8cf8240a58b414e5060cfda184148b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:50 +0200
Subject: [PATCH 232/386] kwidgetsaddons: update to 5.81.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 0a005d1c4acb..3685b6bc3480 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a9bfd5653d4c45d55bac5d0a28c8caec8d504bce2ee192d68ecf3ce10a0fcf1
+checksum=2f25e926edcab19e3ff3529b71ca409b2bb100c35f5a6e3aff663e1854a3b642
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From b7bebe6fd90a928a0762e2dc8ddc51425cc0b6c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:52 +0200
Subject: [PATCH 233/386] kwindowsystem: update to 5.81.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 7b24aaa197ac..00ae6c415e12 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b352b67752d17d67a4eb120c224b5b165af3b09f9ac5e1224909d278042704b2
+checksum=4753aaabb073b41dd8be79d454756ec616cc386f3be16f5503a77c84e12eaa86
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 466898419659e11505cefa2d447a3b9d47caabca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:56 +0200
Subject: [PATCH 234/386] kxmlgui: update to 5.81.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 8d43d3f35ed3..d70a1b72485b 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81af735b097231e4343e9d695dc4b8d80e64ab49a32d34c4bce1cd17c566b79d
+checksum=db232450286e515491059ee5017287ba4b610be0a194179e882af4c03e4e6ad0
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 326da8bbcac0564fd2d9f1163f25ee3826d7dcc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:59 +0200
Subject: [PATCH 235/386] kxmlrpcclient: update to 5.81.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 02b6a0686c99..b0246c669822 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04122dcbd5fdc4ebaa3091750fc51e29a5dcb0dc7acbaf72ce6fe92ea7115a29
+checksum=0f8e5a6b331e306292763fa573e832a62e1c0ace911051b687d617dbb8e10397
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 0911a84b58d55ca4eefa23b68ea2c3859754d2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:01 +0200
Subject: [PATCH 236/386] modemmanager-qt5: update to 5.81.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b312445f1851..9740a3b11394 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=865aa36da3bca6657dc130313bfcc6030b6b2bac2993c0dfa3b02321448724e0
+checksum=060e62f99bf7786619a9b182f6f5a2191f173b2ad3a764e05152e39e80243907
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9a7189ba5c39b0bdecbdb7e0d8d8e605b0deb82f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:03 +0200
Subject: [PATCH 237/386] networkmanager-qt5: update to 5.81.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index b42fdefafb3f..a9f42dd23cc6 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e0da7c2fcdc3f9d1250c8f0757267c5110ac3e38f70c26a736df9e4aacb0bff1
+checksum=2e8a6c1a78119d5ccd21e92a99ed55d3f866dccc2622e8c908c76793899246c8
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From 82a58f24f3c66d5aa9410680da64d0cdbe451f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:12 +0200
Subject: [PATCH 238/386] oxygen-icons5: update to 5.81.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index ea26c4941341..a8d582b00d88 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=35a97955b45f35244ca0d30433f3ad1e9348e9083f91e42d0e0198b6474ab84e
+checksum=1f9a1b5fb676eeb71b9180d6a4703dc25ce872019231464ca0cd709759dc0fe8
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From e8f2b76ad2d1e9d78be4ac4fa6367260b2ca8976 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:15 +0200
Subject: [PATCH 239/386] plasma-framework: update to 5.81.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 3ff14239726d..57747992d4e6 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3af0f7628c6404c63ac871ffe7540fc6d12be2bf988503724c6bb00505893d9
+checksum=67037be91694620fa713a1cf3972f42f3ca798217c8c5915dcdaa9298651663c
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From b013ad298aacd44dd88052ec6e806a82323a30a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:18 +0200
Subject: [PATCH 240/386] prison: update to 5.81.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 24d408da29bc..6b3c6fa22283 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=ff2eed5feff0a57e22eef9dcbf324435894ba76892a06e7087f1380438df9ab9
+checksum=cf13d796b99e2aa9f5d591f9936782ee891ff8b0cf487a5eca242f941ee439d7
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 31a9a5766f2921842b40016da20329126a337c02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:20 +0200
Subject: [PATCH 241/386] purpose: update to 5.81.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 7beaa7a64fc4..1a4bc42f37e5 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad507573aa42e0223771679c92887ff309fa33e68f20820c98b5702617acfd80
+checksum=4e0a04c90c6e2d97a08158e80f486163d30abf156035214ed5e665e37be70805
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 69bb1d686ea65b2bae0f75963439c1c46b15c6a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:22 +0200
Subject: [PATCH 242/386] qqc2-desktop-style: update to 5.81.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 3317bdb40389..59ba3ccb4f2c 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efb3ed865996100921b8dd7340d4f7dd1bc477381ce401cf36b8ed548d3dbe91
+checksum=a5cb7fcc4fa7bc87a66a2ef3df7d67568faf685e21b01d7db3dc99e80d9384a9
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 786f6cdf49f8e64a1291a4d038016fefa84c083f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:25 +0200
Subject: [PATCH 243/386] sonnet: update to 5.81.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index cff67af11bc7..661cd1376b02 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b0d2eda96edc461319d48b05171457a3648217805f3481b893b8be65bc6b788e
+checksum=4a7c4e4d3da2df50004565c76ce0334697b941bd011be08fed7d91f96c37364e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From e940ca396f46f312da41c93a083f97e28e15eaba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:27 +0200
Subject: [PATCH 244/386] syndication: update to 5.81.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index a31e5480c573..5b565eeb0daa 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=10f2273b87e89f2ea73baee66a8b1cc993acea96d74be29f99ac631145f742c8
+checksum=76be770e0ba18fb6494b4de5b6928553b56495ac736d32c80818d0899a85adbb
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 48aadd06d84368b2afa8b175eaa995172b3ab28d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:31 +0200
Subject: [PATCH 245/386] syntax-highlighting: update to 5.81.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index ed80a704ff27..b7a15a589afa 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91f458918613703468512b00690a02b617eb47be4df5ed7d9e3f1311b3b31218
+checksum=cb170316f447c7b0097a72b9690b17b1fb87cb578528c5c5e3bb4de411ff4a5d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 0d930ca196881a4f60883e290a1253d54b9fe816 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:34 +0200
Subject: [PATCH 246/386] threadweaver: update to 5.81.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 2f7b6e7a09aa..0534f4d03712 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a3722a5c927eeaf8e9841fdcb513018ea41f384f41c25a1542cc52bdd43b5c8
+checksum=4e25142bf75212660d2b1c20293ff5d04aa8c6b51aef8e935231d7bde227bf0e
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 4679e372f749db3a11b9ea5d49f601e3da94d21e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 20:35:32 +0200
Subject: [PATCH 247/386] sispmctl: update to 4.9.

---
 srcpkgs/sispmctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sispmctl/template b/srcpkgs/sispmctl/template
index e3aef58360f5..c8a6753b03b0 100644
--- a/srcpkgs/sispmctl/template
+++ b/srcpkgs/sispmctl/template
@@ -1,6 +1,6 @@
 # Template file for 'sispmctl'
 pkgname=sispmctl
-version=4.8
+version=4.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://sispmctl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0f8391f7e95cbf1fb96a68686a1dcf1e16747b050ae1b8ff90653c99976068db
+checksum=6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647
 system_groups="sispmctl"
 
 post_install() {

From 7e6531f3760f6061c523cb913849a497e2e41db8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:13:51 +0200
Subject: [PATCH 248/386] strip-nondeterminism: update to 1.11.0.

---
 srcpkgs/strip-nondeterminism/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template
index 6cd5094e8b0f..3d02ed349f83 100644
--- a/srcpkgs/strip-nondeterminism/template
+++ b/srcpkgs/strip-nondeterminism/template
@@ -1,6 +1,6 @@
 # Template file for 'strip-nondeterminism'
 pkgname=strip-nondeterminism
-version=1.9.0
+version=1.11.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl-Archive-Zip perl-Sub-Override"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
 distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
-checksum=467a1f11830e82c41b2f40c5f7a7f1c5579391a18170652ece581d83ba6d1242
+checksum=0774647828fe348a4f957a32fc0d8ab1749c013347bd6544147d059c208700d6
 
 post_install() {
 	# remove Debhelper add-on

From 30c1a13dfc2bc6f0b913a88f57eae4f9e569a880 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@mabragor.physics.uu.se>
Date: Fri, 9 Apr 2021 17:58:40 +0200
Subject: [PATCH 249/386] thunderbird: update to 78.9.1.

Closes: #30112 [via git-merge-pr]
---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 78531a033701..001956952220 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.9.0
+version=78.9.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=8015a7f78b1644578f398b5ab670637c70890ab2bade35ba321d47d099ed3ac0
+checksum=6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d
 
 lib32disabled=yes
 

From 39c5359b63e177c1e21536063015803da9acca95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 16:21:23 -0300
Subject: [PATCH 250/386] thunderbird-i18n: update to 78.9.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index e00b1cb59577..bd4fc0c38f89 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.9.0
+version=78.9.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="63771cab0ed5fda4da901b6b6ecd2c88d87ddb9db019e0d5150e6a7111be6be3
- efd68277617e53282fbcb54bb63274d55c13211eac7340e6ba481d6b083604d3
- 9d9d566a8a71ce6bcbf7fdc4adf0d4e621bfcfffb792d582e86dbbd393f4eb4c
- 3edf831839f3d3a5ae3edce5578748cc6a73a2b3a4f413a10c32e7808eb4a242
- e2968ec5aabddb23249acb95a56f3f4c5068a3024f4a987cfcec29f46d1295df
- a254d31294909e4007811c8ab1f21f2814863765da71cf999332a04910b8cc1c
- 82a842c5d4fe297b1adfbed74fc8a63831b9507a4b1098db26f31a59d268dad0
- 295f9730a9c9baa4325b346c163cd0ee1e19bf589cba595c151f7a31311a43c0
- cb21492b06e6d4d7dc10f93e1a9c673297af7f010cbc6807245a776795d56486
- ed1ce2005e42d5796596863344913506f7423ca31bb0640167964b7c36395585
- 873a10bfc3f54c3240830eae45310f137823c0b83fb83dfc2098cc3a89acd802
- e87877e537c49be2ce03cf8a41d6776e8f861f1f9d90bc862224df18acfc52bb
- 8cdc746af4060d0260b1cf1c7efbd102ed4eabf57bdfb0e62167a39a08b526e1
- 39363f37a388c7b82df2d3cf868803682d8d6612a2b6557f1fdb9ae1466d4be7
- 48f51bb821ffe212f15e2065a6b3377cc33704f0a07a18b3deaa79d839bef89d
- 11c649466c6df3d2a62402711be46d74a02b668ec95de83f87e0675692b4633f
- 5e4cf5c5b24cfabe35971dec28e47c337749a3d382b43f7a2558deadc73a7864
- 1c49fe83d149bb1bbe4adce5f43bbf9e6bff1c6a917f898c029ce3fd46a7174c
- e3ed198a41f20b4168b23e29324eec3e5149de2cc454675f1a30d68baaa301c3
- b3fece3eaaccedcf28702e747307e11988eec65ef0cadccc0a01ea4092df8ac0
- fd8f4cec4dba5ba66f905c0428f01c9be9a2a20f8d3996828f54da6fff331028
- b6031ea780b0bf7b4f8c96aaf38d96dc686f0e2f3d58a4ec9918ad282f554c94
- e7f28b4333ea0d2db01af8496192769af1cf2666585bb463dc39d1ba1fd73345
- 2a80d9ca7e942c5eca5cbd8b82ca47901728f52c2de074fb9751c6c37fcb37ec
- 3dc2a28bf96db0d678457f86e46d7a24e683c38579c0b480f59c1eb9ef2573b9
- ff9079655352bdf9f5c1bb2e4e1596d1755300eda7e1670dbdb796a99223158a
- 71a1964cc36893f217a3c778a3fa17810843f830245241af27054ac1222a14e5
- 70b03fb570e5f3443d3be9970dd65fdd4fcd81bff4cd8319f028c0a4c8c166a8
- 78833bae90336e27256341a6b7ff1e53be9dd65447a1e71528ead725504f330d
- ac5276b4a13bb4a07c92160a6c3cbdb3d76bd622c49163eb0e82f84153259b5b
- c1f8180207e1abdbeaed39337c9bbf5d421eb2c85146646a888bd02e5de8c27e
- 800eb1b98bbb145a5bf22fa8a1e7cb8581371939655d61dcd642bba0de8250ba
- f39cb90898efc60c0f977f3f9abb94db5c1e18e2ace7317240784dc6382bccb3
- 496275439573f95f41a28d08d434ccea79e86d40f2a8321b47b98daa6dd3036c
- cc3229a2a009fcec836b2056ccbf50cdd4aba461517dad9a04331ae5f95a3a2f
- d20ff56ab68e53e3e4365247b564f6efc3c0cbdb301ff79ff9a80aae986c3b7d
- 998224c8e059afc068b004c0dd3887f85974a0af56b9d0ef0dad945e049db2b0
- fcf47de621e9f75729b1fa8c6c5f2135eb5b6d3dd78c8fae01acd6ad857604d2
- c7b3a6b7c0a59620e65877b3eaef92b2b2b7b4f5e7e152b7297db3d24a00b399
- 7fae97e71b183f55292feed9847a8d6141671d703e2af8aa1d64a71db2c377ec
- c8aa778fcf6c1c32b0038affadf540145cee44c9e59d278b55c4d1966ffa27d3
- 14065be7c50080586aa36cd43814dcabfae8572065cc3ec1ee8344e77cae9ce1
- af30877d15eecc65804528bbd4fde0897663526f4d25fdef00b4eaf84be8e580
- 925ea6a7f6e1a1fb17004cc7ab16bc0a307995541b9741264497f51d8a60679e
- 419b8bd06dd680b27b0843f5cf6af1b787695dc608136970a417ebafe3ae325a
- 7d9eb5e2bea78aa75dc345598e62ccc3efb37e64f21ec19a92920f826f486651
- e8e88cfad04351f1cc3ecb811011bcd964d6b4ef3a6a30f98e0f8a1363c93d37
- 1ca503db23e2648c4ebb40b117c652e0d8b95e4d07e843031db0530e00bfdd6f
- d02b1a07f824644e336a9e92a8342d58f5eaec903fa6b80067f3c650659b3756
- 7caf4222472434b465fca8f072a29503d38c143c1900b71bac7a607a7120d359
- 9a7c0186b6fca8e48ec3d0c94f0bfaeb73f378178799adc04c79164b300e575a
- abac946215c6a41be19aeacd271a2a2b2040bda87906d7e1c6f76ea19a35e507
- 5a3827a6f662950fdb001863ce8367d02fabe1c40d44500ee6b7019874119d23
- d1a1f0a30e037d65b667e1cff856a195c4747af4bf599f1bc8211347259fedf6
- dcdd87071b6b16eafb39d752119f60105d461dae5155c9b33d00bc3037a98dbe"
+checksum="4fddad63b7354b9c6db09428d3f73918d931768f61ae126596ae982ee00a6f9e
+ ea442b319837fec3bdbb80cec6ec5095f621caca9c784de70bdcf8a2523802cc
+ d93560c0870d361eb7088749dd88e1e61d1c68a4770b487863bb9dfaa770663a
+ c568bda96a224835ed6ac5acb0bfa997fa847fe2ef3d5cba8c3258b682d80019
+ e1494a55fa057d58d1709275a79a56af4e018f6210159bf8fa1baa1189b5f0e8
+ a6243eaaa5e06ee93f242c9d79959cee2b295fc281014de904d8baef2c27c33a
+ 5e2f59621dc5af683ad7f436c6838c304a6746956874b6089c25b4831c43a28c
+ 3855cac8661f5dc6567729418bbd398a1492b53f71e1af4ce5fa3984ad42a447
+ 3f9d4b4d23272213b3ff9640cf053c788907dcd0f780c03439871eb7529d48a7
+ 7e334735fce0bf7263b667a1d2003edab972aa83d2f8e7765865f01da28fd6c5
+ 138ab3c032ed48178c399c610648f7a5c44579bdee4021446771ac5cab86233f
+ 6493bde23c0909295c1e2d784ba317f294bccd3ee9c3a679e999c59bc02899c3
+ d579a1c125082e2dbe78cadbe0d0d45f12fff3ade7fe73ce652d23cc3a906dbf
+ 9cc6ee40f58a1f6bb8ca8cf965d4a558a2e3f8583474f06e61e34d00c5e342a7
+ 3ada2f1216617809b0b3330e6d825a65e2901f9a86bdfc0f41ca0545bd088e8a
+ 9bd2900ec74cb8dd306df64032546255d603c9b324de9d057c840b42ee1706bf
+ 1b11b00f7fc9380e414af33f62519ca0da1068ad446815768e169b2494e9c8da
+ 68f91ed0da57e4783240c500d2a19d3b5de3b21a5dab61444d29926698ebe793
+ c1033137d32c87848cdf85d4bf8acef36dfd85b20172f3bc448bed64280f9c6d
+ 02062b3925df8c511f313cb973f55c41e1585e6891c95013288d1715d24ddfb7
+ a1365e409d1eb897317a39c7513c1703e9fb93595d43a0820a579246381f1605
+ d1622c075e451eb5b87cd1ba9a19c0abc36289d99b33dfbba6831df7ce8b3f53
+ 3ac54f983ae0adc2395266f6a882ac56583c87ab3f6345257c507835c0c2d14e
+ a86188f64f643175d760bac1086b6b466a4a657425596cd79987a76ced42a8d9
+ 8a0cf55c1eff56cb5c6be354b96bab973c9852dcdb39446822c0eaa555b950ef
+ 4ef44068b021fd2cc15cae58bbda4ca86fdf3f7b2ffe23a86d32cc8040baead3
+ 09e81eeaa1ade640d7788fc927c58a0a290fbbc84f250e2e954e594c8466b528
+ dd5791a364b2bd4901d337ce58f4cacc4640acbb116d98d3b38ab13ac57bfc64
+ 3073815242bab5a49d6c9412f963e7fbeff8da1bc5f7655c66a093ee0459dff6
+ 5eb605f125548132cb9e9ce65682708423f31bbaf84767d87d0c743014004563
+ c85771a299ed01b440d8354d7220cd52f489d0a7364c5e1769b178adc27c3d17
+ adec1b156f39f7f2e0aa6a7fe19179734629077a7e7d387332bdc2cbd205ff40
+ b50c4d047c042194c8150b005f5e3666bebcc22fe7785ca79874ef3ef1a66380
+ 6ccecfd19cf3ba6dff2da883812bff303f0b36001d9ae2663dc3d2cb1fd87363
+ 15b2744ebbcb1c6b2a935821f3059265e79678fbe34a07dba2525c7a3a160eb6
+ 44069899ee9f6bf19e4b4a9cd63d83fc61c7f8a882f24ff34d5161a7dbf8ae15
+ 24986599a7cc2cf57d703b6d72c2aecad593dc08b2e0184770e7a283e6f7f7b8
+ 104f713c761beb7de9d7b5aa8be3dfad23f6864a5ba0f67823cd61e31979ef57
+ a4d5d0cc0cdad59f66b6d9f76029059e29619c838f022e322046ac210f963ac9
+ 4b1e917f5839f21a73e5595021c07573238df0212a984a5467adfd637cecd64c
+ f173d29ec6506635a622818b7e5cf2a11b0b7b5041daf555a930410f9d5cbf4b
+ 5699f89669e88c82a656488b4ad27d18beccb4db1a2293602d1e742628315a67
+ 842afff69b6fcac17e603a706b1d196aa3b4b875ff5139feb4c39324c2244563
+ de2499e4e04ed0bff3bc852f5e85baf60e4223d68cd323375d3df87f2828801d
+ 47cc9d5e63e5e99c066dba6bd1db440fbf6cd2885ed51af9bc021df892e4cdea
+ 89341fe50ff3655e7c41b8ad3097aaa745752f048739ac21652304e805491ac1
+ fc23e405ed4711c4b184f238e58b2be8705664e22038201deba674efd2315a15
+ b52ee3d71341f581b2b1b82764fb6d98e59bcd5d5564ad069b0f6220c82385dd
+ 29473e268c7a89302844a313f0ba1be93580a3aa5c11e78469fc1e73c6b14e50
+ 3d1f7950d66db5d01b3972ccee16056bc495866eff57b8c7434121d5fb54fa14
+ 59027c47928ccd0a326194dedffcffa2cdc1d73e9ee8d9e7edb87f9e0d8a4d37
+ cba44dee27d9a1bccbd23fcf46080e3e2e2d8b2e2bacd5414542f10824d9a969
+ de72ecf79efdd8fd97ead8af456fe02eee3725f5b41d96cb0c5c1e391a32e65a
+ 6f9d8cb48f7845874219c6cef403d037d52ef4f465e62494e53d43e640b7e1f7
+ 8c5e997ca6a2a512d3ad72424d0bed9d6e9adddacaed5151ad153529e28cb67e"

From 8b03f3e3e810c1df94c585a0650688c5b11c87ec Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 10 Apr 2021 17:39:54 +0300
Subject: [PATCH 251/386] ttyd: update to 1.6.3.

---
 .../patches/cmake-find-libwebsockets.patch    | 27 -------------------
 srcpkgs/ttyd/template                         |  6 ++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch

diff --git a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch b/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
deleted file mode 100644
index 68816ea49a1c..000000000000
--- a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# make it link against libwebsockets dynamically
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -53,21 +53,9 @@
- 
- find_package(OpenSSL REQUIRED)
- find_package(ZLIB REQUIRED)
--find_package(Libwebsockets 1.7.0 QUIET)
--
--if(NOT Libwebsockets_FOUND) # for libwebsockets-dev on ubuntu 16.04
--    find_path(LIBWEBSOCKETS_INCLUDE_DIR NAMES libwebsockets.h)
--    find_library(LIBWEBSOCKETS_LIBRARY NAMES websockets)
--    find_package_handle_standard_args(Libwebsockets REQUIRED_VARS LIBWEBSOCKETS_LIBRARY LIBWEBSOCKETS_INCLUDE_DIR)
--    mark_as_advanced(LIBWEBSOCKETS_INCLUDE_DIR LIBWEBSOCKETS_LIBRARY)
--    if(Libwebsockets_FOUND)
--        SET(LIBWEBSOCKETS_INCLUDE_DIRS "${LIBWEBSOCKETS_INCLUDE_DIR}")
--        SET(LIBWEBSOCKETS_LIBRARIES "${LIBWEBSOCKETS_LIBRARY}")
--    endif()
--endif()
- 
- set(INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIRS} ${JSON-C_INCLUDE_DIRS} ${LIBUV_INCLUDE_DIRS})
--set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
-+set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} websockets ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
- 
- if(WIN32)
-     list(APPEND LINK_LIBS shell32)
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index e870724e1d9a..0ed4cb21f952 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,7 +1,7 @@
 # Template file for 'ttyd'
 pkgname=ttyd
-version=1.6.0
-revision=5
+version=1.6.3
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config xxd"
 makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://tsl0922.github.io/ttyd/"
 distfiles="https://github.com/tsl0922/ttyd/archive/${version}.tar.gz"
-checksum=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83
+checksum=1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2e203c141f002b9f4153ad48f91ca25478a42bc4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:20:46 +0200
Subject: [PATCH 252/386] hiawatha: update to 10.12.

---
 srcpkgs/hiawatha/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 7e50522c999b..04377f40b88b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,6 +1,6 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
-version=10.11
+version=10.12
 revision=1
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://hiawatha-webserver.org"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.gz"
-checksum=79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727
+checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
 make_dirs="/var/log/hiawatha 0755 root root"
 

From 05829a1ae8348376b786f064b440edfca691caa0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:58:02 +0200
Subject: [PATCH 253/386] bwm-ng: update to 0.6.3.

---
 srcpkgs/bwm-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bwm-ng/template b/srcpkgs/bwm-ng/template
index fef308bd29b9..da2098cbec20 100644
--- a/srcpkgs/bwm-ng/template
+++ b/srcpkgs/bwm-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'bwm-ng'
 pkgname=bwm-ng
-version=0.6.2
+version=0.6.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gropp.org/?id=projects&sub=bwm-ng"
 distfiles="https://github.com/vgropp/bwm-ng/archive/v${version}.tar.gz"
-checksum=906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70
+checksum=c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46
 
 CFLAGS="-fgnu89-inline"
 

From 8d58f0bfc94435e8b2521773258409cabf059f68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:59:38 +0200
Subject: [PATCH 254/386] btrbk: update to 0.31.2.

---
 srcpkgs/btrbk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 2f2d73653a8f..cad73834ecbc 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,6 +1,6 @@
 # Template file for 'btrbk'
 pkgname=btrbk
-version=0.31.1
+version=0.31.2
 revision=1
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://digint.ch/btrbk"
 changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
-checksum=ab461532d8f60ec794bddc8942e5a5bb055d92eb638b7b141134fe7d972b7a7a
+checksum=ec18ec934e7b6d22e3cf210b9d78c2961167aac0d31419de7b88d03fc8bfec80
 conf_files="/etc/btrbk/*"
 
 post_install() {

From 034292eabf2a51c62acfccbe3db4988d5d72e9dd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 10 Apr 2021 19:39:39 -0500
Subject: [PATCH 255/386] spotify: update to 1.1.56.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index e6e75f86daa6..c978264e78b7 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.55
+version=1.1.56
 revision=1
-_ver="${version}.498.gf9a83c60_amd64"
+_ver="${version}.595.g2d2da0de_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
 create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
-checksum=78b2364f050c2b02b05784710344e70109b288a2661f92de29f373a718e2ac24
+checksum=eee658c4ce875e4646c2ef617832a9dbb3ad09ba1b7aeeaaf3476b7b00b833d1
 _license_checksum=3c073aa5bd7ffaba3df5283cdd2d3b36a415bd824234693844548fc3e16027a5
 repository=nonfree
 restricted=yes

From 901b83c7bf19c266fe8bc097a7c1151e899e7f78 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 11 Apr 2021 08:59:41 +1000
Subject: [PATCH 256/386] kops: update to 1.20.0

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 08bff1e80434..11aedb91559b 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.19.1
+version=1.20.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 308760f889047cfa9cc90a135556b8797e5058b2 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:24:34 +0200
Subject: [PATCH 257/386] vale: update to 2.10.2.

---
 srcpkgs/vale/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 387c8af6ed4d..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,16 +1,17 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.6.7
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
+go_package="${go_import_path}/cmd/vale"
 go_ldflags=" -X main.version=${version}"
 short_desc="Natural language linter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=21a43c7122932d0914bd023ae412432aed3e0112473bf809b542dba3986ee4bd
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE

From 4a3cb6dcef1ca0fcae43ec2ee1e8479686c41f99 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 10 Apr 2021 22:17:33 +0200
Subject: [PATCH 258/386] pipe-viewer: update to 0.0.9.

---
 srcpkgs/pipe-viewer/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 32991f6806bc..0ef7f35c9db0 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,11 +1,10 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.0.7
+version=0.0.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
 hostmakedepends="perl-Module-Build"
-makedepends="perl"
 depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https perl-Term-ReadLine-Gnu
  perl-Unicode-LineBreak perl-JSON-XS"
 checkdepends="perl-Test-Pod"
@@ -15,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=5e1211ec963aa2a187bcb0983227c5667e6c580bfc9de93dcb582388cc1baf22
+checksum=598ec7c39be0a42900ed1f4c5c68c26a728dd09b774e9dd38a873aa2def76e27
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 294a5e51a99016cd9bae1ea1e0169f41b180788d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 10 Apr 2021 22:20:01 +0200
Subject: [PATCH 259/386] x42-plugins: update to 20210409.

---
 srcpkgs/x42-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 76c74f6f7a32..432739cded19 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210408
+version=20210409
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cdc1d958581556ba56a6984fb8c1c66144e4c7447c11417824239fb2fa787fe4
+checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 063cf8cac15ed7e79b06a9505633e5e061882a6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:05 +0200
Subject: [PATCH 260/386] glfw-wayland: update to 3.3.4.

---
 srcpkgs/glfw-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index ca283a9ddc7a..6f90d6bc7778 100644
--- a/srcpkgs/glfw-wayland/template
+++ b/srcpkgs/glfw-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'glfw-wayland'
 pkgname=glfw-wayland
-version=3.3.3
+version=3.3.4
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 882c847c39ac0185b24786df54ec6e67162ecd58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:09 +0200
Subject: [PATCH 261/386] glfw: update to 3.3.4.

---
 srcpkgs/glfw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index 9db52afc0e09..99feb63bca77 100644
--- a/srcpkgs/glfw/template
+++ b/srcpkgs/glfw/template
@@ -1,7 +1,7 @@
 # Template file for 'glfw'
 # update together with glfw-wayland
 pkgname=glfw
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 06f2a2e8696069472f72f32e0fa59926c8ad0135 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 10 Apr 2021 14:40:52 +0200
Subject: [PATCH 262/386] gnucash: update to 4.5

---
 srcpkgs/gnucash/patches/fixtest.patch | 17 -----------------
 srcpkgs/gnucash/template              |  6 +++---
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gnucash/patches/fixtest.patch

diff --git a/srcpkgs/gnucash/patches/fixtest.patch b/srcpkgs/gnucash/patches/fixtest.patch
deleted file mode 100644
index 4404d99a534b..000000000000
--- a/srcpkgs/gnucash/patches/fixtest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgnucash/engine/test/utest-Transaction.cpp
-+++ libgnucash/engine/test/utest-Transaction.cpp
-@@ -901,7 +901,6 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-    g_assert_cmpint (check->hits, ==, 10);
-    g_assert_cmpint (check2->hits, ==, 1);
-
--   g_free (check->msg);
-    g_free (check2->msg);
-    check2->msg = g_strdup_printf (
-                     "[xaccTransEqual] splits %s and %s differ", split_guid0, split_guid0);
-@@ -924,6 +923,7 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-        auto bal01 = gnc_numeric_to_string (split01->balance);
-        auto bal10 = gnc_numeric_to_string (split10->balance);
-        auto bal11 = gnc_numeric_to_string (split11->balance);
-+       g_free (check->msg);
-        check->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal10, bal00);
-        check3->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal11, bal01);
\ No newline at end of file
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 125b7100770d..fa8bd17d09ad 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.4
-revision=2
+version=4.5
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 #distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2"
-checksum=d91e0d126b461d71de1bc1b20d9cf142704353dec07d3e6599d138422759e67a
+checksum=bc1f48a8453488a2e9f6b83b68613aa55caebe4d2983460bdac7e084b46cffdc
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"

From 8adb38273d8046930e050bdab769424da65a5dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Apr 2021 16:31:51 -0300
Subject: [PATCH 263/386] intel-gmmlib: add comment about -march used in
 compiler flags.

Reported by sgn
Suggestion for "fix" by tornaria
Closes #29801
---
 srcpkgs/intel-gmmlib/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index de10b7059d95..ad6ba012fa90 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -5,6 +5,14 @@ revision=1
 archs="i686* x86_64*"
 wrksrc=gmmlib-intel-gmmlib-${version}
 build_style=cmake
+# We could add -DGMMLIB_ARCH=generic to make it use -march=generic
+# instead of their default of 'corei7', but it isn't necessary:
+# the baseline of CPUs supported by gmmlib all fit under 'corei7'.
+# They also add many '-msse*' flags, but they are all supported
+# as well. Since this library isn't a dependency for anything but
+# intel-media-driver, which is wholly optional and installed only on
+# systems with supported CPUs, it doesn't make sense to change the
+# compilers flag in use.
 configure_args="-Wno-dev"
 short_desc="Intel Graphics Memory Management Library"
 maintainer="Stefano Ragni <st3r4g@protonmail.com>"

From ca36c49c5e8349dd5b03fba2be68f80445a9aec5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 09:14:43 -0700
Subject: [PATCH 264/386] daemonize: fix license

---
 srcpkgs/daemonize/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template
index 70dd249d23df..05ec75cda058 100644
--- a/srcpkgs/daemonize/template
+++ b/srcpkgs/daemonize/template
@@ -1,16 +1,16 @@
 # Template file for 'daemonize'
 pkgname=daemonize
 version=1.7.8
-revision=1
+revision=2
+wrksrc="$pkgname-release-$version"
 build_style=gnu-configure
 make_install_args="INSTALL_SBIN=/usr/bin"
 short_desc="Run a program as a Unix daemon"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD, MIT, Public Domain"
+license="BSD-3-Clause, MIT, Public Domain"
 homepage="http://software.clapper.org/daemonize/daemonize.html"
 distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz"
 checksum=20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60
-wrksrc="$pkgname-release-$version"
 
 post_extract() {
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile.in

From 4d3b493adaa7886f5fc3119a16ee8bcff502e6de Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 10:30:36 -0700
Subject: [PATCH 265/386] darkice: fix license

---
 srcpkgs/darkice/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index b86b883060a8..b61c6d8c7f8a 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -1,7 +1,7 @@
 # Template file for 'darkice'
 pkgname=darkice
 version=1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-lame-prefix=${XBPS_CROSS_BASE}/usr
@@ -15,9 +15,9 @@ hostmakedepends="pkg-config"
 makedepends="lame-devel libogg-devel libvorbis-devel faac-devel
  alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel"
 conf_files="/etc/darkice.cfg"
-short_desc="A live audio streamer source client for icecast"
+short_desc="Live audio streamer source client for icecast"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.darkice.org"
 distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz"
 checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6

From 6931e0a794a0cdbcbb1146de8f3940f47752fce7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:18:46 -0700
Subject: [PATCH 266/386] dcfldd: fix license, use vsed

---
 srcpkgs/dcfldd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dcfldd/template b/srcpkgs/dcfldd/template
index 60df0c6b4017..6a935d979d76 100644
--- a/srcpkgs/dcfldd/template
+++ b/srcpkgs/dcfldd/template
@@ -1,16 +1,16 @@
 # Template file for 'dcfldd'
 pkgname=dcfldd
 version=1.3.4r1
-revision=2
+revision=3
 wrksrc="${pkgname}-${version/r/-}"
 build_style=gnu-configure
 short_desc="Fork of dd with hashing, status, wipe and verify"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dcfldd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version/r/-}.tar.gz"
 checksum=f5143a184da56fd5ac729d6d8cbcf9f5da8e1cf4604aa9fb97c59553b7e6d5f8
 
 post_extract() {
-	sed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
+	vsed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
 }

From 7c3bb0d01cda31935b154f5ba0894c171e62dbcb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:21:26 -0700
Subject: [PATCH 267/386] dfc: fix license

---
 srcpkgs/dfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template
index 8e29452f84a4..3b351375dcd0 100644
--- a/srcpkgs/dfc/template
+++ b/srcpkgs/dfc/template
@@ -1,13 +1,13 @@
 # Template file for 'dfc'
 pkgname=dfc
 version=3.1.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DXDG_CONFIG_DIR=/etc/xdg"
 hostmakedepends="gettext"
 short_desc="Display file system space usage using graphs and colors"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://projects.gw-computing.net/projects/dfc"
 distfiles="https://github.com/Rolinh/dfc/archive/v${version}.tar.gz"
 checksum=cea18fab1f053eddc359530816712edd1f497c556035a7c4d63ac87a4abc4b28

From ce8619860d6d6e17dfab3f6192601d9ce44fce1c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:22:43 -0700
Subject: [PATCH 268/386] dfu-programmer: fix license

---
 srcpkgs/dfu-programmer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dfu-programmer/template b/srcpkgs/dfu-programmer/template
index 7556fe631a10..d3fca448e6bf 100644
--- a/srcpkgs/dfu-programmer/template
+++ b/srcpkgs/dfu-programmer/template
@@ -1,17 +1,17 @@
 # Template file for 'dfu-programmer'
 pkgname=dfu-programmer
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="automake"
 makedepends="libusb-devel"
 short_desc="Device Firmware Upgrade class USB driver and flasher"
 maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dfu-programmer.github.io"
 distfiles="${SOURCEFORGE_SITE}/dfu-programmer/dfu-programmer/${version}/dfu-programmer-${version}.tar.gz"
 checksum=1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995
-configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 
 pre_configure() {
 	./bootstrap.sh

From f574f9926afe60320a34f410677507d709b00447 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 13:55:59 -0700
Subject: [PATCH 269/386] dgen-sdl: fix licenses

---
 srcpkgs/dgen-sdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index 52bc28e21688..d32ca6d23948 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,13 +1,13 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
 makedepends="SDL-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD, GPL-2, LGPL-2.1"
+license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://dgen.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/dgen/${pkgname}-${version}.tar.gz"
 checksum=99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e

From 3c9452f73d8fd237df02ba5c83f76bf50b9c0519 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:00:13 -0700
Subject: [PATCH 270/386] dhcp-helper: fix license

As there isn't a GPL v2.1 nor a GPL v4, I'm making the assumption that
GPL-2-only OR GPL-3-only is a wordy way of sauing GPL-2-or-later.
---
 srcpkgs/dhcp-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcp-helper/template b/srcpkgs/dhcp-helper/template
index bf5e2641e050..bf2672d010d3 100644
--- a/srcpkgs/dhcp-helper/template
+++ b/srcpkgs/dhcp-helper/template
@@ -1,14 +1,14 @@
 # Template file for 'dhcp-helper'
 pkgname=dhcp-helper
 version=1.2
-revision=1
+revision=2
 _srcver=1
 build_style=gnu-makefile
 make_build_args="version=$version"
 make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
 short_desc="Simple, straightforward DHCP relay agent"
 maintainer="fosslinux <fosslinux@aussies.space>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dhcp-helper/"
 distfiles="${DEBIAN_SITE}/main/d/dhcp-helper/dhcp-helper_${version}-${_srcver}.tar.gz"
 checksum=d11647e4af1f8b25fb854b6f444fec66910d7446d97de918eff5b8a284397e49

From 393b2ecfc0103c12a4483ca936403842023c2c52 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:10:59 -0700
Subject: [PATCH 271/386] dhcping: fix license

---
 srcpkgs/dhcping/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dhcping/template b/srcpkgs/dhcping/template
index 201c54bde415..e7fc06965a8c 100644
--- a/srcpkgs/dhcping/template
+++ b/srcpkgs/dhcping/template
@@ -1,11 +1,15 @@
 # Template file for 'dhcping'
 pkgname=dhcping
 version=1.2
-revision=2
+revision=3
 build_style=gnu-configure
+short_desc="Small tool to test availability of a dhcp-server"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/general.php"
-short_desc="A small tool letting you perform a dhcp-request to find out if a dhcp-server is still running"
 distfiles="http://www.mavetju.org/download/${pkgname}-${version}.tar.gz"
 checksum=32ef86959b0bdce4b33d4b2b216eee7148f7de7037ced81b2116210bc7d3646a
+
+post_install() {
+	vlicense LICENSE
+}

From b30ee5c25b45689f98f01ad6350d47e5c7ec0d63 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:16:50 -0700
Subject: [PATCH 272/386] diction: fix license

---
 srcpkgs/diction/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diction/template b/srcpkgs/diction/template
index 0a141dffb580..4beee8c9564a 100644
--- a/srcpkgs/diction/template
+++ b/srcpkgs/diction/template
@@ -1,11 +1,11 @@
 # Template file for 'diction'
 pkgname=diction
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Writing style checkers, diction and style"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/diction/diction.html"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6

From 1c65e2c49f146ddf3fcd3ffb6968da91f74815a1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:19:00 -0700
Subject: [PATCH 273/386] diff-pdf: fix license

---
 srcpkgs/diff-pdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 520c2c24e8ba..d58932a4a0df 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475

From 2555dfa2ab0827dcdf11c250fe7039e1d0696ecd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:44:59 -0700
Subject: [PATCH 274/386] dnstracer: fix license

---
 srcpkgs/dnstracer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnstracer/template b/srcpkgs/dnstracer/template
index f71827d3d792..eb5c5baa2321 100644
--- a/srcpkgs/dnstracer/template
+++ b/srcpkgs/dnstracer/template
@@ -1,13 +1,13 @@
 # Template file for 'dnstracer'
 pkgname=dnstracer
 version=1.10
-revision=1
+revision=2
 wrksrc="$pkgname"
 build_style=gnu-makefile
 hostmakedepends="perl"
 short_desc="Trace a chain of DNS servers to the source"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/dnstracer.php"
 distfiles="http://www.mavetju.org/download/dnstracer-${version}.tar.bz2"
 checksum=64cda0ed15ef598a38ec72a96a356e3d10b7f822fc75928115eae96a65ae2b21

From cba0a9842e9c500079f0f88473f7a56bdeafdd25 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:51:38 -0700
Subject: [PATCH 275/386] docker-gc: fix license

---
 srcpkgs/docker-gc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-gc/template b/srcpkgs/docker-gc/template
index 87d828eecf8d..d8e39ff15fc1 100644
--- a/srcpkgs/docker-gc/template
+++ b/srcpkgs/docker-gc/template
@@ -1,13 +1,13 @@
 # Template file for 'docker-gc'
 pkgname=docker-gc
 version=0.0.20170125
-revision=1
+revision=2
 _commit=f460c1d2d50b652e156ffe68489362bedc9278a5
 wrksrc="$pkgname-$_commit"
 depends="docker"
 short_desc="Docker garbage collection of containers and images"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="Apache-2.0"
 homepage="https://github.com/spotify/docker-gc"
 distfiles="$homepage/archive/$_commit.tar.gz"
 checksum=82ebc5eab842b41282c10e5cf1a82af521e4aa46e6d0fb9bddb2565cef5984a2

From 6f679a60dba7cbfd8677916ce4db8eb0d72f4d96 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:56:56 -0700
Subject: [PATCH 276/386] dssi: fix license

---
 srcpkgs/dssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index fac019b9f57b..0a53d93ea421 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,7 +1,7 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
@@ -9,7 +9,7 @@ makedepends="
  ladspa-sdk libSM-devel libX11-devel"
 short_desc="API for audio processing plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e

From cacaf1953b3ad69bec7ff40e1a36c7040c5ac853 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:58:04 -0700
Subject: [PATCH 277/386] dtach: fix license

---
 srcpkgs/dtach/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index f1a0fe3fd865..09fdd2505cdb 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -1,12 +1,12 @@
 # Template file for 'dtach'
 pkgname=dtach
 version=0.9
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Tiny program that emulates the detach feature of GNU screen"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://dtach.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=32e9fd6923c553c443fab4ec9c1f95d83fa47b771e6e1dafb018c567291492f3
 

From 9015a7309953c10f8dcdfb8f479c3d81989e02c2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:59:24 -0700
Subject: [PATCH 278/386] dumpet: fix license

---
 srcpkgs/dumpet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template
index bb6a7713afe6..35204d8aa5e2 100644
--- a/srcpkgs/dumpet/template
+++ b/srcpkgs/dumpet/template
@@ -1,13 +1,13 @@
 # Template file for 'dumpet'
 pkgname=dumpet
 version=2.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="popt-devel libxml2-devel"
 short_desc="Tool to dump and debug bootable CD-like images"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/dumpet"
 distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2"
 checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3

From fedf4b6e9c487dfe883654d86f10cedb90bfb32f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 15:27:59 -0700
Subject: [PATCH 279/386] dvd+rw-tools: fix license and description

Closes: #29837 [via git-merge-pr]
---
 srcpkgs/dvd+rw-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dvd+rw-tools/template b/srcpkgs/dvd+rw-tools/template
index 5388e15692c9..b3c996b8fc2f 100644
--- a/srcpkgs/dvd+rw-tools/template
+++ b/srcpkgs/dvd+rw-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'dvd+rw-tools'
 pkgname=dvd+rw-tools
 version=7.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="m4"
-short_desc="A set of tools for DVD+RW/-RW drives"
+short_desc="Tools for DVD+RW/-RW drives"
 maintainer="Duncaen <mail@duncano.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fy.chalmers.se/~appro/linux/DVD+RW/"
 distfiles="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${version}.tar.gz"
 checksum=f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca

From 21a17b5a1365b0e191e31a3d0ffaaf238899f426 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:42:58 -0700
Subject: [PATCH 280/386] dmraid: fix license, xlint

---
 srcpkgs/dmraid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 7fccd9201546..420749bc8aa6 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -3,20 +3,20 @@ pkgname=dmraid
 _distver=1.0.0.rc16
 _patchver=3
 version="${_distver}.${_patchver}"
-revision=11
+revision=12
 wrksrc="${pkgname}"
 build_wrksrc="${_distver}-${_patchver}/${pkgname}"
 build_style=gnu-configure
 configure_args="--enable-led --enable-intel_led --enable-shared_lib"
 makedepends="device-mapper-devel"
-lib32disabled=yes
-disable_parallel_build="yes"
 short_desc="Device mapper RAID interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://people.redhat.com/~heinzm/sw/dmraid/"
 distfiles="${homepage}/src/dmraid-${_distver}-${_patchver}.tar.bz2"
 checksum=93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8
+disable_parallel_build=yes
+lib32disabled=yes
 
 dmraid-devel_package() {
 	short_desc+=" - development files"

From f44f22a76753f150ab2321794f2c0879491b00cd Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 22 Mar 2021 22:49:03 +0100
Subject: [PATCH 281/386] New package: pulseeffects-legacy-4.8.5

pulseeffects-legacy is a version of pulseeffects before 5.0.0 which still supports pulseaudio
---
 srcpkgs/pulseeffects-legacy/template | 21 +++++++++++++++++++++
 srcpkgs/pulseeffects-legacy/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/pulseeffects-legacy/template
 create mode 100644 srcpkgs/pulseeffects-legacy/update

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
new file mode 100644
index 000000000000..c38c8ef2d9ef
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -0,0 +1,21 @@
+# Template file for 'pulseeffects-legacy'
+pkgname=pulseeffects-legacy
+version=4.8.5
+revision=1
+wrksrc="pulseeffects-${version}"
+build_style=meson
+hostmakedepends="itstool pkg-config gettext"
+makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+ gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
+ pulseaudio-devel python3-gobject-devel sratom-devel
+ libsndfile-devel"
+depends="calf gsettings-desktop-schemas gst-plugins-bad1
+ gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
+short_desc="Sound effects for systems using PulseAudio (legacy)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/wwmm/pulseeffects"
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=df1c4c4a9811c62a549822dacde3a9e36233ba3ec58817ae52a236f6181a507c
+python_version=3
+conflicts="pulseeffects"
diff --git a/srcpkgs/pulseeffects-legacy/update b/srcpkgs/pulseeffects-legacy/update
new file mode 100644
index 000000000000..2638b2b10b6e
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/update
@@ -0,0 +1 @@
+ignore="5.*"

From 9ee630ba8e1f8620d6f84a26a479d797e4d8307a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 20 Mar 2021 23:54:16 +0100
Subject: [PATCH 282/386] pulseeffects: update to 5.0.3

Closes: #29638 [via git-merge-pr]
---
 srcpkgs/pulseeffects/INSTALL.msg |  2 ++
 srcpkgs/pulseeffects/template    | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/pulseeffects/INSTALL.msg

diff --git a/srcpkgs/pulseeffects/INSTALL.msg b/srcpkgs/pulseeffects/INSTALL.msg
new file mode 100644
index 000000000000..74c17ca2a8c5
--- /dev/null
+++ b/srcpkgs/pulseeffects/INSTALL.msg
@@ -0,0 +1,2 @@
+PulseEffects version 5 and later only support PipeWire and drop support for PulseAudio.
+If you want to use PulseEffects with PulseAudio, install pulseeffects-legacy instead.
diff --git a/srcpkgs/pulseeffects/template b/srcpkgs/pulseeffects/template
index a06f3042d97f..3b94e3dc873b 100644
--- a/srcpkgs/pulseeffects/template
+++ b/srcpkgs/pulseeffects/template
@@ -1,19 +1,20 @@
 # Template file for 'pulseeffects'
 pkgname=pulseeffects
-version=4.8.4
+version=5.0.3
 revision=1
 build_style=meson
 hostmakedepends="itstool pkg-config gettext"
 makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
- pulseaudio-devel python3-gobject-devel sratom-devel
- libsndfile-devel"
+ pipewire-devel python3-gobject-devel sratom-devel zita-convolver-devel
+ libsndfile-devel libbs2b-devel"
 depends="calf gsettings-desktop-schemas gst-plugins-bad1
- gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
-short_desc="Sound effects for Pulseaudio applications"
+ gst-plugins-good1 pipewire python3-gobject python3-scipy zita-convolver
+ gstreamer1-pipewire"
+short_desc="Sound effects for systems using PipeWire"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/pulseeffects"
-distfiles="https://github.com/wwmm/pulseeffects/archive/${version}.tar.gz"
-checksum=12ba3205025d815a747b58636861594f7d1e43a578a5b0411f7794f4c12e5d86
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=2e14858918b54bee5f6e4898cc803ae2170b4d624407fef39e0831b6584c4a4f
 python_version=3

From 2c28f7de3ead042b2791927d51951a5c2a96978e Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 10 Apr 2021 11:47:47 +0200
Subject: [PATCH 283/386] libheif: enable avif and heif encoding

---
 srcpkgs/libheif/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 64518027febf..5a7af30c347d 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,11 +1,12 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
-makedepends="libjpeg-turbo-devel libpng-devel libde265-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
+ libaom-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
@@ -19,7 +20,7 @@ pre_configure() {
 
 libheif-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libde265-devel"
+	depends="${sourcepkg}>=${version}_${revision} libde265-devel x265-devel libaom-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 3f64a1753569eee07949acfb5b58b851a830cd9f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:06 -0500
Subject: [PATCH 284/386] gns3-server: update to 2.2.20.

---
 srcpkgs/gns3-server/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 97b3922b3335..5d1569f3255b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,17 +13,15 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@d40618d1a623acd27733e9f172a57827eb46d7a25d18d49d7f6a3b77f98296e0
+checksum=@a7e068fd48b985acdfef111258c066c75e6d48a07bdb5b19af785ae3be607bf0
 make_check=no
 
 post_patch() {
 	# relax requirements
 	vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \
-		-e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \
-		-e 's|aiohttp=.*|aiohttp>=3.6.2|' \
+		-e 's|aiohttp=.*|aiohttp>=3.7.4|' \
 		-e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' \
-		-e 's|py-cpuinfo.*|py-cpuinfo>=5.0.0|' -i requirements.txt
+		-e 's|py-cpuinfo.*|py-cpuinfo>=5.8.0|' -i requirements.txt
 }
 post_install() {
 	# remove tests directory polluting site-packages

From ae400fb02fefc581af60bcc82c95414bdd1499ef Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:00 -0500
Subject: [PATCH 285/386] gns3-gui: update to 2.2.20.

---
 srcpkgs/gns3-gui/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index db049f1065a4..c50b2880a7aa 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,11 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@8da8b09690bf5d086732c032d3871b8e77fd55efa8553ac9e5f65c4c19bfb3d6
+checksum=@6a5cc45f2a1d7ec8634b33b812013df6635b4c3994f58bf0f55efc41d0a096d0
 
 post_patch() {
 	# relax requirements
-	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' -i requirements.txt
+	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' -i requirements.txt
 }
 
 do_check() {

From e36529422a4d0b2d143a326c5b81ac32e14c5f2f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 20:49:31 -0500
Subject: [PATCH 286/386] python3-sentry: update to 1.0.0.

---
 srcpkgs/python3-sentry/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c4406811688e..c2056965cad9 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
-version=0.15.1
-revision=2
+version=1.0.0
+revision=1
 wrksrc="sentry-python-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools
@@ -12,7 +12,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="BSD-2-Clause"
 homepage="https://github.com/getsentry/sentry-python"
 distfiles="https://github.com/getsentry/sentry-python/archive/${version}.tar.gz"
-checksum=92008498d7e1d286cf0d971200398152eb776293814db82a2121f1f264cd966e
+checksum=@514331143990028b4cecf9f8e4ff5dfe4c0dddd0dcb206b28b7fba22ada6cece
 
 do_check() {
 	cd build/lib

From 6b73c86490b519a05d6c9b44e0bff0c6a46482db Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:05 -0400
Subject: [PATCH 287/386] python3-googleapis-common-protos: update to 1.53.0.

---
 srcpkgs/python3-googleapis-common-protos/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template
index 776af77144ba..8b3c309b55d4 100644
--- a/srcpkgs/python3-googleapis-common-protos/template
+++ b/srcpkgs/python3-googleapis-common-protos/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-googleapis-common-protos'
 pkgname=python3-googleapis-common-protos
-version=1.52.0
-revision=2
+version=1.53.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,9 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/googleapis"
 distfiles="${PYPI_SITE}/g/googleapis-common-protos/googleapis-common-protos-${version}.tar.gz"
-checksum=560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351
+checksum=a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4
+# testing requires many optional dependencies
+make_check=no
 
 post_install() {
 	chmod -R +r "${DESTDIR}/${py3_sitelib}"

From 103b651cd1724ab4cfc4953386f435bf09009cba Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:12 -0400
Subject: [PATCH 288/386] python3-google-api-core: update to 1.26.2.

---
 srcpkgs/python3-google-api-core/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template
index f933a7e028b1..3530e7d8941c 100644
--- a/srcpkgs/python3-google-api-core/template
+++ b/srcpkgs/python3-google-api-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-core'
 pkgname=python3-google-api-core
-version=1.22.2
-revision=2
+version=1.26.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,6 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/python-api-core"
 distfiles="${PYPI_SITE}/g/google-api-core/google-api-core-${version}.tar.gz"
-checksum=779107f17e0fef8169c5239d56a8fbff03f9f72a3893c0c9e5842ec29dfedd54
-
-do_check() {
-	: all tests require grpc, which is optional dependencies.
-}
+checksum=418a131cd349e8bda036741d93e7fb9caefa691daa7296851193edc60b3c946c
+# all tests require grpc, which is optional dependencies.
+make_check=no

From 5e70d3ab93d8ed248e4c50a16e04602ff3c7115c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:49:12 -0400
Subject: [PATCH 289/386] python3-google-auth: update to 1.28.0.

---
 srcpkgs/python3-google-auth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template
index 9048569a95e2..880bb0441a1e 100644
--- a/srcpkgs/python3-google-auth/template
+++ b/srcpkgs/python3-google-auth/template
@@ -1,14 +1,16 @@
 # Template file for 'python3-google-auth'
 pkgname=python3-google-auth
-version=1.22.0
-revision=2
+version=1.28.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-pyasn1-modules python3-rsa python3-six python3-cachetools"
 short_desc="Google Authentication Library (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python"
 distfiles="${PYPI_SITE}/g/google-auth/google-auth-${version}.tar.gz"
-checksum=a73e6fb6d232ed1293ef9a5301e6f8aada7880d19c65d7f63e130dc50ec05593
+checksum=9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e
+# all tests require many optional dependencies
+make_check=no

From bcee9a0e73a67e5b303d3c3b65d432640d0c8fb9 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:55:35 -0400
Subject: [PATCH 290/386] python3-google-auth-httplib2: update to 0.1.0.

---
 srcpkgs/python3-google-auth-httplib2/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template
index 08d324c28714..c8ecea74b5f3 100644
--- a/srcpkgs/python3-google-auth-httplib2/template
+++ b/srcpkgs/python3-google-auth-httplib2/template
@@ -1,14 +1,17 @@
 # Template file for 'python3-google-auth-httplib2'
 pkgname=python3-google-auth-httplib2
-version=0.0.4
-revision=2
+version=0.1.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-google-auth python3-httplib2"
+checkdepends="$depends python3-mock python3-pytest python3-Flask"
 short_desc="Google Authentication Library: httplib2 transport (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
-homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python3-httplib2"
+homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
 distfiles="${PYPI_SITE}/g/google-auth-httplib2/google-auth-httplib2-${version}.tar.gz"
-checksum=8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39
+checksum=a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac
+# tests require unpackaged optional dependency
+make_check=no

From 8f828a2dda8229802326805189e6f9299961fa3e Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:57:44 -0400
Subject: [PATCH 291/386] python3-google-api-python-client: update to 2.0.2.

Closes: #29719 [via git-merge-pr]
---
 srcpkgs/python3-google-api-python-client/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index 10685d99dbe5..a3ed75efa6cf 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -1,26 +1,23 @@
 # Template file for 'python3-google-api-python-client'
 pkgname=python3-google-api-python-client
-version=1.12.3
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-httplib2 python3-google-auth python3-google-auth-httplib2
  python3-google-api-core python3-uritemplate python3-six"
+# FIXME: 6 unittests are failing, cannot use py test to override
 checkdepends="python3-mock $depends python3-oauth2client"
 short_desc="Google API client library for Python3"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/google-api-python-client"
 distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz"
-checksum=844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a
+checksum=48686cceb0dc8cb8b9ee1920ad7c0d9b499ef4fca0ca51c1c69f1e462a628011
 
 post_patch() {
 	# unittest2 is python2 thing.
 	vsed -i -e '/^import unittest2 as unittest/s/.*/import unittest/' \
 		tests/test_*.py
 }
-
-do_check() {
-	: 6 unittest is failing, cannot use py test to override
-}

From 2a59d3b8e20c6d131d2c0547a678da36f2e99c70 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:09:33 +0100
Subject: [PATCH 292/386] attr: update to 2.5.1.

Closes: #29609 [via git-merge-pr]
---
 srcpkgs/attr/patches/escape-left-brace-regex.patch | 11 -----------
 srcpkgs/attr/template                              |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/attr/patches/escape-left-brace-regex.patch

diff --git a/srcpkgs/attr/patches/escape-left-brace-regex.patch b/srcpkgs/attr/patches/escape-left-brace-regex.patch
deleted file mode 100644
index 5c91bba818ad..000000000000
--- a/srcpkgs/attr/patches/escape-left-brace-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/run
-+++ test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index c5e6b8aa5ebf..231701bd0158 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -1,19 +1,19 @@
 # Template file for 'attr'
 pkgname=attr
-version=2.4.48
+version=2.5.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
-checkdepends="perl"
 configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
  --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+make_check_args="-j1" # Tests broken when ran in parallel
+checkdepends="perl"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://savannah.nongnu.org/projects/attr"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz"
-checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
-make_check_args="-j1" # Tests broken when ran in parallel
+checksum=bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8
 conf_files="/etc/xattr.conf"
 
 # The included libtool is rotten and only works with bash; easiest fix.

From 03697f10165e9a450ee1db2932f171c679edb118 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:44:24 +0100
Subject: [PATCH 293/386] acl: update to 2.3.1.

Closes: #29623 [via git-merge-pr]
---
 srcpkgs/acl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 3edfcfef82b8..9fa74946a240 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,6 +1,6 @@
 # Template file for 'acl'
 pkgname=acl
-version=2.2.53
+version=2.3.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://savannah.nongnu.org/projects/acl"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz"
-checksum=06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7
+checksum=760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From a07c2533e5c31653b3f7f885d8f346ddf5be36c8 Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 24 Mar 2021 22:10:30 +0100
Subject: [PATCH 294/386] gqrx: update to 2.14.4

Closes: #25849 [via git-merge-pr]
---
 srcpkgs/gqrx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 1fe79b02e27f..b1b6597b1ef9 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,6 +1,6 @@
 # Template file for 'gqrx'
 pkgname=gqrx
-version=2.12.1
+version=2.14.4
 revision=2
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
@@ -10,14 +10,14 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3
 makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel
  pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel
  fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel
- $(vopt_if portaudio portaudio-devel)"
+ qt5-tools $(vopt_if portaudio portaudio-devel)"
 short_desc="Software defined radio receiver powered by GNU Radio and Qt"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://gqrx.dk/"
 changelog="https://raw.githubusercontent.com/csete/gqrx/master/resources/news.txt"
 distfiles="https://github.com/csete/gqrx/archive/v${version}.tar.gz"
-checksum=7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
+checksum=aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b
 
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio

From af4b5b92be920fc42e8e475d14beb0e71e97b4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 18:33:46 +0100
Subject: [PATCH 295/386] cargo-deny: update to 0.9.1.

Closes: #29596 [via git-merge-pr]
---
 srcpkgs/cargo-deny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 56fbd4eba258..5ee0066d8cf9 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.8.2
-revision=2
+version=0.9.1
+revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=6e081a843637c78846389c3d2922d0b07d95fd7aae496a87ef0e3bfb33bd4d06
+checksum=3fcb347ed35caf3a3e303c4ec3426fafab53dcc084d83ea5c62e79a600f4ed5f
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 2a00dc6293e190daf934fcf2b2f9c0894b49b383 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 8 Apr 2021 21:56:27 +0300
Subject: [PATCH 296/386] mesa: update to 21.0.2

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index fd6d0c77b651..0dbe36205d7e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.0.1
+version=21.0.2
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb
+checksum=46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From bbd304a29f2501628f3ac5255bbb63c23ad37397 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Mon, 15 Mar 2021 18:47:05 -0700
Subject: [PATCH 297/386] signal-backup-decode: update to 0.2.3

Closes: #29502 [via git-merge-pr]
---
 srcpkgs/signal-backup-decode/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 119546b61ea7..747736adeb5e 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,7 +1,7 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
-version=0.2.0
-revision=2
+version=0.2.3
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel sqlite-devel"
@@ -9,5 +9,5 @@ short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pajowu/signal-backup-decode"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=e7727b6628004cd027e374bcd8a004d8c3e68b3ba03e82ce2c9e04ee58623ed2

From 064eed282a02c1d59d1ad9880380e84310304308 Mon Sep 17 00:00:00 2001
From: Nicolas Porcel <nicolasporcel06@gmail.com>
Date: Thu, 5 Sep 2019 01:22:00 +0100
Subject: [PATCH 298/386] clisp: enable readline by default

---
 srcpkgs/clisp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index 0bd8d107d041..ee0941a3d581 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,7 +1,7 @@
 # Template file for 'clisp'
 pkgname=clisp
 version=2.49
-revision=5
+revision=6
 # possibly works elsewhere but not in an ancient 2010 release
 archs="x86_64* i686*"
 build_style=configure
@@ -20,6 +20,7 @@ nocross=yes
 lib32disabled=yes
 disable_parallel_build=yes
 build_options="readline"
+build_options_default="readline"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;

From 80471f8fba514f6b1c6b2686fdca59659894a9bd Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 6 Apr 2021 00:24:56 +0200
Subject: [PATCH 299/386] pandoc: update to 2.11.4.

---
 srcpkgs/pandoc/files/stack.yaml | 26 +++++++++-----------------
 srcpkgs/pandoc/template         | 18 ++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
index 47bf3bb1b5e4..82a5fcaded3f 100644
--- a/srcpkgs/pandoc/files/stack.yaml
+++ b/srcpkgs/pandoc/files/stack.yaml
@@ -1,31 +1,23 @@
-resolver: lts-16.20
+resolver: lts-17.9
 
 packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
+  - ./pandoc-2.11.4
   - ./pandoc-sidenote-0.20.0
 
 flags:
   pandoc:
     trypandoc: false
     embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
 
 extra-deps:
-  - pandoc-types-1.21
+  - pandoc-types-1.22
   - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
+  - regex-pcre-builtin-0.95.2.3.8.43
+  - hslua-1.2.0
+  - jira-wiki-markup-1.3.4
+  - commonmark-0.1.1.4
+  - commonmark-extensions-0.2.0.4
+  - commonmark-pandoc-0.2.0.1
 
 ghc-options:
    "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..ad233dd0aaf3 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,34 +1,30 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
- --flag=hslua:system-lua --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files --flag=hslua:system-lua
+ --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
-short_desc="Universal converter between markup formats (with citeproc support)"
+short_desc="Universal converter between markup formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +34,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From f5faefdbb5a620e9d6cd1bc15631ae1b2af9eb4c Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:25:28 +0200
Subject: [PATCH 300/386] python3-typed-ast: update to 1.4.2.

---
 srcpkgs/python3-typed-ast/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template
index 7c176c7c3154..8461f830a8cb 100644
--- a/srcpkgs/python3-typed-ast/template
+++ b/srcpkgs/python3-typed-ast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typed-ast'
 pkgname=python3-typed-ast
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 wrksrc="typed_ast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="whoami <whoami@systemli.org>"
 license="Apache-2.0"
 homepage="https://github.com/python/typed_ast"
 distfiles="https://github.com/python/typed_ast/archive/${version}.tar.gz"
-checksum=498a6cd88f78e4b2058092ff38c9941d61f4eba2c12b371240ba663f063adf7d
+checksum=be4b75ea880768489e30818267cf920027ed99014001ac428aedd0b31bbfc899
 
 do_patch() {
 	# python3-typed-ast uses the same header name with Python

From 87204f79c00f0718a658b8cbcf85fb880d2ede41 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 16:43:23 +0300
Subject: [PATCH 301/386] soundconverter: update to 4.0.0.

---
 srcpkgs/soundconverter/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 9e933929f971..bfffc3084732 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,10 +1,10 @@
 # Template file for 'soundconverter'
 pkgname=soundconverter
-version=3.0.2
-revision=2
-build_style=gnu-configure
+version=4.0.0
+revision=1
+build_style=python3-module
 pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
-hostmakedepends="glib intltool pkg-config python3-gobject"
+hostmakedepends="glib intltool pkg-config python3-gobject python3-distutils-extra"
 makedepends="gtk+3-devel gstreamer1-devel"
 depends="desktop-file-utils gst-plugins-good1 gst-plugins-ugly1
  hicolor-icon-theme python3-gobject"
@@ -12,8 +12,8 @@ short_desc="Leading audio file converter for the GNOME Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://soundconverter.org/"
-distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
-checksum=21d0b97bd4800a8e07840cf0ec035fa84a71a10c8cdadf5ea671880805aa68cb
+distfiles="https://launchpad.net/soundconverter/trunk/${version}/+download/soundconverter-${version}.tar.gz"
+checksum=4ad497793e40b321b2e10a363ab360b2b0bf338ff846eee7e00c895293ad4adb
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 35b9ccd3468672db478ac7089203f036292b8b48 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Mar 2021 19:34:59 +0100
Subject: [PATCH 302/386] cyrus-sasl: remove dependency to main package from
 modules

The various sasl modules do not dependent on any of the tools and
daemons that are included in the main cyrus-sasl package. Drop the
dependency.

Closes: #29383 [via git-merge-pr]
---
 srcpkgs/cyrus-sasl/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 03d12dcb28f6..608049a1d883 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -39,7 +39,6 @@ post_install() {
 }
 
 cyrus-sasl-modules-ldap_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (LDAP)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libldapdb.*"
@@ -47,7 +46,6 @@ cyrus-sasl-modules-ldap_package() {
 }
 
 cyrus-sasl-modules-sql_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (SQL)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libsql.*"
@@ -55,7 +53,6 @@ cyrus-sasl-modules-sql_package() {
 }
 
 cyrus-sasl-modules-gssapi_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libgssapi*"
@@ -63,7 +60,6 @@ cyrus-sasl-modules-gssapi_package() {
 }
 
 cyrus-sasl-modules_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules"
 	pkg_install() {
 		vmove usr/lib/sasl2

From 2228b05ef3f42d575178a8c6370d29dc8dfc61e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 15:24:12 -0300
Subject: [PATCH 303/386] ell: update to 0.39.

Add warnings about ABI stability.
---
 common/shlibs        | 2 +-
 srcpkgs/ell/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db975d7164c4..077da5c7e735 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1001,7 +1001,7 @@ libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
 libev.so.4 libev-4.04_1
-libell.so.0 ell-0.20_1
+libell.so.0 ell-0.39_1
 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1
 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1
 libyaml-0.so.2 libyaml-0.1.4_1
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 19634a337aa0..9c798a84e8ae 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,7 @@
 # Template file for 'ell'
+# ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.36
+version=0.39
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -12,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6
+checksum=653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08
 # tests depend on kernel features
 make_check=extended
 

From 00f26e8192a3d31c661c9486f67b9a8bc5b24a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:50 -0300
Subject: [PATCH 304/386] ofono: revbump for ell.

---
 srcpkgs/ofono/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index 16695994583a..248e58d9502d 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,7 +1,7 @@
 # Template file for 'ofono'
 pkgname=ofono
 version=1.31
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"

From 81732f405791af3d13075b6e9c17c1543519975e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:43 -0300
Subject: [PATCH 305/386] bluez: update to 5.58.

Requested by paper42:
- add logging to services
- add experimental build option
---
 srcpkgs/bluez/files/bluetooth-meshd/log/run |  1 +
 srcpkgs/bluez/files/bluetooth-meshd/run     |  3 ++-
 srcpkgs/bluez/files/bluetoothd/log/run      |  1 +
 srcpkgs/bluez/files/bluetoothd/run          |  3 ++-
 srcpkgs/bluez/template                      | 12 +++++++-----
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
 create mode 120000 srcpkgs/bluez/files/bluetoothd/log/run

diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
index 752dbcc37bf7..2594d5fe56e4 100755
--- a/srcpkgs/bluez/files/bluetooth-meshd/run
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetoothd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run
index 2b96adcdcdc6..860fa4bf80b3 100755
--- a/srcpkgs/bluez/files/bluetoothd/run
+++ b/srcpkgs/bluez/files/bluetoothd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetoothd -n
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 80fcf51c85a0..2130b7340580 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,11 +1,12 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.55
+version=5.58
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)"
+ --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)
+ $(vopt_enable experimental)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
  readline-devel ell-devel $(vopt_if mesh json-c-devel)"
@@ -14,19 +15,20 @@ maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88
+checksum=c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
-build_options="mesh nfc"
 patch_args="-Np1"
 
+build_options="mesh nfc experimental"
+
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 post_patch() {
 	# Use system ell
-	rm -rf ell/*
+	rm -r ell/*
 }
 
 pre_configure() {

From ecc16ac1eab611322c92be4406536540e4c9535a Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Tue, 6 Apr 2021 19:36:44 -0700
Subject: [PATCH 306/386] vpnc-scripts: update to 20210402.

---
 srcpkgs/vpnc-scripts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index 80e2fdedeb7e..c2152391688f 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -1,13 +1,13 @@
 # Template file for 'vpnc-scripts'
 pkgname=vpnc-scripts
-version=20200930
+version=20210402
 revision=1
 short_desc="Network configuration scripts for VPNC and OpenConnect"
 maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.infradead.org/openconnect/vpnc-script.html"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=364a00b3ef0f4b036fc2ac4271723da1e9a1648137b65f771d73e04f1215b8ba
+checksum=cd00e831904554c7acbc9cd20e6457c6e787fe52dc2f75d39263a65faccc19f0
 
 do_install() {
 	vinstall vpnc-script 755 usr/libexec/vpnc-scripts

From b54a958ffa3fc9b6c2e6fdfb2ed063b59a350828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 11 Apr 2021 02:22:36 -0300
Subject: [PATCH 307/386] linux5.11: update to 5.11.13.

---
 srcpkgs/linux5.11/files/arm64-dotconfig | 6 +++---
 srcpkgs/linux5.11/template              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux5.11/files/arm64-dotconfig b/srcpkgs/linux5.11/files/arm64-dotconfig
index 2ae2b39dd4ed..293f821d5cbf 100644
--- a/srcpkgs/linux5.11/files/arm64-dotconfig
+++ b/srcpkgs/linux5.11/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.1 Kernel Configuration
+# Linux/arm64 5.11.13 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -228,6 +228,7 @@ CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -371,6 +372,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
@@ -2115,7 +2117,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -10177,7 +10178,6 @@ CONFIG_RESET_TEGRA_BPMP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=m
-CONFIG_USB_LGM_PHY=m
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index ad0b1ba7361b..61162540a83d 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.12
+version=5.11.13
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- ec443b0e6c9c10d94dc25b1662245d6421f75e223e7ea6de51e4f2c465b08164"
+ d38e0f7f732ec95c247182ad1c97dd433e9fbb1619c99f7a0a8a24fddd001c82"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 47522b7a5716c3237f4c3c02a0df4a8a63e93871 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:10:59 -0700
Subject: [PATCH 308/386] cachefilesd: fix license

---
 srcpkgs/cachefilesd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cachefilesd/template b/srcpkgs/cachefilesd/template
index 67b75a779d34..0100afaeb273 100644
--- a/srcpkgs/cachefilesd/template
+++ b/srcpkgs/cachefilesd/template
@@ -1,19 +1,19 @@
 # Template file for 'cachefilesd'
 pkgname=cachefilesd
 version=0.10.10
-revision=1
+revision=2
 build_style=gnu-makefile
+make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 short_desc="Userspace daemon acting as a backend for FS-Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~dhowells/fscache/"
 distfiles="http://people.redhat.com/~dhowells/fscache/${pkgname}-${version}.tar.bz2"
-checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
-make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 conf_files="/etc/cachefilesd.conf"
+checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
 
-do_configure() {
-	sed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
+post_patch() {
+	vsed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
 }
 
 post_install() {

From ec5fc6fa5a221eb50dba69c85dd8b1ac70247158 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:21:18 -0700
Subject: [PATCH 309/386] cairo-dock-plugins: fix license

---
 srcpkgs/cairo-dock-plugins/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 1086ee328e40..7069ed9ed64d 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
@@ -10,7 +10,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
 checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
@@ -32,7 +32,6 @@ pre_configure() {
 
 cairo-dock-plugins-python3_package() {
 	depends="python3 ${sourcepkg}>=${version}_${revision}"
-	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"
 	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove ${py3_sitelib}

From 760153f073135db75c8bbc395524276a4c70f61d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:25:36 -0700
Subject: [PATCH 310/386] canto-curses: fix license

---
 srcpkgs/canto-curses/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 841369c23e86..b67f9f284f5b 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,16 +1,15 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=6
+revision=7
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel ncurses-devel readline-devel"
 depends="canto-next"
-pycompile_module="canto_curses"
-pycompile_dirs="/usr/lib/canto/plugins"
-short_desc="An ncurses frontend for canto-next Atom/RSS feed reader"
+short_desc="Ncurses frontend for canto-next Atom/RSS feed reader"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=88db1e4ac71f13f02ffb076a33b290e6c343da669dc54ea771af705b21ea6452

From a4cad7ad57be69ffd842b5cc2cfe8df8416a24ff Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:28:45 -0700
Subject: [PATCH 311/386] canto-next: fix license

---
 srcpkgs/canto-next/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 03eb9deb18eb..8fd497829427 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,15 +1,14 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=4
+revision=5
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-feedparser"
-pycompile_module="canto_next"
-pycompile_dirs="/usr/lib/canto/plugins"
 short_desc="Quick and concise Atom/RSS feed reader daemon"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=222d0382c145f81010653fbe1006f61455ed0aeb6c3940145524e633e3567ad5

From ca2206c769e4d1d4ef5cad0e26a5b35919129a09 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:30:34 -0700
Subject: [PATCH 312/386] cbp2make: fix license

---
 srcpkgs/cbp2make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbp2make/template b/srcpkgs/cbp2make/template
index 30f0e69093d9..4b8736ff6351 100644
--- a/srcpkgs/cbp2make/template
+++ b/srcpkgs/cbp2make/template
@@ -1,12 +1,12 @@
 # Template file for 'cbp2make'
 pkgname=cbp2make
 version=147
-revision=1
+revision=2
 wrksrc="$pkgname-stl-rev${version}-all"
 hostmakedepends="doxygen p7zip"
 short_desc="Makefile generation tool for Code::Blocks IDE"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://sourceforge.net/projects/cbp2make/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/cbp2make-stl-rev${version}-all.tar.7z"
 checksum=1b211abb8de00dc3048fccad6ebd076ab03dcb9f672cdff379de33a1346ed129

From 75f8161687fa902bbb5b397e91f90cf40cd9e265 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:40:08 -0700
Subject: [PATCH 313/386] ccextractor: fix license

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index c766b264779e..d4bdf07d6f76 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
 version=0.88
-revision=1
+revision=2
 build_wrksrc="linux"
 build_style=gnu-configure
 configure_args="--enable-ocr --enable-hardsubx"
@@ -9,7 +9,7 @@ hostmakedepends="automake pkg-config"
 makedepends="leptonica-devel tesseract-ocr-devel ffmpeg-devel"
 short_desc="Extract subtitles from video streams"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"

From 8fba1b91093b8d15253d4819a5f62ba7d4db0f33 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:47:43 -0700
Subject: [PATCH 314/386] cdb: fix license

---
 srcpkgs/cdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template
index 213b1d1a245a..c95afff379bb 100644
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@@ -1,11 +1,11 @@
 # Template file for 'cdb'
 pkgname=cdb
 version=0.75
-revision=4
+revision=5
 build_style=gnu-makefile
 short_desc="Constant database utilities"
 maintainer="Lain <lain@waifu.club>"
-license="Public domain"
+license="Public Domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"

From ae17da6b0494225a62efccfbc31073e846fbdebd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:07 -0700
Subject: [PATCH 315/386] cdecl: fix license

---
 srcpkgs/cdecl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f81..e120ca3af500 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
@@ -9,8 +9,8 @@ hostmakedepends="flex"
 makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
 CFLAGS="-DUSE_READLINE"

From 14afa0c4eab30aa61a8d00b30aade2014ba11e14 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:50 -0700
Subject: [PATCH 316/386] cdrdao: fix license

---
 srcpkgs/cdrdao/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template
index e2b43bf855fc..f8fae75ab2b3 100644
--- a/srcpkgs/cdrdao/template
+++ b/srcpkgs/cdrdao/template
@@ -1,13 +1,13 @@
 # Template file for 'cdrdao'
 pkgname=cdrdao
 version=1.2.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="lame-devel libao-devel libmad-devel libvorbis-devel"
 short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2..0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://cdrdao.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2"
 checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4

From 9f453cfea09bbd875586602cd11f6630f5e96b91 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:23:27 -0700
Subject: [PATCH 317/386] chmlib: fix license

---
 srcpkgs/chmlib/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chmlib/template b/srcpkgs/chmlib/template
index 7f2eb56ab4a2..a573c27d1499 100644
--- a/srcpkgs/chmlib/template
+++ b/srcpkgs/chmlib/template
@@ -1,12 +1,12 @@
 # Template file for 'chmlib'
 pkgname=chmlib
 version=0.40
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-examples"
 short_desc="Utilities for dealing with Microsoft ITSS/CHM format files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.jedrea.com/chmlib/"
 distfiles="http://www.jedrea.com/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
@@ -26,4 +26,3 @@ libchmlib-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From fb8fe602f6bcec88e58013e35bb6ce42368d4a9c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:32:34 -0700
Subject: [PATCH 318/386] chntpw: fix license

---
 srcpkgs/chntpw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 75289c85961f..7ccac88fe06d 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -1,12 +1,12 @@
 # Template file for 'chntpw'
 pkgname=chntpw
 version=140201
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://pogostick.net/~pnh/ntpasswd/"
 distfiles="http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${version}.zip"
 checksum=96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc

From 0edd2a6d9d6b3000ebc26df17e3fef20c7da0d35 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:57:43 -0700
Subject: [PATCH 319/386] cksfv: fix license

---
 srcpkgs/cksfv/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cksfv/template b/srcpkgs/cksfv/template
index 864fe357e126..78f61f3f2579 100644
--- a/srcpkgs/cksfv/template
+++ b/srcpkgs/cksfv/template
@@ -1,11 +1,12 @@
+# Template file for 'cksfv'
 pkgname=cksfv
 version=1.3.14
-revision=2
+revision=3
 build_style=configure
+short_desc="SFV checksum utility (simple file verification)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://zakalwe.fi/~shd/foss/cksfv/"
-short_desc="SFV checksum utility (simple file verification)"
 distfiles="http://zakalwe.fi/~shd/foss/cksfv/files/${pkgname}-${version}.tar.gz"
 checksum=010facce85b317b7b9f952c84cd59ce03476a2b685db33a49b6ea0d1b38378ea
 

From 689037433291a56245a91276d0a1187c9cdf9cd5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 09:09:09 -0700
Subject: [PATCH 320/386] clustalw: fix license

---
 srcpkgs/clustalw/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/clustalw/template b/srcpkgs/clustalw/template
index 77fb0be93c62..5c048024e402 100644
--- a/srcpkgs/clustalw/template
+++ b/srcpkgs/clustalw/template
@@ -1,12 +1,11 @@
 # Template file for 'clustalw'
 pkgname=clustalw
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Bioinformatics program for multiple sequence alignment"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v3"
+license="LGPL-3.0-or-later"
 homepage="http://clustal.org"
-distfiles="http://www.clustal.org/download/current/clustalw-2.1.tar.gz"
+distfiles="http://www.clustal.org/download/current/clustalw-${version}.tar.gz"
 checksum=e052059b87abfd8c9e695c280bfba86a65899138c82abccd5b00478a80f49486
-

From 21b7fec34fffaa1bd1fe41c08a7f040304e7246b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:36 -0700
Subject: [PATCH 321/386] connman-ncurses: fix license

---
 srcpkgs/connman-ncurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template
index 8ba2028a5f28..5fd4b33b08fc 100644
--- a/srcpkgs/connman-ncurses/template
+++ b/srcpkgs/connman-ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'connman-ncurses'
 pkgname=connman-ncurses
 version=1.0
-revision=4
+revision=5
 wrksrc="connman-json-client-${version}"
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel"
@@ -9,7 +9,7 @@ makedepends="json-c-devel ncurses-devel dbus-devel"
 depends="dbus connman"
 short_desc="Simple ncurses-based UI for ConnMan"
 maintainer="Sergei Akhmatdinov <sakhmatd@riseup.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/eurogiciel-oss/connman-json-client"
 distfiles="https://github.com/eurogiciel-oss/connman-json-client/archive/v${version}.tar.gz"
 checksum=724604787b51cd3bd2ba5d2291f5f2efe0558a1ec78d92d3c92ebc78f6c63219

From 2ca4d91872aa91babb9fa6b55b12f1cf51a9a159 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:44 -0700
Subject: [PATCH 322/386] connman-ui: fix license

---
 srcpkgs/connman-ui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/connman-ui/template b/srcpkgs/connman-ui/template
index fdd0fa5d20c0..8aaafad5b55a 100644
--- a/srcpkgs/connman-ui/template
+++ b/srcpkgs/connman-ui/template
@@ -1,15 +1,15 @@
 # Template file for 'connman-ui'
 pkgname=connman-ui
 version=0.0.20150622
-revision=2
+revision=3
 _gitrev=fce0af94e121bde77c7fa2ebd6a319f0180c5516
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-configure
 hostmakedepends="automake libtool intltool glib-devel pkg-config"
 makedepends="dbus-devel glib-devel gtk+3-devel"
-short_desc="A full-featured GTK based trayicon UI for ConnMan"
+short_desc="Full-featured GTK based trayicon UI for ConnMan"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/tbursztyka/connman-ui"
 distfiles="${homepage}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=12ac39f1d4c9e3f54ede6c1d1ebc2dbd6d31cdb74516cb5080f9860499d0a1ee

From d7791ffd342f97fb6a4476d9e477a97be6b56876 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:28:42 -0700
Subject: [PATCH 323/386] cparser: fix license

---
 srcpkgs/cparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cparser/template b/srcpkgs/cparser/template
index d77478ac42a3..d56c074d648c 100644
--- a/srcpkgs/cparser/template
+++ b/srcpkgs/cparser/template
@@ -1,13 +1,13 @@
 # Template file for 'cparser'
 pkgname=cparser
 version=1.22.0
-revision=2
+revision=3
 wrksrc="cparser-cparser-${version}"
 makedepends="libfirm-devel"
 depends="gcc"
 short_desc="C99 parser (with GNU extensions) and libfirm frontend"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://libfirm.org/"
 distfiles="https://github.com/MatzeB/cparser/archive/cparser-${version}.tar.gz"
 checksum=0965aa23d8ed7d4cce309806fec2d2c18ad20a74a084340baed0dc874b24175b

From ff1149f68b389fb78ae16ec8892f11ebdc62c285 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:31:09 -0700
Subject: [PATCH 324/386] cppdb: fix license

---
 srcpkgs/cppdb/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppdb/template b/srcpkgs/cppdb/template
index cf5194e6f507..d09016575384 100644
--- a/srcpkgs/cppdb/template
+++ b/srcpkgs/cppdb/template
@@ -1,16 +1,19 @@
 # Template file for 'cppdb'
 pkgname=cppdb
 version=0.3.1
-revision=1
+revision=2
 build_style=cmake
 makedepends="libpqxx-devel"
 short_desc="SQL Connectivity Library"
 maintainer="Asaf Ohayon <asaf@sysbind.co.il>"
-license="LGPL-3"
+license="MIT"
 homepage="http://cppcms.com/sql/cppdb/"
 distfiles="${SOURCEFORGE_SITE}/cppcms/cppdb/${version}/cppdb-${version}.tar.bz2"
 checksum=d60eef5a732d8f84ef5e4a2845a8cefc543a6c75bf3782589c2cf6aa150b992e
 
+post_install() {
+	vlicense MIT.txt LICENSE
+}
 
 cppdb-devel_package() {
 	short_desc+=" - development files"

From 66d519a215bdd2361025aafc52006873714c2941 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:34:47 -0700
Subject: [PATCH 325/386] cproto: fix license

---
 srcpkgs/cproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index df279033a6ee..7c1e844d2b85 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,12 +1,12 @@
 # Template file for 'cproto'
 pkgname=cproto
 version=4.7o
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Generates function prototypes and variable declarations from C code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
 checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f

From d40af9d3187e88fa7635b285808dd8d47c1f2fbb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:11:24 -0700
Subject: [PATCH 326/386] cpufrequtils: fix license

---
 srcpkgs/cpufrequtils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 77c7d335a91d..f29bb4155f6c 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -1,7 +1,7 @@
 # Template file for 'cpufrequtils'
 pkgname=cpufrequtils
 version=008
-revision=12
+revision=13
 _commit=a2f0c39d5f21596bb9f5223e895c0ff210b265d0
 wrksrc="${pkgname}-${_commit}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ make_install_args="mandir=/usr/share/man"
 hostmakedepends="gettext"
 short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git"
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95

From 1608a46f4281c9467f6de5d9b199e22ec174ced4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:15:48 -0700
Subject: [PATCH 327/386] cpulimit: fix license

---
 srcpkgs/cpulimit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template
index 4857387f4e81..9fbf6eccf66c 100644
--- a/srcpkgs/cpulimit/template
+++ b/srcpkgs/cpulimit/template
@@ -1,11 +1,11 @@
 # Template file for 'cpulimit'
 pkgname=cpulimit
 version=0.2
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Tool to limit the CPU usage of a process"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/opsengine/cpulimit"
 distfiles="https://github.com/opsengine/${pkgname}/archive/v${version}.tar.gz"
 checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da

From 14cadbf0c2649aff9c731d873433a3f67af5dcef Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:24:24 -0700
Subject: [PATCH 328/386] crack-attack: fix license

---
 srcpkgs/crack-attack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index 422e369b84c6..df266ded665a 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -1,7 +1,7 @@
 # Template file for 'crack-attack'
 pkgname=crack-attack
 version=1.1.14
-revision=9
+revision=10
 wrksrc="$pkgname-$version"
 create_wrksrc=yes
 build_wrksrc="$wrksrc"
@@ -13,7 +13,7 @@ makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
 depends="desktop-file-utils"
 short_desc="Tetris Attack clone"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later,custom"
+license="GPL-2.0-or-later, custom:music-sound-copyright"
 homepage="http://www.nongnu.org/crack-attack/"
 distfiles="http://kojipkgs.fedoraproject.org/packages/${pkgname}/${version}/28.fc21/src/${pkgname}-${version}-28.fc21.src.rpm"
 checksum=6fb2ad5a1dcdc590fcbeb4d1925a7e55f1af27780a5550cded280475d2c08b1d

From 34cf29d82ae5426f687602f7b7924e426548f7de Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:27:10 -0700
Subject: [PATCH 329/386] crossguid: fix license

---
 srcpkgs/crossguid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template
index 135e8d404035..c846590103fa 100644
--- a/srcpkgs/crossguid/template
+++ b/srcpkgs/crossguid/template
@@ -1,15 +1,15 @@
 # Template file for 'crossguid'
 pkgname=crossguid
 version=0.2.2
-revision=1
+revision=2
+build_style=cmake
+makedepends="libuuid-devel"
 short_desc="Lightweight cross platform C++ GUID/UUID library (git $_gitshort)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="MIT"
 homepage="https://github.com/graeme-hill/crossguid"
 distfiles="$homepage/archive/v$version.tar.gz"
-makedepends="libuuid-devel"
 checksum=48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195
-build_style=cmake
 
 do_install() {
 	vlicense LICENSE

From 2e44218c457e84d59ad594a1722e732ac42863a9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:42:18 -0700
Subject: [PATCH 330/386] cvm: fix license

---
 srcpkgs/cvm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index ecee255ba856..06ef23cc8002 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,13 +1,13 @@
 # Template file for 'cvm'
 pkgname=cvm
 version=0.97
-revision=2
+revision=3
 build_style=gnu-makefile
-makedepends="bglibs-devel"
 hostmakedepends="libtool"
+makedepends="bglibs-devel"
 short_desc="Credential Validation Modules"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/cvm/"
 distfiles="http://untroubled.org/cvm/cvm-${version}.tar.gz"
 checksum=82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47

From f797d349684beafd179b47d178db980f209210e3 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 10 Apr 2021 15:27:49 -0300
Subject: [PATCH 331/386] salt: update to 3003.

---
 srcpkgs/salt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 7f5386a77182..abac7da405f3 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,6 +1,6 @@
 # Template file for 'salt'
 pkgname=salt
-version=3002.5
+version=3003
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://saltstack.org/"
 changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
 distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af
+checksum=c4689733dfe738cf287e31cb3fdd3cb8d1606295202b18d8e66d48d372d5ca77
 conf_files="
  /etc/salt/cloud.providers.d/digitalocean.conf
  /etc/salt/cloud.providers.d/vsphere.conf

From d7bbf67c930ac79cfcb83158d85c5cc3763c2cd6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:40:48 +0200
Subject: [PATCH 332/386] linux5.4: update to 5.4.111.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index da4e54344f58..1b2543f16e2a 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.110
+version=5.4.111
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
+checksum=21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
 python_version=3
 patch_args="-Np1"
 

From df99a0f756acd4541447b93e6ac5f377b62ba5e4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:43:15 +0200
Subject: [PATCH 333/386] linux4.19: update to 4.19.186.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 5cac6f099dd0..abbc9c9ed08e 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.185
+version=4.19.186
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=1689d78212997dae44b24bf037bc842d11d88e974d524af66f7864e5a8508597
+checksum=d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631
 python_version=2 #unverified
 patch_args="-Np1"
 

From 9463e3242b48eb66610dee3f9137c0e0a9aa67b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 8 Mar 2021 00:14:06 +0100
Subject: [PATCH 334/386] libupnp: update to 1.14.4.

also switch to github upstream.
---
 srcpkgs/libupnp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index 9adb5f00da65..b13c99374a98 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,15 +1,15 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.14.0
+version=1.14.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://pupnp.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+homepage="https://pupnp.github.io/pupnp/"
+distfiles="https://github.com/pupnp/pupnp/releases/download/release-$version/$pkgname-$version.tar.bz2"
+checksum=cd649ef53070e9b88680f730ed5b3f919658582d43dd315a2ed8b6105c6fbe63
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From 0b2b046cfdb5fe6a5133e3e2f0c0ff20ff1d4fa2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 10 Apr 2021 17:06:00 +0200
Subject: [PATCH 335/386] openradtool: update to 0.12.6.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index e1c588acae49..a04b3e7ec1a7 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.5
+version=0.12.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=f74d4cb1f72124a6581e57392ca46b851870ebf0928addc71d6db90fe43992ee
+checksum=fec033245ad9371292f92eb87fce77e3e1d6b67ca131dcd181d36dc8df201023
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From dbf96bd3bde60e3f76edd2764f4ba16db3a3a7b6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 00:59:38 +0200
Subject: [PATCH 336/386] harfbuzz: update to 2.8.0.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1a1506276997..62ea9a3ffda3 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.7.4
+version=2.8.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7
+checksum=a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
 
 post_install() {
 	vlicense COPYING LICENSE

From 8ca1fa30885b0900890a85fffbfdd1eca3457ab2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:06:42 +0200
Subject: [PATCH 337/386] alttab: update to 1.6.0.

---
 srcpkgs/alttab/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template
index 66d8da9af66d..42a9961687ef 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,17 +1,20 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXft-devel libXmu-devel libXrandr-devel
  libXrender-devel libpng-devel libXpm-devel uthash"
+checkdepends="procps-ng xvfb-run xeyes xprop"
 short_desc="Task switcher for minimalistic window managers"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=d170425a34d1a92cf0eb5ba7306bf77729a6c04f211593cc5fdd8a0ab583a280
+checksum=9d362266a490a969b6398ccef1514dca2668c38c4b824bb11c8d16923bcb58ee
+
+make_check=no # needs cnee/xnee which is not packaged
 
 CFLAGS="-fcommon"
 

From dd18889917c595388d7b0558b4e787438096b76d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:24:59 +0200
Subject: [PATCH 338/386] binwalk: update to 2.3.1.

---
 srcpkgs/binwalk/patches/fallback-version.patch | 14 ++++++++++++++
 srcpkgs/binwalk/template                       |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/binwalk/patches/fallback-version.patch

diff --git a/srcpkgs/binwalk/patches/fallback-version.patch b/srcpkgs/binwalk/patches/fallback-version.patch
new file mode 100644
index 000000000000..b319bfebb5e0
--- /dev/null
+++ b/srcpkgs/binwalk/patches/fallback-version.patch
@@ -0,0 +1,14 @@
+--- src/binwalk/core/version.py.orig
++++ src/binwalk/core/version.py
+@@ -1,6 +1,10 @@
+ try:
+     from importlib import metadata
+-    get_version = lambda : metadata.version("binwalk")
++    def get_version():
++        try:
++            return metadata.version("binwalk")
++        except metadata.PackageNotFoundError:
++            return "unknown"
+ except ImportError:
+     try:
+         # Running on pre-3.8 Python; use importlib-metadata package
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index fa2328e7ae0a..6c61fff87aeb 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,18 +1,18 @@
 # Template file for 'binwalk'
 pkgname=binwalk
-version=2.2.0
-revision=3
+version=2.3.1
+revision=1
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"
 depends="python3"
-checkdepends="python3-nose"
+checkdepends="python3-coverage python3-nose"
 short_desc="Easy tool for analyzing/reversing/extracting firmware images"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ReFirmLabs/binwalk"
 distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27
+checksum=7ec9d8fcb8686f4060d37e1096669e3ed8ce1194c91ad80199622448bcc01b19
 
 post_extract() {
 	vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py

From 43757a5525a7374c0f5f6b6480f636bda45f812c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 11 Apr 2021 18:40:23 +0200
Subject: [PATCH 339/386] zbar: ignore prerelases.

---
 srcpkgs/zbar/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/zbar/update

diff --git a/srcpkgs/zbar/update b/srcpkgs/zbar/update
new file mode 100644
index 000000000000..e797246e05a6
--- /dev/null
+++ b/srcpkgs/zbar/update
@@ -0,0 +1 @@
+ignore='*.*.9?'

From c3aebc5af4c700aa9e14f259c9088286d6ff7a7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 22:04:27 +0200
Subject: [PATCH 340/386] cdogs-sdl: update to 0.9.1.

---
 srcpkgs/cdogs-sdl-data     |  1 -
 srcpkgs/cdogs-sdl/template | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/cdogs-sdl-data

diff --git a/srcpkgs/cdogs-sdl-data b/srcpkgs/cdogs-sdl-data
deleted file mode 120000
index c95cdde7057a..000000000000
--- a/srcpkgs/cdogs-sdl-data
+++ /dev/null
@@ -1 +0,0 @@
-cdogs-sdl
\ No newline at end of file
diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index 8b5ef0911afb..add7d111a21d 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
-version=0.7.3
-revision=2
+version=0.9.1
+revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config"
@@ -13,16 +13,10 @@ license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
 checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e "s; -Werror;;"
 }
-
-cdogs-sdl-data_package() {
-	short_desc+=" - data"
-	pkg_install() {
-		vmove usr/share/cdogs
-	}
-}

From a4662c00e3f0dc4061df01bf01064c877ffe6969 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 11 Apr 2021 20:40:04 +0200
Subject: [PATCH 341/386] graphene: update to 1.10.6.

also fix comparision error.

ref: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3976#note_1079639

closes #30125.
---
 ...x-comparision-in-graphene_ray_intersect_box.patch | 12 ++++++++++++
 srcpkgs/graphene/template                            |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch

diff --git a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
new file mode 100644
index 000000000000..083146f9243e
--- /dev/null
+++ b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
@@ -0,0 +1,12 @@
+diff --git src/graphene-ray.c src/graphene-ray.c
+index 66c3393..9151300 100644
+--- src/graphene-ray.c
++++ src/graphene-ray.c
+@@ -563,7 +563,7 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
+ #else
+   if (ty_min > tx_min || fpclassify (tx_min) == FP_NAN)
+     tx_min = ty_min;
+-  if (ty_max > tx_max || fpclassify (tx_max) == FP_NAN)
++  if (ty_max < tx_max || fpclassify (tx_max) == FP_NAN)
+     tx_max = ty_max;
+ #endif
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index e868239bfa08..db7ca1f7563d 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,11 +1,11 @@
 # Template file for 'graphene'
 pkgname=graphene
-version=1.10.2
+version=1.10.6
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dtests=false -Dbenchmarks=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+ -Dintrospection=$(vopt_if gir enabled disabled) -Dsse2=true"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Thin layer of types for graphic libraries"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ebassi/graphene"
 distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
-checksum=e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6
+checksum=80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Darm_neon=false" ;;

From a2bc7da3513440e9c49734cf63490ca2cf9f60a2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:00:43 +0200
Subject: [PATCH 342/386] mozjs78: update to 78.9.0.

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 --------------
 srcpkgs/mozjs78/template                          |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
deleted file mode 100644
index f2cf04d79aca..000000000000
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
-so enforce a stricter one.
-
---- a/js/src/jit/none/MacroAssembler-none.h
-+++ b/js/src/jit/none/MacroAssembler-none.h
-@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Registers::invalid_reg};
- static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
- 
- static constexpr uint32_t ABIStackAlignment = 4;
--static constexpr uint32_t CodeAlignment = sizeof(void*);
-+static constexpr uint32_t CodeAlignment = 8;
- static constexpr uint32_t JitStackAlignment = 8;
- static constexpr uint32_t JitStackValueAlignment =
-     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index ebfb51801916..7b437946b196 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,6 +1,6 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
-version=78.2.0
+version=78.9.0
 revision=1
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
@@ -16,7 +16,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
+checksum=8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864
 patch_args="-Np1"
 
 CXXFLAGS="-Wno-class-memaccess"

From 5b1d052d3f0c353076466d09c28789e1d06c1bcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:07:12 +0200
Subject: [PATCH 343/386] mozjs78: port build-non-jit-32bit patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 ++++++++++++++
 srcpkgs/mozjs78/template                          |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
new file mode 100644
index 000000000000..e3938fe8780c
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -0,0 +1,14 @@
+On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
+so enforce a stricter one.
+
+--- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
++++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
+ static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
+ 
+ static constexpr uint32_t ABIStackAlignment = 4;
+-static constexpr uint32_t CodeAlignment = 16;
++static constexpr uint32_t CodeAlignment = 8;
+ static constexpr uint32_t JitStackAlignment = 8;
+ static constexpr uint32_t JitStackValueAlignment =
+     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 7b437946b196..ee443e7a64c8 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 30ee817c2e2ad611a7531ce19628986694772960 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 17:45:06 -0500
Subject: [PATCH 344/386] cdogs-sdl: fix checksum

---
 srcpkgs/cdogs-sdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index add7d111a21d..e2783fff55d3 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+checksum=fee87e90371e6c8f679e75a3628d82b863a67250bd822c672a4017f6a078eb56
 replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"

From 235e8d34fd2cd04899de2679415ee53090eeccc9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 18:01:36 -0500
Subject: [PATCH 345/386] cdogs-sdl: fix build

---
 srcpkgs/cdogs-sdl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index e2783fff55d3..d653cc0dcbca 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -4,8 +4,9 @@ version=0.9.1
 revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
-hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel"
+hostmakedepends="pkg-config python3-protobuf protobuf26"
+makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
+ gtk+3-devel protobuf-devel"
 depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9702c403110f5211d92bdb9e80597c4cad24a610 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 23:07:46 +0200
Subject: [PATCH 346/386] MultiMarkdown: remove /usr/{LICENSE,README}.txt

---
 srcpkgs/MultiMarkdown/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template
index 96d153d87297..75bd1e04e476 100644
--- a/srcpkgs/MultiMarkdown/template
+++ b/srcpkgs/MultiMarkdown/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMarkdown'
 pkgname=MultiMarkdown
 version=6.6.0
-revision=1
+revision=2
 wrksrc="$pkgname-6-$version"
 build_style=cmake
 hostmakedepends="perl"
@@ -18,5 +18,6 @@ post_install() {
 	mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown
 	# Avoid conflict with mtools
 	mv ${DESTDIR}/usr/bin/mmd  ${DESTDIR}/usr/bin/multimarkdown-mmd
+	rm ${DESTDIR}/usr/{LICENSE,README}.txt
 	vlicense LICENSE
 }

From 9280dd6bf8a9ae1bf80f1c8311c3a4c279f598e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 07:46:06 +0700
Subject: [PATCH 347/386] Haru: build versioned SONAME

---
 common/shlibs                          |  2 +-
 srcpkgs/Haru/patches/Add-license.patch | 40 --------------------------
 srcpkgs/Haru/template                  | 15 +++++-----
 3 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/Haru/patches/Add-license.patch

diff --git a/common/shlibs b/common/shlibs
index 077da5c7e735..a2d4ddbcec14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3152,7 +3152,7 @@ libembb_mtapi_c.so embb-devel-1.0.0_1
 libembb_mtapi_network_c.so embb-devel-1.0.0_1
 libembb_base_cpp.so embb-devel-1.0.0_1
 libembb_base_c.so embb-devel-1.0.0_1
-libhpdf.so Haru-devel-2.3.0_1
+libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/Haru/patches/Add-license.patch b/srcpkgs/Haru/patches/Add-license.patch
deleted file mode 100644
index 367048748f4e..000000000000
--- a/srcpkgs/Haru/patches/Add-license.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 24443b76f4daf74c21307044e81b4942bd4e586a Mon Sep 17 00:00:00 2001
-From: Maciej Klemarczyk <m.klemarczyk+git@live.com>
-Date: Sun, 28 Jun 2015 12:05:05 +0200
-Subject: [PATCH 4/4] Missing LICENSE file was created
-
-File was created based on license provided by README file.
----
- LICENCE | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
- create mode 100644 LICENSE
-
-diff --git LICENSE LICENSE
-new file mode 100644
-index 0000000..bdf271e
---- /dev/null
-+++ LICENSE
-@@ -0,0 +1,20 @@
-+
-+Copyright (C) 1999-2006 Takeshi Kanno
-+Copyright (C) 2007-2009 Antony Dovgal
-+
-+This software is provided 'as-is', without any express or implied warranty.
-+
-+In no event will the authors be held liable for any damages arising from the 
-+use of this software.
-+
-+Permission is granted to anyone to use this software for any purpose,including 
-+commercial applications, and to alter it and redistribute it freely, subject 
-+to the following restrictions:
-+
-+ 1. The origin of this software must not be misrepresented; you must not claim 
-+    that you wrote the original software. If you use this software in a 
-+    product, an acknowledgment in the product documentation would be 
-+    appreciated but is not required.
-+ 2. Altered source versions must be plainly marked as such, and must not be 
-+    misrepresented as being the original software.
-+ 3. This notice may not be removed or altered from any source distribution.
--- 
-2.24.0
-
diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index c343c70ec5de..80db1e0e89f4 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -1,19 +1,20 @@
 # Template file for 'Haru'
 pkgname=Haru
 version=2.3.0
-revision=2
+revision=3
 wrksrc="libharu-RELEASE_${version//./_}"
-build_style=cmake
+build_style=gnu-configure
+hostmakedepends="automake libtool"
 makedepends="zlib-devel libpng-devel"
 short_desc="Free, cross platform, open source library for generating PDF files"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="ZLIB/LIBPNG"
+license="Zlib"
 homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
-post_install() {
-	vlicense LICENSE
+pre_configure() {
+	make -f build.mk
 }
 
 Haru-devel_package() {
@@ -21,7 +22,7 @@ Haru-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libhpdf.so
 	}
 }

From 1ea158abfbfd4832e04dc7a3ba249e679bd699cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 07:48:25 +0700
Subject: [PATCH 348/386] python3-anytree:  build with setuptools_scm

While we're at it, remove /usr/LICENSE (paper42).

Close: #30134
---
 srcpkgs/python3-anytree/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template
index e767018e6331..8f1f4a2d8f30 100644
--- a/srcpkgs/python3-anytree/template
+++ b/srcpkgs/python3-anytree/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-anytree'
 pkgname=python3-anytree
 version=2.8.0
-revision=2
+revision=3
 wrksrc="anytree-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-six"
+checkdepends="python3-six python3-coverage python3-nose graphviz"
 short_desc="Powerful and lightweight Python tree data structure"
 maintainer="q66 <daniel@octaforge.org>"
 license="Apache-2.0"
 homepage="https://github.com/c0fec0de/anytree"
 distfiles="${PYPI_SITE}/a/anytree/anytree-${version}.tar.gz"
 checksum=3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab
+
+post_install() {
+	rm ${DESTDIR}/usr/LICENSE
+}

From 6ca304569c135bc9fa2a6006283b73e6ee9517ec Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 22:31:23 +0200
Subject: [PATCH 349/386] lazygit: update to 0.27.4.

Closes: #30166 [via git-merge-pr]
---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 3caebf1d10f2..c725652ba15f 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.26.1
+version=0.27.4
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=7bfda18345993206d4d388ea0370e9b54af0354d37f4a64803461889b361d547
+checksum=8036c9b9539599fe9c112ed46d6234b3139a9dddc188b05cfa3bccfdb01422ca
 
 post_install() {
 	vlicense LICENSE

From bf2e2d584db2254e41e794c3856f5d07f542a83a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 20:52:52 +0200
Subject: [PATCH 350/386] just: update to 0.9.0.

Closes: #30163 [via git-merge-pr]
---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index d4266e9f158b..e351ac32ad68 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.8.4
+version=0.9.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=7aee472e4b70e62e89d7d5185493a3c680aeae4cc323c842e4c5b9b8af47040a
+checksum=877fdd517722ec1a554b046e1a9fd112f3503d91211702895c5ba12b29dcbcc6
 
 # Fix failing test
 pre_check() {

From 285b934fcc318308a76515af849b1dc2a1a6aafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 19:43:30 +0200
Subject: [PATCH 351/386] btfs: update to 2.24.

Closes: #30162 [via git-merge-pr]
---
 srcpkgs/btfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 78af3c6bcc97..a41afd1e2db5 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.23
-revision=2
+version=2.24
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
+checksum=d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935
 
 pre_configure() {
 	autoreconf -fi

From 6a1b01dbb07ba31dccaf02c564cd426ab61c21d3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:15:58 +0200
Subject: [PATCH 352/386] stagit: update to 0.9.5.

Closes: #30159 [via git-merge-pr]
---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 415761dc7e2f..89c5a8cb177c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=8889ab13fa345729cdc3cc92c8fdce10d49f6660f39a60def7646c86d8a61300
+checksum=025a17c7be3a4e98a2319efc4eb6329e9ea6a778b2b24b0eb97a342ece9bb039
 LDFLAGS="-lgit2"
 
 post_install() {

From 946925c106a4f41607e20ee7ed78bcec731ab040 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:15 +0200
Subject: [PATCH 353/386] acpica-utils: update to 20210331.

Closes: #30158 [via git-merge-pr]
---
 srcpkgs/acpica-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 6bcf51414cf1..bf2f0df5d93d 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20210105
+version=20210331
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8
+checksum=b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From b392fcb9e8a55aa8308256dd7b3b5274f78bfa18 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:16:20 +0200
Subject: [PATCH 354/386] sqlite: update to 3.35.4.

Closes: #30156 [via git-merge-pr]
---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 84116b6e638d..52a9f0d3e298 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.35.3
+version=3.35.4
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=ecbccdd440bdf32c0e1bb3611d635239e3b5af268248d130d0445a32daf0274b
+checksum=7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 5f52d5a9041702d9f1f3823069dd717b405f2be7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:35 +0200
Subject: [PATCH 355/386] file: update to 5.40.

Closes: #30153 [via git-merge-pr]
---
 srcpkgs/file/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 83d62af699a4..0818250c798c 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,6 +1,6 @@
 # Template file for 'file'
 pkgname=file
-version=5.39
+version=5.40
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
+checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
 
 if [ -z "$CHROOT_READY" ]; then
 	# libseccomp's default=auto

From 613a76d7aaa856c9cc4b97b6ea160c8019b0c4fa Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:56 +0200
Subject: [PATCH 356/386] irssi: update to 1.2.3.

Closes: #30152 [via git-merge-pr]
---
 srcpkgs/irssi/patches/glib-2-63.patch | 40 ---------------------------
 srcpkgs/irssi/template                |  6 ++--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/irssi/patches/glib-2-63.patch

diff --git a/srcpkgs/irssi/patches/glib-2-63.patch b/srcpkgs/irssi/patches/glib-2-63.patch
deleted file mode 100644
index 669b04d9a6a3..000000000000
--- a/srcpkgs/irssi/patches/glib-2-63.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch
-
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- src/fe-text/term-terminfo.c
-+++ src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--	unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
-+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+		c = 0;
- 
- 	switch (c) {
- 	case (unichar)-1:
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 4d8df6bfd24f..b47640ec94d9 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
 # Template file for 'irssi'
 pkgname=irssi
-version=1.2.2
-revision=7
+version=1.2.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.irssi.org"
 distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
-checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
+checksum=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25
 
 LDFLAGS="-lncursesw"
 

From 24be7022ef82cbc2a5cb0157462515b44afa6cc0 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:25 +0200
Subject: [PATCH 357/386] fetchmail: update to 6.4.18.

Closes: #30151 [via git-merge-pr]
---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index be26641609a7..274105153ef0 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.17
+version=6.4.18
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a41bcdf11b41aa0682b259aee4717c617c15dadd43fa008b2ed38b770f4d50c6
+checksum=302dc9bcdc6927dedf375d2baaead2347557faa70d98b1da83f2409fa6fb259f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 0dd78c866b797137a71c3dab769be83af14c3bd8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:06 +0200
Subject: [PATCH 358/386] libassuan: update to 2.5.5.

Closes: #30150 [via git-merge-pr]
---
 srcpkgs/libassuan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 11c7f184e75c..c74d8b9b39f0 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -1,6 +1,6 @@
 # Template file for 'libassuan'
 pkgname=libassuan
-version=2.5.4
+version=2.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
-checksum=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0
+checksum=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
 
 libassuan-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 511273612c536b13cf3bc550ccfd1db3709d8362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 13:02:14 +0200
Subject: [PATCH 359/386] ccls: update to 0.20210330.

Closes: #30149 [via git-merge-pr]
---
 srcpkgs/ccls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 2b0d8a4b94ec..f2fcebc6b016 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,6 +1,6 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20201219
+version=0.20210330
 revision=1
 build_style=cmake
 hostmakedepends="clang-tools-extra"
@@ -10,7 +10,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
 distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
-checksum=edd3435bc7e55d9e5dc931932f9c98275a6a28d1ab1f66416110e029f3f2882a
+checksum=28c228f49dfc0f23cb5d581b7de35792648f32c39f4ca35f68ff8c9cb5ce56c2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 6e2f7d75fc1a866cf27cf4057f5073a059741920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 12:54:00 +0200
Subject: [PATCH 360/386] hcloud: update to 1.22.1.

Closes: #30148 [via git-merge-pr]
---
 srcpkgs/hcloud/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index d5eb343c9338..d07198b9ded4 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,19 +1,18 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.22.0
+version=1.22.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
 go_import_path=github.com/hetznercloud/cli
 go_package=github.com/hetznercloud/cli/cmd/hcloud
 go_ldflags="-X github.com/hetznercloud/cli.Version=${version}"
-hostmakedepends="git"
 short_desc="Command-line interface for Hetzner Cloud"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=fec0f1ae490ed4e1079138661fffcbf489544c460f631a6a4e5910d3645dad86
+checksum=6b43ad74ec243484c7c1dd1d7cb2d6f1231f596a2ea4753bf81087f5b8dcf1c2
 
 post_install() {
 	vlicense LICENSE

From 844b1653df85967c04f082d912e6dd349d83cad0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 11 Apr 2021 09:28:58 +0300
Subject: [PATCH 361/386] json-glib: update to 1.6.2.

Closes: #30144 [via git-merge-pr]
---
 srcpkgs/json-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index a96132e145e3..4a3c611826a7 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'json-glib'
 pkgname=json-glib
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,11 +8,11 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73
+checksum=a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24
 
 # Package build options
 build_options="gir"

From eb8f7b3190ae14c8329d4a83817ac57525e055d9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 02:20:41 +0300
Subject: [PATCH 362/386] libtorrent-rasterbar: update to 1.2.13.

Closes: #30172 [via git-merge-pr]
---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 8cef116f9aff..1fe9b88327c7 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,8 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.12
-revision=2
+version=1.2.13
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8
+checksum=976d2771ffcd564f08a63351e9c22e842aaa8cd29f6f7fe25d169c038a844e85
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From 3fdfc9089064eae596baf5b7f7bcbf4d14d14dee Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:13:05 +0300
Subject: [PATCH 363/386] librsync: update to 2.3.2, add changelog and
 checkdepends.

Closes: #30170 [via git-merge-pr]
---
 srcpkgs/librsync/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template
index 80583aa90f49..c5576cd0e48a 100644
--- a/srcpkgs/librsync/template
+++ b/srcpkgs/librsync/template
@@ -1,16 +1,18 @@
 # Template file for 'librsync'
 pkgname=librsync
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 hostmakedepends="perl"
 makedepends="zlib-devel bzip2-devel popt-devel"
+checkdepends="which perl"
 short_desc="Library that implements the rsync remote-delta algorithm (rdiff)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://librsync.sourceforge.net/"
+changelog="https://librsync.github.io/md_NEWS.html"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569
+checksum=ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -C disableRuntimeTests.cmake"

From e529068dcc1c9a96d59c14400327f64ce6f1f3bd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:01:42 +0300
Subject: [PATCH 364/386] fotoxx: update to 21.40, add dcraw as runtime
 dependency.

Closes: #30169 [via git-merge-pr]
---
 srcpkgs/fotoxx/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index b2aff4b41061..a3c968fcdef0 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,19 +1,19 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=20.19
+version=21.40
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libchamplain-devel libraw-devel"
-depends="desktop-file-utils exiftool xdg-utils"
+depends="desktop-file-utils exiftool xdg-utils dcraw"
 short_desc="Free open source program for image editing and collection management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=4c9216d4612641151ca75e3f6fd74521a8dcfbb0a14d765b73d2ff62eed37a3e
+checksum=0c16597053ce8e186fb8163839f4f4ed44548bf00e43e88951f4346a9dbbb620
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
 
@@ -24,8 +24,3 @@ fi
 case "$XBPS_TARGET_LIBC" in
 	musl) makedepends+=" libexecinfo-devel"
 esac
-
-post_install() {
-	rm -rv ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} \
-		  ${DESTDIR}/usr/share/appdata
-}

From 293c07c4a1f91a221d617dcac871b00a8f343dbb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 00:44:52 +0300
Subject: [PATCH 365/386] dutree: update to 0.2.17.

Closes: #30168 [via git-merge-pr]
---
 srcpkgs/dutree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index 4bf082f3b7d5..70155936776a 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.16
+version=0.2.17
 revision=1
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=288e52f897785a03cae48eac581faf7d3743d36152f152ba25b8847528bf0a5f
+checksum=c88f2328c4e6cf96a0222efbe2a5c6d2de8cd0de0ebf01deb1f5fe81b5f8518e
 
 pre_build() {
 	# default version too old for ppc musl systems

From 69a51e614e87f61f3108eedb77c7883f7acc1e00 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:32 +0200
Subject: [PATCH 366/386] blackbox_exporter: update to 0.18.0.

Closes: #30138 [via git-merge-pr]
---
 srcpkgs/blackbox_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 4f6ca705e981..3000f9beb65f 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
-version=0.16.0
+version=0.18.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io"
 changelog="https://github.com/prometheus/blackbox_exporter/releases"
 distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz"
-checksum=6ebfd9f590286004dacf3c93b3aa3e3c560d6f1e5994f72c180e5af94fdd0099
+checksum=b41f1301c991c0d0011652e2093588521925d1960c6f7649f96edecbf1aadfb8
 
 system_accounts="_bbox_exporter"
 

From 0a366183cf8b2845ebc44796b0856d7e1ebbdc7a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:14 +0200
Subject: [PATCH 367/386] node_exporter: update to 1.1.2.

Closes: #30137 [via git-merge-pr]
---
 srcpkgs/node_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index 5397c01ff4dc..5f2855d6c6c3 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
-version=1.0.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/node_exporter/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/node_exporter/archive/v${version}.tar.gz"
-checksum=a841bf3e236376840be9e1d8e6c4a38196be6f3957b0982d1c7970a5e416b0ad
+checksum=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
 python_version=3
 
 system_accounts="_node_exporter"

From bc7a7d3cb00b1f0a2add36617bfa0595f55b77e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:18:37 +0700
Subject: [PATCH 368/386] embb: fix cmake, shared libs location

---
 common/shlibs         | 10 +++++-----
 srcpkgs/embb/template | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a2d4ddbcec14..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3147,11 +3147,11 @@ libGammu.so.8 gammu-1.39.0_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-27_2
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
-libembb_mtapi_cpp.so embb-devel-1.0.0_1
-libembb_mtapi_c.so embb-devel-1.0.0_1
-libembb_mtapi_network_c.so embb-devel-1.0.0_1
-libembb_base_cpp.so embb-devel-1.0.0_1
-libembb_base_c.so embb-devel-1.0.0_1
+libembb_mtapi_cpp.so embb-1.0.0_3
+libembb_mtapi_c.so embb-1.0.0_3
+libembb_mtapi_network_c.so embb-1.0.0_3
+libembb_base_cpp.so embb-1.0.0_3
+libembb_base_c.so embb-1.0.0_3
 libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template
index 0906831c53e3..d6a239cc3374 100644
--- a/srcpkgs/embb/template
+++ b/srcpkgs/embb/template
@@ -1,9 +1,10 @@
 # Template file for 'embb'
 pkgname=embb
 version=1.0.0
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
+configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
 short_desc="Library for parallel programming of embedded systems"
 maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
@@ -13,6 +14,8 @@ checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8
 
 post_install() {
 	vlicense COPYING.md
+	vmkdir usr/lib/cmake
+	mv ${DESTDIR}/usr/CMake/* ${DESTDIR}/usr/lib/cmake
 }
 
 embb-devel_package() {
@@ -20,8 +23,8 @@ embb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.a"
 	}
 }
 

From 7de322e6bad19a966d142f88847b14dc04d30a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:32:48 +0700
Subject: [PATCH 369/386] mozjs78: fix new patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
index e3938fe8780c..a1ba0bd86621 100644
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -1,8 +1,8 @@
 On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
 so enforce a stricter one.
 
---- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
-+++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+--- a/js/src/jit/none/MacroAssembler-none.h
++++ b/js/src/jit/none/MacroAssembler-none.h
 @@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
  static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
  

From 9389e7a345181848511848e4d22f428432b2bfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:42:29 +0700
Subject: [PATCH 370/386] Haru: fix cross build

---
 srcpkgs/Haru/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index 80db1e0e89f4..d1207b72b881 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -13,6 +13,11 @@ homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr"
+	configure_args+=" --with-png=${XBPS_CROSS_BASE}/usr"
+fi
+
 pre_configure() {
 	make -f build.mk
 }

From 40d8da581d64f27b2dc61cdfb95e9db0cc44bdfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:29:26 -0400
Subject: [PATCH 371/386] python3-tifffile: update to 2021.4.8.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 821635e7d88c..f09d1d9d33c6 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.3.31
+version=2021.4.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=82ce2f4f4d49415e95ae03f839f84eae4018435051106a1223e8b85d1a27b6f4
+checksum=449d05149e2dd3c0c2195d9a2ccd719c53840a516f82634e7dee1b5195f9d3c1
 # Tests require unpackaged fsspec
 make_check=no
 

From 127224a2e35b0f18aafc9b324dc533f18a3c6e65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:30:36 -0400
Subject: [PATCH 372/386] python3-breathe: update to 4.29.0.

---
 srcpkgs/python3-breathe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index c4c3550b3a68..2c041b141f2a 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.28.0
+version=4.29.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6948cf4700582c5b7115940367c87f74fbc4510b0a7db67fbcb5165181a784ad
+checksum=5fc965cfd248c01909a4ba78f3d7130d85e08b6f373b5224f4fc682cbfd760b4
 
 post_install() {
 	vlicense LICENSE

From 49fe078f4832dea6453c199c9d50f90d8ae88d9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:35:00 -0400
Subject: [PATCH 373/386] protobuf26: update to 3.15.8.

---
 srcpkgs/protobuf26/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 8e8cfbe6bece..8eac1187676b 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.7
+version=3.15.8
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504
+checksum=0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From e13bf69cff72170251436843b4651cc50c52a74d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:38:51 -0400
Subject: [PATCH 374/386] python3-protobuf: update to 3.15.8.

---
 srcpkgs/python3-protobuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 1a61e9218f75..33d8fa57a3ee 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.7
+version=3.15.8
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d
+checksum=0277f62b1e42210cafe79a71628c1d553348da81cbd553402a7f7549c50b11d0
 
 build_options="cppext"
 build_options_default="cppext"

From 2f5c9214d4926689c725ea5050d0e409d37bad8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:46:47 -0400
Subject: [PATCH 375/386] python3-hypothesis: update to 6.9.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 4f80d7b05c89..f66e8e3ddc19 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.8.9
+version=6.9.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=41147c391beab58898eb11296f3edc5d1b5dc7d58041f1bc3517e1d59414cbef
+checksum=c44ee0355477012d4fad8650aff95bfcb6346a21ea8248010ee915c30eff462a
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 1e4aa187d2a256d3658b49b70e4134a752570a3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 13:43:19 +0200
Subject: [PATCH 376/386] cdogs-sdl: fix broken dependencies

---
 srcpkgs/cdogs-sdl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index d653cc0dcbca..a0cf7dafd7b8 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,13 +1,12 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
 version=0.9.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config python3-protobuf protobuf26"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
  gtk+3-devel protobuf-devel"
-depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 380ce0cf10086e0844ad26ad54e7a785e118a90f Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 11 Apr 2021 12:27:18 +1000
Subject: [PATCH 377/386] libnpupnp: update to 4.1.3

Closes: #30141 [via git-merge-pr]
---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index d709bb6c8632..16c0d5b6cc57 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=8b59b730b39daeb46ad89021d7fbfe7c5a2a71cd0f85bb537d593c8a82746981
+checksum=74703d49be52d29b52f59342ec7359178b127568399551d9d3f56bb7950fcc02
 
 post_install() {
 	vlicense COPYING

From 0e361778b831728b9eee5785d731841015b3ebfa Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Mon, 12 Apr 2021 12:54:05 +0300
Subject: [PATCH 378/386] nicotine+: update to 3.0.4

---
 srcpkgs/nicotine+/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index fd1284c4a5f7..6f28e7582c58 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.0.2
+version=3.0.4
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="doggone <doggone@airmail.cc>"
 license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=a2a50a442e1dee035aa5825ef7b590c1c457bddba17e5a4abe6466113f5a4af1
+checksum=f0af2d45e7b2672e2c431a199f4faf0aee18da79f8d9aff9833cde6368192032

From ff954d9387fd752ded0228ea0eea085aa37d066e Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Mon, 12 Apr 2021 09:40:29 +0200
Subject: [PATCH 379/386] emptty: update to 0.5.1.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 402733e1b2a2..3a0ac68bceb6 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=30fd606e9f2c00c923d6fc5d28774d2454e70f999aee57ff29de73eed824f384
+checksum=798819b7d320df6ced703b5878564c3a2544638babc7666a5c8391c26976c704
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 02c4724cbe054f47a0952d62015b19d12d817d2a Mon Sep 17 00:00:00 2001
From: Gustavo Costa <gusbemacbe@gmail.com>
Date: Mon, 12 Apr 2021 00:12:05 -0300
Subject: [PATCH 380/386] adwaita-plus: update to 6.1

---
 srcpkgs/adwaita-plus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index 5d8611835163..5d603894af3b 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,13 +1,13 @@
 # Template file for 'adwaita-plus'
 pkgname=adwaita-plus
-version=5.0
+version=6.1
 revision=2
 short_desc="Modern third-party icons theme based on GNOME's Adwaita"
 maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Bonandry/adwaita-plus"
 distfiles="https://github.com/Bonandry/${pkgname}/archive/v${version}.tar.gz"
-checksum=c83a867a713b7ec0fe01c95fa2b1118ef97e8bdb62bc4467f317ea8c611b50d1
+checksum=f8c791754110b7b9c19f50fb19f5344ad0a50e5834ca25a1161312eacfbf027b
 
 do_install() {
 	vmkdir usr/share/icons

From 95dea476d3b4a0530be7c9102903c2ccd2e346cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 12 Apr 2021 18:28:39 +0200
Subject: [PATCH 381/386] removed-packages: add subpkgs of shiboken2,
 python3-pyside2

---
 srcpkgs/removed-packages/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3dee863e0d27..163647c10e49 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=41
+revision=42
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -190,11 +190,13 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libpyside-python3<=5.15.0_2
  libqmatrixclient<=0.5.3.2_1
  libqmatrixclient-devel<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6
+ libshiboken-python3<=5.15.0_3
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
@@ -241,6 +243,10 @@ replaces="
  python3-Django<=3.0.7_2
  python3-cloudscraper<=1.2.52_1
  python3-pyPEG2<=2.15.2_7
+ python3-pyenet<=5.15.0_2
+ python3-pyside<=5.15.0_2
+ python3-pyside-phonon<=5.15.0_2
+ python3-shiboken<=5.15.0_3
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
  qupzilla1<=1.8.9_16

From 6f4c08d9ea684ed87380ef85002a6d5084939fc3 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Mon, 12 Apr 2021 10:06:53 +0600
Subject: [PATCH 382/386] New package: pnpm-6.0.1

---
 srcpkgs/pnpm/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/pnpm/template

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
new file mode 100644
index 000000000000..6d7ecfe1ce8b
--- /dev/null
+++ b/srcpkgs/pnpm/template
@@ -0,0 +1,30 @@
+# Template file for 'pnpm'
+pkgname=pnpm
+version=6.0.1
+revision=1
+build_style=fetch
+hostmakedepends="nodejs jq"
+depends="nodejs"
+short_desc="Fast, disk space efficient package manager"
+maintainer="reback00 <reback00@protonmail.com>"
+license="MIT"
+homepage="https://pnpm.js.org/"
+distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
+checksum=6e390217ab6250f85d28cb0135620e3b0526a849dda7fb7c54f092c1b6bd465c
+python_version=3
+
+do_install() {
+	npm install -g --user root --prefix "${DESTDIR}/usr" "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tgz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+
+	# Sort and cleanup package.json
+	jq '.|=with_entries(select(.key|test("_.+")|not))' "$_npmdir/package.json" > "$_npmdir/package.json"
+	chmod 644 "$_npmdir/package.json"
+
+	# Delete JS SourceMaps
+	find "${DESTDIR}/usr/lib" -depth -name '*.map' -delete
+
+	vlicense "$_npmdir/LICENSE"
+	vdoc "$_npmdir/README.md"
+	rm -rf "${DESTDIR}/usr/etc" "$_npmdir/LICENSE" "$_npmdir/README.md"
+}

From eff24a11028a6b81e1cec12b879ee7db41b2bed0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 10:42:02 -0500
Subject: [PATCH 383/386] gef: update to 2021.04.

---
 srcpkgs/gef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 9188044d9c9a..679b30deb6bb 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,6 +1,6 @@
 # Template file for 'gef'
 pkgname=gef
-version=2021.01
+version=2021.04
 revision=1
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gef.readthedocs.io/en/master/"
 distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=59e9c2327a66f125c625affa727feaf43aaf8bf9da0cf1025f428ec8851b1f64
+checksum=43e1f08d230dccc44d22dc723df65f26afabfbd277ae81de04664738ea388703
 python_version="3"
 
 do_install() {

From 81418ad784114521b56f4fc98c31a446a5e32f55 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 12 Apr 2021 21:01:01 +0200
Subject: [PATCH 384/386] vscode: update to 1.55.1

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 58a277841efa..b3d037f65314 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.55.0
+version=1.55.1
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=5a208d6cfaf35ea4d098c858faf2dff14092d74534c1b5966df87f1d5be24ef0
+checksum=6fe56f9328ded06b38b29de4f545fc82007006cac18bdea8961637e25025d4a2
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 089a6b16739b131c1f2ee9b330230d89a3d578d3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 16:11:00 -0500
Subject: [PATCH 385/386] wine: update to 6.6.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 516ea5d1b17e..5b0d64f18e2e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.5
+version=6.6
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0600fd208c06925d6634d29f543bba0a64361c34e9bd7609c2f0e209610ad347
- 965b96a5058d3b4403bafb46993a959b92a2eb7a896f1070368db795e32aeb10"
+checksum="99e522c6dcc0ac1d53d201bf3054891fdf11864257473c3eb341e37671fd84ad
+ c3fbcce35388b917981d72533d7d66ccc57b2b1e5af01435af0cb9b054744206"
 
 build_options="mingw staging"
 build_options_default="mingw"

From ef480657be6919a4fede8db0b3aa624eef40efbc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 386/386] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL  | 7 +++++++
 srcpkgs/mariadb/template | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 srcpkgs/mariadb/INSTALL

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..a69d0aaa7857 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -32,6 +32,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (39 preceding siblings ...)
  2021-04-13 16:44 ` [PR PATCH] [Updated] " Veganizer
@ 2021-04-13 16:56 ` Veganizer
  2021-04-13 17:08 ` Veganizer
                   ` (7 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-13 16:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 1356266 bytes --]

From 73a9d0e059e90298a22f8065fe78ebb0d2ec3071 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 001/404] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..45470e61661d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1603,14 +1599,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3967,3 +3961,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From aa89eada1c83a4f850fa63e49289c651e763c1cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 002/404] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 879952f011c346867a1a7ea728a73b7167592980 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 003/404] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From a90a3eea77567d66b00a42c095992a495d772a65 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 004/404] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From a6b25af7e62ca46b809e647dca8464fdc8c3d65a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 005/404] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 15baa237aa8f60fb6a4b12ef6a7c160d34e2d512 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 006/404] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 1b00b281959c3575ba747309d2306a9cc72f1f3b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:51 +0200
Subject: [PATCH 007/404] cyrus-sasl: rebuild against mariadb-10.5.9.

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..03d12dcb28f6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From ff4bab0f3404f64c3b29ed48cceb9c9731e0a6ac Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 008/404] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From b1da2f7753be8053bcf7fa148e1ba6b7bc5bd081 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 009/404] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 1781b867891962d9e3aaed02d15de5cf31223feb Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 010/404] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 1de6cb9e8c856e74ec6be2e94e1aa9cc1c212f5e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 011/404] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 1f27cd22414017ef6989551c26eed4416151e17f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 012/404] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From 0a9f69cac532c850d1e2dd18da47ae1b020c86aa Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 013/404] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 8943595339f4afcdf0809fe1c833c13db1ecc9ca Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 014/404] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..048355cfb171 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 2d138b5d5e3bce7d349399d4b285cdad4e057e8c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 015/404] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From bb8dfb0aef913737a6c4b19e159d43bf3252616a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 016/404] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 665d380003729f6c035da29b587ac92a76745539 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 017/404] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 26402e6a30ab3a55b98271709499179c81eee6ef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 018/404] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 90a726be3f807c32c91e509fc4bb8492dedb7a88 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 019/404] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 58e9a47172bb620e549a2d4955ecb41ec421891c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 020/404] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From fcaa38c6f9e0f8cd1561eeb1da16e02a97ac1b12 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 021/404] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 86338a570aeb7ae819b29b41c5d9513e8bea86f8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 022/404] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From cc60373a86e8595731756a5eee5aab72d671c646 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 023/404] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From aa0d6c9d20b6c40981847180c57f747fe0c735ea Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 024/404] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From ce6302b9187073fd2fa2de144b8b46b55709b8a9 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 025/404] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 9cdf2b4d278f52bfe046721e0b7ad389b14afc98 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 026/404] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From d25fbabd8aa8b56dc7e5cc66e90ec150f0d78704 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 027/404] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From b6bfa3f39a9fa7e799f600fc38e3305302cf95ab Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 028/404] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 6d408b0f31beaf4df52abe1220a0bfbf2f91fcbf Mon Sep 17 00:00:00 2001
From: claris <share@claris>
Date: Wed, 7 Apr 2021 23:48:00 -0700
Subject: [PATCH 029/404] OpenRCT2: update to 0.3.3, tweak template

- Add CC-BY-SA-4.0 license declaration (see
  <https://github.com/OpenRCT2/title-sequences/issues/3>)
- Remove unused `jansson-devel` makedep
- Explicitly disable unused dependency options when configuring
- Add missing make target `g2` (packs some data into a file, was previously
  being invoked as a dependency of `install`)
- Remove useless and incorrect mkdir line from `post_extract`
- Remove INSTALL.msg, add explicit zenity dep instead
---
 srcpkgs/OpenRCT2/INSTALL.msg |  5 -----
 srcpkgs/OpenRCT2/template    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/OpenRCT2/INSTALL.msg

diff --git a/srcpkgs/OpenRCT2/INSTALL.msg b/srcpkgs/OpenRCT2/INSTALL.msg
deleted file mode 100644
index 70817138b9d2..000000000000
--- a/srcpkgs/OpenRCT2/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-You must install a package that provides either the zenity or kdialog binaries:
-
-- zenity
-- qarma
-- kdialog
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index b8ea8849863e..c5256b65287e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,32 +2,36 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-_objects_version=1.0.18
+_objects_version=1.0.21
 _titles_version=0.1.2c
-version=0.3.2
-revision=3
+version=0.3.3
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
  -DDOWNLOAD_TITLE_SEQUENCES=0
  -DDOWNLOAD_OBJECTS=0
+ -DDISABLE_DISCORD_RPC=1
+ -DDISABLE_GOOGLE_BENCHMARK=1
  $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
  $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
+make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
+depends="zenity"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://openrct2.io"
 # use title-sequences.zip to match CMakeLists instruction
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
- bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+checksum="71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2
+ b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip"
 
@@ -55,7 +59,6 @@ pre_configure() {
 
 post_extract() {
 	_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
-	mkdir -p data/object data/title
 	unzip -qd data/object "${_srcdir}/objects.zip"
 	unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
 

From 4f67c55f0c4e4bb64f9df6b45a30b00cd3af5c86 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:35:05 -0500
Subject: [PATCH 030/404] mongo-c-driver: update to 1.17.5.

---
 srcpkgs/mongo-c-driver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 3557648f8164..aaad9e75bce3 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,7 +1,7 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.17.4
-revision=2
+version=1.17.5
+revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=9ec8fe7fb54d636886fa823460658ccf660e3d82520d10810fb7c9d302ac974f
+checksum=4b15b7e73a8b0621493e4368dc2de8a74af381823ae8f391da3d75d227ba16be
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From 7977f5756f8fcbf85e945bae9d7bee6ddeda5eaa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:32:30 -0500
Subject: [PATCH 031/404] delta: update to 0.7.1.

---
 srcpkgs/delta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index be4b95ac2aea..250d68bccdbb 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.6.0
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=27259c3d305edee5f49a3a992e7d739cab400f478a675b7388fef85a2724217c
+checksum=f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227
 
 post_install() {
 	vlicense LICENSE

From aede019d97101197aa09c4ae9af1afbd75180808 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:41:02 -0500
Subject: [PATCH 032/404] python3-oletools: update to 0.56.1.

---
 srcpkgs/python3-oletools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 9da4f8d26cf5..73293a1f82d6 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.56
-revision=2
+version=0.56.1
+revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
+checkdepends="python3-pip python3-wheel $depends"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9d76d449f1edb1d74996ebf8b117371b5cdde436cfa595b3ff3989ec8d026106
+checksum=827cc577e253d946d5616e0a18062ed6aa837368fc19912c06e7d4c7ed502f77
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 21a94bf2561cbb3b47ed99028720b45f98d63125 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Apr 2021 12:46:49 +0200
Subject: [PATCH 033/404] scite: update to 5.0.1.

---
 srcpkgs/scite/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 11234338dd0e..e56284d0f4f7 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,7 +1,7 @@
 # Template file for 'scite'
 pkgname=scite
-version=4.4.6
-revision=2
+version=5.0.1
+revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel lua53-devel"
@@ -10,13 +10,16 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=1c2e6eee6c8aa2e52983d9713a4b1c97d06c376324a3ec8932adfcb9e55d16d1
+checksum=6d5d7b9caa895a3b72245e4b7459a678b9325d497c28bc92bc92f21fd65329b7
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile
 }
 
 do_build() {
+	make ${makejobs} -C lexilla/src \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1
 	make ${makejobs} -C scintilla/gtk \
 		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
 		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1

From ab7a85b92bd569e6a2509f3bb68ca234cb0f2b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 08:14:42 +0700
Subject: [PATCH 034/404] build-helper/qmake: respect {C,CXX,LD}FLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As of it's now, package built with build-helper/qmake natively won't
pick our CFLAGS CXXFLAGS and LDFLAGS. The result could be seen in no
debug symbol in djview.

Furthermore, cross build won't pick our hardening flags.

Let's force qmake pick our flags by using the same method as
build-style/qmake.
---
 common/build-helper/qmake.sh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index 9603cf5baae9..d2a38703b300 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -65,14 +65,36 @@ _EOF
 	# create the qmake-wrapper here because it only
 	# makes sense together with the qmake build-helper
 	# and not to interfere with e.g. the qmake build-style
+	#
+	# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
+	# - Cross Build:
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	#   + hardening flags will be picked up from environment variables
+	# - Native Build:
+	#   + hardening flags will be picked up first (Makefile, qt.conf?)
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	# Maybe there're better workaround, I don't know.
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf"
+exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+	QMAKE_CFLAGS+="\${CFLAGS}" \\
+	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+	QMAKE_LFLAGS+="\${LDFLAGS}"
 _EOF
 else
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath
+exec /usr/lib/qt5/bin/qmake \
+	"\$@" \
+	PREFIX=/usr \
+	QT_INSTALL_PREFIX=/usr \
+	LIB=/usr/lib \
+	QMAKE_CC=$CC QMAKE_CXX=$CXX \
+	QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+	QMAKE_CFLAGS+="${CFLAGS}" \
+	QMAKE_CXXFLAGS+="${CXXFLAGS}" \
+	QMAKE_LFLAGS+="${LDFLAGS}" \
+	CONFIG+=no_qt_rpath
 _EOF
 fi
 chmod 755 ${XBPS_WRAPPERDIR}/qmake

From a570ca9382451db5e41c910d278eb244120a5186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 08:17:30 +0700
Subject: [PATCH 035/404] djview: fix dbg package

---
 srcpkgs/djview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index a6af3f0188d1..76a0d1cc4103 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,11 +1,11 @@
 # Template file for 'djview'
 pkgname=djview
 version=4.12
-revision=2
+revision=3
 wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
-configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
+configure_args="ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"

From a02bb3a5dc019eb336076e618e62912a59cd0762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 22:31:49 +0700
Subject: [PATCH 036/404] abGate: clean up template

- qt5-devel isn't required in hostmakedepends
- Don't rename distfiles
---
 srcpkgs/abGate/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index f772f49e796a..d4fff83840b1 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -11,10 +11,6 @@ short_desc="LV2 Noise Gate plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://abgate.sourceforge.net/"
-distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz"
+distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz"
 checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
 CXXFLAGS="-fPIC"

From 9d876314ce73d071be020e75b85b9e3b685122fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 22:48:56 +0700
Subject: [PATCH 037/404] smplayer: fix dbg package

---
 srcpkgs/smplayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index a92e285d3c92..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
 version=21.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"

From 566c0dd7bbd1fdb6bba9f48316cdd94dc683cf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Apr 2021 23:01:55 +0700
Subject: [PATCH 038/404] qjackctl: update checksum

---
 srcpkgs/qjackctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 688de6749167..8bcba9039fd7 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ca443646daae21c13a6bec11160fe15639ea19c919d4a5607b1d1918dddd60bc
+checksum=867c088ed819f61d2eb1e550d4bb8f6330d8f247ab99843a584d81825f1a5d24
 
 build_options="jack_session"
 build_options_default="jack_session"

From e03992e17bf84adc4d8a72168f57c889bbe75f1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 22:40:01 +0300
Subject: [PATCH 039/404] growlight: update to 1.2.32.

---
 srcpkgs/growlight/patches/doctest-2.4.6.patch | 74 -------------------
 srcpkgs/growlight/template                    |  4 +-
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/growlight/patches/doctest-2.4.6.patch

diff --git a/srcpkgs/growlight/patches/doctest-2.4.6.patch b/srcpkgs/growlight/patches/doctest-2.4.6.patch
deleted file mode 100644
index c307ea9d5ef4..000000000000
--- a/srcpkgs/growlight/patches/doctest-2.4.6.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: growlight-1.2.31/tests/gpt.cpp
-===================================================================
---- growlight-1.2.31.orig/tests/gpt.cpp
-+++ growlight-1.2.31/tests/gpt.cpp
-@@ -6,6 +6,9 @@
- 
- #define UUID "\x5E\x86\x90\xEF\xD0\x30\x03\x46\x99\x3D\x54\x6E\xB0\xE7\x1B\x0D"
- 
-+template <typename T>
-+T xnormalise(T value) { return value; }
-+
- TEST_CASE("GPT") {
- 
-   // First eight bytes must be "EFI PART"
-@@ -19,14 +22,14 @@ TEST_CASE("GPT") {
-   SUBCASE("Revision") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(0x00010000 == head.revision);
-+    CHECK(0x00010000 == xnormalise(head.revision));
-   }
- 
-   // Bytes 0xc--0xf must be >= 92, should be the logical block size
-   SUBCASE("HeaderSize") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(92 == head.headsize);
-+    CHECK(92 == xnormalise(head.headsize));
-   }
- 
-   // Bytes 0x18--0x1f are the sector of the GPT primary, usually 1
-@@ -34,8 +37,8 @@ TEST_CASE("GPT") {
-   SUBCASE("GPTLBAs") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 100000, 34, nullptr));
--    CHECK(1 == head.lba);
--    CHECK(100000 == head.backuplba);
-+    CHECK(1 == xnormalise(head.lba));
-+    CHECK(100000 == xnormalise(head.backuplba));
-   }
- 
-   // Verify the 16-byte UUID is as specified
-@@ -61,17 +64,17 @@ TEST_CASE("GPT") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, UUID));
-     // partition entry size must be a positive multiple of 128 (usually 128)
--    CHECK(0 < head.partsize);
-+    CHECK(0 < xnormalise(head.partsize));
-     CHECK(0 == (head.partsize % 128));
-     // number of partition entries, usually 128 (MINIMUM_GPT_ENTRIES)
--    CHECK(128 <= head.partcount);
-+    CHECK(128 <= xnormalise(head.partcount));
-     auto entries = new gpt_entry[head.partcount];
-     memset(entries, 0, sizeof(*entries) * head.partcount);
-     CHECK(0 == update_crc(&head, entries));
-     // FIXME fix on big-endian!
--    WARN(2006165414 == head.crc);
--    CHECK(0 == head.reserved);
--    CHECK(2874462854 == head.partcrc);
-+    WARN(2006165414 == xnormalise(head.crc));
-+    CHECK(0 == xnormalise(head.reserved));
-+    CHECK(2874462854 == xnormalise(head.partcrc));
-     delete[] entries;
-   }
- 
-@@ -85,7 +88,7 @@ TEST_CASE("GPT") {
-     memset(sector, 0xff, sizeof(sector));
-     gpt_header* head = reinterpret_cast<gpt_header*>(sector);
-     CHECK(0 == initialize_gpt(head, sizeof(sector), 4194287, 34, nullptr));
--    CHECK(92 == head->headsize);
-+    CHECK(92 == xnormalise(head->headsize));
-     for(size_t idx = 92 ; idx < sizeof(sector) ; ++idx){
-       CHECK(0 == sector[idx]);
-     }
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index f47402c51221..4456db1f8185 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.31
+version=1.2.32
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=25cf643d99be88d299756ccb2933868641abecbc26793f5d87cfae93a461e2d6
+checksum=f15357602d04e10a34d5d3f0d83a66a328638ce40c7b20ffaeac68459318edf2
 patch_args=-Np1
 
 build_options="man zfs"

From 65e9a1cb1047a5f5ffaadd8c336593abcee721f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 11:58:59 -0300
Subject: [PATCH 040/404] python3-oletools: don't use pip/wheel in
 checkdepends.

python3-pip was necessary because the 'python3 setup.py test' command
was trying to install the oletools package itself:

    error: Command '['/usr/bin/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpjxhh802n', '--quiet', 'oletools>=0.54']' returned non-zero exit status 1.

Switching to pytest as the test runner fixes this.
---
 srcpkgs/python3-oletools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 73293a1f82d6..a8eede0d38cb 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
-checkdepends="python3-pip python3-wheel $depends"
+checkdepends="$depends python3-pytest"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From a5496ebf832c7d4e91533e93a7ad078f487071dc Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Tue, 6 Apr 2021 17:25:47 +0200
Subject: [PATCH 041/404] pipewire: update to 0.3.25

* fix README.voidlinux going in pipewire-doc
* disable SDL2 dep, only used in some examples we don't even ship
* rm INSTALL.msg, configs should be stable now (also mark them in xbps)
* ncursesw.patch is now upstream
---
 srcpkgs/pipewire/INSTALL.msg                  |  3 --
 srcpkgs/pipewire/files/README.voidlinux       |  2 +
 ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 +++++++++++++++++++
 srcpkgs/pipewire/patches/ncursesw.patch       | 11 ----
 srcpkgs/pipewire/template                     | 18 ++++---
 5 files changed, 64 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
 delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
deleted file mode 100644
index 8475a2465b7b..000000000000
--- a/srcpkgs/pipewire/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING: pipewire frequently changes the config file format. If
-you edited /etc/pipewire/pipewire.conf you must recreate it from
-/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 7bcb761273b0..0c3d167f0aef 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -5,3 +5,5 @@ Optional dependencies:
 * `libjack-pipewire` for jack replacement
 * `libspa-bluetooth` for bluetooth support
 * `libspa-jack` for running pipewire and jack side-by-side
+* `libspa-v4l2` for video camera support
+* `rtkit` for realtime priority acquisition
diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
new file mode 100644
index 000000000000..a033bb5fee7f
--- /dev/null
+++ b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
@@ -0,0 +1,52 @@
+From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 9 Apr 2021 11:55:55 +0200
+Subject: [PATCH] media-session: log info when loading monitor fails
+
+Log info in all monitor plugins instead of an error.
+---
+ src/examples/media-session/alsa-monitor.c  | 1 +
+ src/examples/media-session/bluez-monitor.c | 2 +-
+ src/examples/media-session/v4l2-monitor.c  | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
+index d97a45a66..72696b772 100644
+--- src/examples/media-session/alsa-monitor.c
++++ src/examples/media-session/alsa-monitor.c
+@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c
+index 9481d4472..5a4f30d48 100644
+--- src/examples/media-session/bluez-monitor.c
++++ src/examples/media-session/bluez-monitor.c
+@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
+-		pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
++		pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
+ 		goto out_free;
+ 	}
+ 	if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
+diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c
+index ecb75d085..2b2a92ef3 100644
+--- src/examples/media-session/v4l2-monitor.c
++++ src/examples/media-session/v4l2-monitor.c
+@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
deleted file mode 100644
index 09b8f071c41c..000000000000
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
-+++ meson.build	2021-02-18 14:39:53.808039159 +0100
-@@ -311,7 +311,7 @@
- pthread_lib = dependency('threads')
- dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
--ncurses_dep = dependency('ncurses', required : false)
-+ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
- 
- if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9ab2c72fb8f7..3536c294cb35 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,15 +1,15 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.24
-revision=2
+version=0.3.25
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel"
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+ libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
+ libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -17,8 +17,10 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f
-conf_files="/etc/pipewire/pipewire.conf"
+checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
+
+build_options="sdl2"
 
 replaces="libpulseaudio-pipewire>=0"
 
@@ -154,6 +156,6 @@ libjack-pipewire_package() {
 pipewire-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share/doc
+		vmove usr/share/doc/pipewire/html
 	}
 }

From 43c3724dee79b2153eab779a3ade631a825f7750 Mon Sep 17 00:00:00 2001
From: "Jiang Meng Liao (Faerryn)" <alexandre.liao@gmail.com>
Date: Thu, 8 Apr 2021 23:29:27 -0400
Subject: [PATCH 042/404] MultiMC: added qt5-svg as dependency for proper
 rendering of icons

---
 srcpkgs/MultiMC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 162472b00022..6f19fc623d0a 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
 version=0.6.12
-revision=1
+revision=2
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
@@ -10,7 +10,7 @@ build_style=cmake
 configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
 hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
-depends="virtual?java-environment"
+depends="virtual?java-environment qt5-svg"
 short_desc="Instanced Minecraft client"
 maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"

From e7178a611d1917ad5d2ceb70d3cd0d786df674ac Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 9 Apr 2021 11:40:53 +0300
Subject: [PATCH 043/404] speedtest-cli: update to 2.1.3

---
 srcpkgs/speedtest-cli/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index f797d3666805..a188bbcffc1a 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,14 +1,17 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
-version=2.1.2
-revision=3
+version=2.1.3
+revision=1
 build_style=python3-module
-pycompile_module="speedtest.py"
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Command line bandwidth test using speedtest.net"
 maintainer="Aaron Marcher <info@nulltime.net>"
 license="Apache-2.0"
 homepage="https://github.com/sivel/speedtest-cli"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a877142eec0ee8dda86519c36fe789480ed6fa603b016b620affd77fbf79b0d9
+checksum=45e3ca21c3ce3c339646100de18db8a26a27d240c29f1c9e07b6c13995a969be
+
+post_install() {
+	vman speedtest-cli.1
+}

From c8e44a7abd9dded0bd0d5aa12bb0f69604d02ddb Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Fri, 9 Apr 2021 15:10:22 +0200
Subject: [PATCH 044/404] miniserve: update to 0.13.0.

---
 srcpkgs/miniserve/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index e9c93967478a..9a04ae8d2b29 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,14 +1,15 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.10.4
+version=0.13.0
 revision=1
 build_style=cargo
+checkdepends="curl"
 short_desc="CLI tool to serve files and dirs over HTTP"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=03b8549258deb17759d69ad73047429f8420e3eab7588af086caf14e47c96332
+checksum=3578fd2dfe8dbebecd15b1e82cfb6d6656fed5e54ae4fccc4e7a6879b61dd1e1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 920ae765d42e36a763a7cd59cea4245da80b6b8c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 23:27:37 +0300
Subject: [PATCH 045/404] dnsmasq: update to 2.85.

Closes: #30097 [via git-merge-pr]
---
 srcpkgs/dnsmasq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index b680b2ad7fae..afa763bd1ab6 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.84
+version=2.85
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
 distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36
+checksum=f36b93ecac9397c15f461de9b1689ee5a2ed6b5135db0085916233053ff3f886
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 

From 5fcb1b4256036ca7b583ba9cd1a48cd4395d1f66 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:57:35 -0700
Subject: [PATCH 046/404] gnome-desktop: update to 40.0

---
 srcpkgs/gnome-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 3d0b295d4094b9379342222cde0e6e43b86ae7fc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 047/404] gsettings-desktop-schemas: update to 40.0

---
 srcpkgs/gsettings-desktop-schemas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 76c4b0e08108..9aa049052172 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

From 666f26103954068c8dc89ee822ac74f8235c3fec Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:00 -0700
Subject: [PATCH 048/404] gtk4: update to 4.2.0

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index b555160a6993..450d393b09c0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.0.0
+version=4.2.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,10 +29,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9
+checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
 
 # Package build options
-build_options="broadway colord cups gir cloudproviders wayland x11"
+build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud"
 

From 33c3772d4d673d328840d0fd963b21a2c62ddb63 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:59:54 -0700
Subject: [PATCH 049/404] gnome-shell: update to 40.0

---
 srcpkgs/gnome-shell/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index c004018f719c..49fe391c9f9c 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false"
-hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc
+hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel"
 makedepends="at-spi2-atk evolution-data-server-devel folks-devel
  gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel
- gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel
+ gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk4-devel
  ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel
  libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel
  libnma-devel polkit-devel pulseaudio-devel pipewire-devel
@@ -21,7 +21,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe
+checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478
 
 # needs X
 do_check() {

From 19425ea5158c2074a1bd4178ef398efdc92e00fc Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:01:11 -0700
Subject: [PATCH 050/404] gnome-settings-daemon: update to 40.0

---
 srcpkgs/gnome-settings-daemon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ecc62cf27782..824529fa11db 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From 005a2dde13e0035475b0be9e4474c39422caec34 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:02:03 -0700
Subject: [PATCH 051/404] gnome-session: update to 40.beta

---
 srcpkgs/gnome-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index c9bc4930c39f..cbe15db8170b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=3.38.0
+version=40.beta
 revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67
+checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846
 
 post_install() {
 	rm -rf ${DESTDIR}/tmp

From 4f5c77ef900d8020a2af1b1ee573bce96bc78b70 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:15 -0700
Subject: [PATCH 052/404] gdm: update to 40.0

---
 srcpkgs/gdm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
-checksum=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

From d563a057cfc2910c16ce01aa8996b31da4d6d595 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:03:42 -0700
Subject: [PATCH 053/404] libgweather: update to 40.0

---
 srcpkgs/libgweather/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

From 87c51fdafaf0de8ebb704f816016d638794f528b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:04:04 -0700
Subject: [PATCH 054/404] gnome-control-center: update to 40.0

---
 srcpkgs/gnome-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 001e057fabdc..a20f50cf9361 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9
+checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1
 
 build_options="cheese"
 build_options_default="cheese"

From 2d27b7841415a63893fdca78e7b66f0513ed96c4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:06:05 -0700
Subject: [PATCH 055/404] mutter: update to 40.0

---
 common/shlibs           | 13 ++++---------
 srcpkgs/mutter/template | 16 ++++++++--------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 45470e61661d..3de3beefd5cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2918,15 +2918,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 70df3b8cf4be..99bcd13e784f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,9 +19,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From 4725181f5bc2c652643766e2c43e8bff386f1e0c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:12:58 +0200
Subject: [PATCH 056/404] adwaita-icon-theme: update to 40.rc.

---
 srcpkgs/adwaita-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 8ddcde9b7873..2ce6e203025c 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=3.38.0
+version=40.rc
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From f37a9f9984b3166fedcdcfd84ed7e2ddedf8d663 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 057/404] at-spi2-core: update to 2.40.0.

---
 srcpkgs/at-spi2-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 74e607012012..e1c601f5d816 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.38.0
+version=2.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

From 6d56c8047b70677c40c46b919ee9c523399fcaee Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:36:51 +0200
Subject: [PATCH 058/404] dconf: update to 0.40.0, fix tests.

---
 srcpkgs/dconf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 206767ce20eb..a23a2d0e03cf 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -1,17 +1,18 @@
 # Template file for 'dconf'
 pkgname=dconf
-version=0.38.0
+version=0.40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala"
 makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel
  bash-completion"
+checkdepends="dbus"
 short_desc="Low-level configuration system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58
+checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533
 
 dconf-devel_package() {
 	depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}"

From ebd753d8030fad24440a0d4a8a76c2e9afbb7e3a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:38:42 +0200
Subject: [PATCH 059/404] gcr: update to 3.40.0.

---
 srcpkgs/gcr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

From d5316f952ff948b263511fe485675269a94292bd Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:44:05 +0200
Subject: [PATCH 060/404] gobject-introspection: update to 1.68.0

also fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,13 +13,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

From 97a3074c5ad5b229bdf7cfee5e2bdac2adb692f1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:45:32 +0200
Subject: [PATCH 061/404] gjs: update to 1.68.0.

---
 ...togenerate-accessors-for-CONSTRUCT_O.patch |  58 ++++++
 ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++
 ...verrides-Gio-Fix-_LocalFilePrototype.patch |  27 +++
 ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++
 srcpkgs/gjs/template                          |   5 +-
 5 files changed, 388 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
 create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
 create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
 create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch

diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
new file mode 100644
index 000000000000..0d54750c164b
--- /dev/null
+++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch
@@ -0,0 +1,58 @@
+From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:32:52 -0700
+Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY
+ properties
+
+Since we redefine CONSTRUCT_ONLY properties as readonly data properties
+when they are set, the autogenerated accessors would be wrong.
+
+See: #391
+---
+ installed-tests/js/testGObjectClass.js | 7 +++++++
+ modules/core/_common.js                | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index 4cf3a867..f0a57a84 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () {
+                 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48),
+             'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct',
+                 GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96),
++            'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only',
++                'Construct-only property',
++                GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
++                0, 100, 80),
+             'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name',
+                 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36),
+             'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name',
+@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () {
+ 
+     it("initial value is the param spec's default value", function () {
+         expect(a.simple).toEqual(24);
++        expect(a.long_long_name).toEqual(48);
++        expect(a.longLongName).toEqual(48);
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
++        expect(a.construct_only).toEqual(80);
+     });
+ 
+     it('notify when the property changes', function () {
+diff --git a/modules/core/_common.js b/modules/core/_common.js
+index 45bbefb7..edc70215 100644
+--- a/modules/core/_common.js
++++ b/modules/core/_common.js
+@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) {
+ 
+ function _checkAccessors(proto, pspec, GObject) {
+     const {name, flags} = pspec;
++    if (flags & GObject.ParamFlags.CONSTRUCT_ONLY)
++        return;
+ 
+     const underscoreName = name.replace(/-/g, '_');
+     const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase());
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
new file mode 100644
index 000000000000..b203743ac46c
--- /dev/null
+++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch
@@ -0,0 +1,124 @@
+From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 21 Mar 2021 11:37:58 -0700
+Subject: [PATCH 3/6] GObject: Define camel and kebab variants of
+ CONSTRUCT_ONLY properties
+
+Since we redefine CONSTRUCT_ONLY properties to be readonly data properties
+when they are set, we must also define camelCase and kebab-case variations
+in order to be consistent with the other property accessors.
+
+Closes: #391
+---
+ gi/gobject.cpp                         | 11 +++++++----
+ gjs/jsapi-util-string.cpp              | 21 +++++++++++++++++++++
+ gjs/jsapi-util.h                       |  1 +
+ installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++
+ 4 files changed, 48 insertions(+), 4 deletions(-)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index 27c7d13c..65ed6638 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object,
+ 
+     GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name);
+ 
+-    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+-        return JS_DefineProperty(
+-            cx, object, underscore_name, jsvalue,
+-            GJS_MODULE_PROP_FLAGS | JSPROP_READONLY);
++    if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) {
++        unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY;
++        GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name);
++        return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, camel_name, jsvalue, flags) &&
++               JS_DefineProperty(cx, object, pspec->name, jsvalue, flags);
++    }
+ 
+     return JS_SetProperty(cx, object, underscore_name, jsvalue);
+ }
+diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
+index e318b514..45f297a7 100644
+--- a/gjs/jsapi-util-string.cpp
++++ b/gjs/jsapi-util-string.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <config.h>
+ 
++#include <ctype.h>  // for toupper
+ #include <stdint.h>
+ #include <string.h>     // for size_t, strlen
+ #include <sys/types.h>  // for ssize_t
+@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) {
+     return retval;
+ }
+ 
++GjsAutoChar gjs_hyphen_to_camel(const char* str) {
++    GjsAutoChar retval = static_cast<char*>(g_malloc(strlen(str) + 1));
++    const char* input_iter = str;
++    char* output_iter = retval.get();
++    bool uppercase_next = false;
++    while (*input_iter != '\0') {
++        if (*input_iter == '-') {
++            uppercase_next = true;
++        } else if (uppercase_next) {
++            *output_iter++ = toupper(*input_iter);
++            uppercase_next = false;
++        } else {
++            *output_iter++ = *input_iter;
++        }
++        input_iter++;
++    }
++    *output_iter = '\0';
++    return retval;
++}
++
+ /**
+  * gjs_string_to_utf8:
+  * @cx: JSContext
+diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
+index 11c23776..a6b66261 100644
+--- a/gjs/jsapi-util.h
++++ b/gjs/jsapi-util.h
+@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext       *context,
+ [[nodiscard]] std::string gjs_debug_id(jsid id);
+ 
+ [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str);
++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str);
+ 
+ #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900))
+ [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str);
+diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js
+index f0a57a84..7073ccba 100644
+--- a/installed-tests/js/testGObjectClass.js
++++ b/installed-tests/js/testGObjectClass.js
+@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () {
+         expect(a['long-long-name']).toEqual(48);
+         expect(a.construct).toEqual(96);
+         expect(a.construct_only).toEqual(80);
++        expect(a.constructOnly).toEqual(80);
++        expect(a['construct-only']).toEqual(80);
++    });
++
++    it('set properties at construct time', function () {
++        a = new AutoAccessors({
++            simple: 1,
++            longLongName: 1,
++            construct: 1,
++            'construct-only': 1,
++        });
++        expect(a.simple).toEqual(1);
++        expect(a.long_long_name).toEqual(1);
++        expect(a.longLongName).toEqual(1);
++        expect(a['long-long-name']).toEqual(1);
++        expect(a.construct).toEqual(1);
++        expect(a.construct_only).toEqual(1);
++        expect(a.constructOnly).toEqual(1);
++        expect(a['construct-only']).toEqual(1);
+     });
+ 
+     it('notify when the property changes', function () {
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
new file mode 100644
index 000000000000..7dfcabf1e882
--- /dev/null
+++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch
@@ -0,0 +1,27 @@
+From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 24 Mar 2021 23:30:19 +0100
+Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype
+
+Recent GIO versions return a GDummyFile for '', which isn't the prototype
+people are expecting to promisify when using _LocalFilePrototype.
+---
+ modules/core/overrides/Gio.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js
+index 10872efb..d51738e0 100644
+--- a/modules/core/overrides/Gio.js
++++ b/modules/core/overrides/Gio.js
+@@ -495,7 +495,7 @@ function _init() {
+     Gio._promisify = _promisify;
+ 
+     // Temporary Gio.File.prototype fix
+-    Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype;
++    Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype;
+ 
+     // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if
+     // trying to access a nonexistent schema or key, which is not handy for
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
new file mode 100644
index 000000000000..cc8a14cb2780
--- /dev/null
+++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch
@@ -0,0 +1,176 @@
+From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 24 Mar 2021 18:06:06 +0100
+Subject: [PATCH 6/6] object: Return undefined and not the actual function on
+ disposed objects
+
+When calling a proto function on a disposed object we return true not to
+throw, however when doing this we implicitly return to JS the actual
+underlying function pointer and that may cause use the return value to
+be used to wrongly set a variable or to be wrongly evaluated.
+
+To avoid this and be consistent, return undefined instead.
+
+Adapt tests for this and add more for uncovered methods.
+
+Fixes #396
+---
+ gi/object.cpp                                 | 17 ++++++--
+ .../js/testGObjectDestructionAccess.js        | 41 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 9 deletions(-)
+
+diff --git a/gi/object.cpp b/gi/object.cpp
+index 598e6bb0..39ce7f5f 100644
+--- a/gi/object.cpp
++++ b/gi/object.cpp
+@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) {
+ 
+ bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name,
+                                       JS::MutableHandleValue rval) {
+-    if (!check_gobject_disposed("get any property from"))
++    if (!check_gobject_disposed("get any property from")) {
++        rval.setUndefined();
+         return true;
++    }
+ 
+     GValue gvalue = { 0, };
+ 
+@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext          *context,
+ 
+     gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this);
+ 
+-    if (!check_gobject_disposed("connect to any signal on"))
++    if (!check_gobject_disposed("connect to any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     JS::RootedObject callback(context);
+@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext          *context,
+     gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this,
+                       argv.length());
+ 
+-    if (!check_gobject_disposed("emit any signal on"))
++    if (!check_gobject_disposed("emit any signal on")) {
++        argv.rval().setUndefined();
+         return true;
++    }
+ 
+     JS::UniqueChars signal_name;
+     if (!gjs_parse_call_args(context, "emit", argv, "!s",
+@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) {
+     gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d",
+                       m_wrapper.get(), this, args.length());
+ 
+-    if (!check_gobject_disposed("find any signal on"))
++    if (!check_gobject_disposed("find any signal on")) {
++        args.rval().setInt32(0);
+         return true;
++    }
+ 
+     JS::RootedObject match(cx);
+     if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match",
+@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx,
+                       m_wrapper.get(), this, args.length());
+ 
+     if (!check_gobject_disposed((action_name + " any signal on").c_str())) {
++        args.rval().setInt32(0);
+         return true;
+     }
+     JS::RootedObject match(cx);
+diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js
+index ed1d6bb6..0b35d859 100644
+--- a/installed-tests/js/testGObjectDestructionAccess.js
++++ b/installed-tests/js/testGObjectDestructionAccess.js
+@@ -5,6 +5,7 @@
+ imports.gi.versions.Gtk = '3.0';
+ 
+ const GLib = imports.gi.GLib;
++const GObject = imports.gi.GObject;
+ const Gtk = imports.gi.Gtk;
+ 
+ describe('Access to destroyed GObject', function () {
+@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        void destroyedWindow.title;
++        expect(destroyedWindow.title).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectPropertyGet');
+@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             '*GTK_IS_WINDOW*');
+ 
+-        void destroyedWindow.get_title();
++        expect(destroyedWindow.get_title()).toBeNull();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectMethodGet');
+@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect('foo-signal', () => {});
++        expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnect');
+@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.connect_after('foo-signal', () => {});
++        expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0);
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectConnectAfter');
+@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () {
+         GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
+             'Object Gtk.Window (0x*');
+ 
+-        destroyedWindow.emit('foo-signal');
++        expect(destroyedWindow.emit('foo-signal')).toBeUndefined();
+ 
+         GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
+             'testExceptionInDestroyedObjectEmit');
+     });
+ 
++    it('Proto function signals_disconnect', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsDisconnect');
++    });
++
++    it('Proto function signals_block', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsBlock');
++    });
++
++    it('Proto function signals_unblock', function () {
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL,
++            'Object Gtk.Window (0x*');
++
++        expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0);
++
++        GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0,
++            'testExceptionInDestroyedObjectSignalsUnblock');
++    });
++
+     it('Proto function toString', function () {
+         expect(destroyedWindow.toString()).toMatch(
+             /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/);
+-- 
+2.30.2
+
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 8a133dd8048b..db1396392446 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.66.0
+version=1.68.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -14,7 +14,8 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
+checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef
+patch_args="-Np1"
 
 post_install() {
 	vlicense COPYING

From 72a52f455bde45243be1b0494c608db3d4a04e67 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:54:05 +0200
Subject: [PATCH 062/404] glib: update to 2.68.0.

* disable broken tests on musl

* add backport fix.
---
 common/shlibs                                 |  10 +-
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  28 +++-
 srcpkgs/glib/template                         |   6 +-
 srcpkgs/glib/update                           |   1 +
 5 files changed, 160 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index 3de3beefd5cb..3e262983eb1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +28,24 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +53,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +61,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From c7f79eb3be3ca4e64a418fcbe9bbc08824ac0ba3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 063/404] glib-networking: update to 2.68.0.

---
 srcpkgs/glib-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 96f312cff4d8..fdb7fbfe8d1a 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.66.0
+version=2.68.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

From e93efabe9b8428073c79989b8bfa0128ef046de8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:56:16 +0200
Subject: [PATCH 064/404] gnome-backgrounds: update to 40.rc.

---
 srcpkgs/gnome-backgrounds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

From 6a1e02ca921107c990230f42970e44f335d0ffc0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:06:39 +0200
Subject: [PATCH 065/404] gnome-initial-setup: update to 40.0.

---
 srcpkgs/gnome-initial-setup/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 35e323179b97..b5f24d939993 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled
@@ -18,4 +18,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200
+checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f

From 8a425cca1013cd3c58133f04ce00897f05ba12aa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:44:49 +0200
Subject: [PATCH 066/404] evolution-data-server: update to 3.40.0.

---
 common/shlibs                          | 4 ++--
 srcpkgs/evolution-data-server/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3e262983eb1a..66f4c7c67dab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -601,9 +601,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
 libcamel-1.2.so.62 evolution-data-server-3.30.0_1
-libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
+libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
+libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
 libebook-1.2.so.20 evolution-data-server-3.34.0_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8c3709f20d98..7b12f118f94f 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445
 
 build_options="gir"
 build_options_default="gir"

From 593280ae759d966965ec1bebda09fd6a987a731a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:31 +0200
Subject: [PATCH 067/404] evolution: update to 3.40.0.

---
 common/shlibs              | 1 +
 srcpkgs/evolution/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 66f4c7c67dab..f6410b689142 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -612,6 +612,7 @@ libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
 libgdata.so.22 libgdata-0.17.9_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index e608802a768a..f3b3656921bb 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.38.4
+version=3.40.0
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4
+checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so"
 

From 7a4be07b34fb60752176e3a88258fadd79556786 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:53:43 +0200
Subject: [PATCH 068/404] io.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calculator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index c39cde8fed5a..56abf698403b 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
 version=1.6.0
-revision=1
+revision=2
 wrksrc="calculator-${version}"
 build_style=meson
 hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"

From aa729c90d1e0c9d3ca990bb8f9a1bce754168701 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:54:18 +0200
Subject: [PATCH 069/404] libio.elementary.calculator: rebuild with
 evolution-data-server-3.40.0

---
 srcpkgs/io.elementary.calendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index e8320792a1e5..7ff446f97d15 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
 version=5.0
-revision=4
+revision=5
 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
 wrksrc="calendar-${_git_commit}"
 build_style=meson

From 316d660fb4a03818359878de7b5f8c888a55579c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:37 +0200
Subject: [PATCH 070/404] evolution-ews: update to 3.40.0.

---
 srcpkgs/evolution-ews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index bfb928598ea4..5433eabac6b2 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3
+checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53

From 0dbf88881d9aef053329a48e300d9499343975a3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:56:45 +0200
Subject: [PATCH 071/404] bijiben: update to 40.0.

---
 srcpkgs/bijiben/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 8f3f231f77e0..cc4903f53df4 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,13 +1,13 @@
 # Template file for 'bijiben'
 pkgname=bijiben
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dzeitgeist=true"
 hostmakedepends="itstool pkg-config gettext glib-devel"
 makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 zeitgeist"
 short_desc="Intuitive note editor with strong GNOME desktop integration"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Notes"
 changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b
+checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25
 
 pre_build() {
 	ninja -C build src/libbiji/biji-marshalers.h

From f7e38b8e374bc8103dd24cac076c8c700d1d3a63 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:07 +0200
Subject: [PATCH 072/404] python3-gobject: update to 3.40.1.

fix tests
---
 srcpkgs/python3-gobject/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

From f459da4be85b1a771d4c13965cf5a7fd1c6c9766 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 13:57:48 +0200
Subject: [PATCH 073/404] folks: update to 0.14.0.

---
 srcpkgs/folks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 0a120ec6d11b..bc9be3932e36 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.14.0
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Db_lto=false"

From ad5f932032528f4af986bee847152755627648e7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:03:20 +0200
Subject: [PATCH 074/404] gnome-calendar: update to 40.0.

---
 srcpkgs/gnome-calendar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 9e8666d3109e..5956653165a6 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')"
 makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
- gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy-devel
+ gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel
  libgweather-devel libical-devel libpeas-devel libsoup-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
 changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d
+checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434
 
 build_options="gir"
 build_options_default="gir"

From d6e7295ef9de7df055a4e14fc6a48b1ebed643ab Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:08:45 +0200
Subject: [PATCH 075/404] gnome-contacts: update to 40.0.

---
 srcpkgs/gnome-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 1bda8a3708eb..bba06e594d27 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
@@ -12,4 +12,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843
+checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70

From 61b8fa9421db0ca8008a5f6cbf764de67ae171d2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:50:25 +0200
Subject: [PATCH 076/404] gnome-todo: update to 3.28.1.

---
 srcpkgs/gnome-todo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template
index c6c4bd2af863..56bd6a405af2 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/gnome-todo/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-todo'
 pkgname=gnome-todo
 version=3.28.1
-revision=6
+revision=7
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 799e2f8d46f4f9240bb7295454961eb1cd1e4d8a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:59:40 +0200
Subject: [PATCH 077/404] gnome-panel: update to 3.40.0.

---
 srcpkgs/gnome-panel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 9a7593f3a34b..315d4fc1f468 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15
+checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b
 patch_args="-Np1"
 
 gnome-panel-devel_package() {

From dae65fe129f0fc58a62b6a43a822511662e49dd9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:02:48 +0200
Subject: [PATCH 078/404] gnome-keyring: update to 40.0.

---
 .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------
 srcpkgs/gnome-keyring/template                |   6 +-
 2 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch

diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
deleted file mode 100644
index 2b0c3ba92d6c..000000000000
--- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <sgrubb@redhat.com>
-Date: Fri, 20 Nov 2020 11:52:14 -0500
-Subject: [PATCH] Update libcap-ng capability handling
-
-There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not
-work correctly. The capng_apply function now returns an error if it
-cannot change the bounding set. Previously this was ignored. Which means
-now gnome-keyring exits when it shouldn't.
-
-The new patch adds troubleshooting info to the error messages. And it checks
-to see if we have CAP_SETPCAP. If we do not, then we cannot change the
-bounding set and just set capabilities. On the setuid side, it now drops
-the bounding set and clears any supplemental groups that may be left over
-as an accident.
----
- daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++---------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git daemon/gkd-capability.c daemon/gkd-capability.c
-index 9afe3039..6eb7ed75 100644
---- daemon/gkd-capability.c
-+++ daemon/gkd-capability.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
- /* gkd-capability.c - the security-critical initial phase of the daemon
-  *
-- * Copyright (C) 2011 Steve Grubb
-+ * Copyright (C) 2011,2020 Steve Grubb
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as
-@@ -35,9 +35,10 @@
- 
- /* No logging, no gettext */
- static void
--early_error (const char *err_string)
-+early_error (const char *err_string, int rc)
- {
--	fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string);
-+	fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n",
-+		err_string, rc);
- 	exit (1);
- }
- 
-@@ -64,6 +65,8 @@ void
- gkd_capability_obtain_capability_and_drop_privileges (void)
- {
- #ifdef HAVE_LIBCAPNG
-+	int rc;
-+
- 	capng_get_caps_process ();
- 	switch (capng_have_capabilities (CAPNG_SELECT_CAPS))
- 	{
-@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void)
- 			capng_update (CAPNG_ADD,
- 					CAPNG_EFFECTIVE|CAPNG_PERMITTED,
- 					CAP_IPC_LOCK);
--			if (capng_change_id (getuid (), getgid (), 0))
--				early_error ("failed dropping capabilities");
-+			if ((rc = capng_change_id (getuid (), getgid (),
-+						   CAPNG_DROP_SUPP_GRP|
-+						   CAPNG_CLEAR_BOUNDING))) {
-+				early_error ("failed dropping capabilities",
-+					     rc);
-+			}
- 			break;
- 		case CAPNG_FAIL:
--			early_error ("error getting process capabilities");
-+			early_error ("error getting process capabilities", 0);
- 			break;
- 		case CAPNG_NONE:
--			early_warning ("insufficient process capabilities, insecure memory might get used");
-+			early_warning ("no process capabilities, insecure memory might get used");
- 			break;
--		case CAPNG_PARTIAL: /* File system based capabilities */
--			if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) {
-+		case CAPNG_PARTIAL: { /* File system based capabilities */
-+			capng_select_t set = CAPNG_SELECT_CAPS;
-+			if (!capng_have_capability (CAPNG_EFFECTIVE,
-+							    CAP_IPC_LOCK)) {
- 				early_warning ("insufficient process capabilities, insecure memory might get used");
--				/* Drop all capabilities */
--				capng_clear (CAPNG_SELECT_BOTH);
--				capng_apply (CAPNG_SELECT_BOTH);
--				break;
- 			}
- 
--			/* Drop all capabilities except ipc_lock */
-+			/* If we don't have CAP_SETPCAP, we can't update the
-+			 * bounding set */
-+			if (capng_have_capability (CAPNG_EFFECTIVE,
-+								CAP_SETPCAP)) {
-+				set = CAPNG_SELECT_BOTH;
-+			}
-+
-+			 /* Drop all capabilities except ipc_lock */
- 			capng_clear (CAPNG_SELECT_BOTH);
--			if (capng_update (CAPNG_ADD,
--					  CAPNG_EFFECTIVE|CAPNG_PERMITTED,
--					  CAP_IPC_LOCK) != 0)
--				early_error ("error dropping process capabilities");
--			if (capng_apply (CAPNG_SELECT_BOTH) != 0)
--				early_error ("error dropping process capabilities");
-+			if ((rc = capng_update (CAPNG_ADD,
-+						CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+						CAP_IPC_LOCK)) != 0) {
-+				early_error ("error updating process capabilities", rc);
-+			}
-+			if ((rc = capng_apply (set)) != 0) {
-+				early_error ("error dropping process capabilities", rc);
-+			}} /* Extra brace for local variable declaration */
- 			break;
- 	}
- #endif /* HAVE_LIBCAPNG */
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index e7bf221fb33f..b8defd1997dd 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-keyring'
 pkgname=gnome-keyring
-version=3.36.0
-revision=2
+version=40.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
 hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS"
 homepage="https://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87
+checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931
 lib32disabled=yes
 
 do_check() {

From b4cb4e0fb2fd9bf97139af4031e2d7fc4105f43f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 079/404] gnome-user-docs: update to 40.0.

---
 srcpkgs/gnome-user-docs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index a4ab3218bd75..8edb370dc144 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

From af0d62717087376c434bea51d87eebf15304c30a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:33:25 +0200
Subject: [PATCH 080/404] libgdata: update to 0.18.1.

---
 srcpkgs/libgdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 870a1633c70c..835f82f7fa98 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,6 +1,6 @@
 # Template file for 'libgdata'
 pkgname=libgdata
-version=0.17.12
+version=0.18.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318
+checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"
 build_options_default="gir vala"

From ad3be19ffedcd0e6d13cfe9c02740a87f59e4035 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:35:03 +0200
Subject: [PATCH 081/404] gvfs: update to 1.48.0.

---
 srcpkgs/gvfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index dc487d8e136d..c84f9c756ae3 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.46.1
-revision=2
+version=1.48.0
+revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/raw/gnome-3-34/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503
+checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"

From 7269c5b867ec6221b85be998ce1e630ecd68a90b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:49:25 +0200
Subject: [PATCH 082/404] nautilus: update to 40.0.

---
 srcpkgs/nautilus/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index e6d843249a60..e47bd77c5f9f 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,6 +1,6 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext glib-devel libxslt pkg-config tracker3"
 makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
- libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel"
+ libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel
+ libhandy1-devel libportal-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker3-miners tracker3"
 checkdepends="tracker3 tracker3-miners python3-gobject dbus"
@@ -16,8 +17,8 @@ short_desc="GNOME file manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
-distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz"
-checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended

From ee8861baa46c4a60977ac799ad700f5b5d616676 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 083/404] yelp-xsl: update to 40.0.

---
 srcpkgs/yelp-xsl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 88899d2ed720..3feefeb7a097 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

From 46fbefaf5b304ca3daff388c3ef88847bd0ffe4b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:01:16 +0200
Subject: [PATCH 084/404] yelp-tools: update to 40.0.

---
 srcpkgs/yelp-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

From 601f15c1ac039a94526ac03ec78cc17520dfbfea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:04:57 +0200
Subject: [PATCH 085/404] yelp: update to 40.0.

---
 srcpkgs/yelp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From 11cb9e2b9e70e49975400759e73f93e34667f36e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 086/404] gnome-shell-extensions: update to 40.0.

---
 srcpkgs/gnome-shell-extensions/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 4ea740326654..ba043950982e 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

From 1ef98333c21c67b2a84f95d680c7964b13e73ad4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:15:27 +0200
Subject: [PATCH 087/404] eog: update to 40.0.

---
 srcpkgs/eog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From bf76a1aa961096ed6bd82ff749fe2d523ee24574 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 088/404] eog-plugins: update to 3.26.7.

---
 srcpkgs/eog-plugins/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
-python_version=2 #unverified
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
+python_version=3
 lib32disabled=yes

From 5d88d8ea3eafcfb86da8d8544062cb9c3dd16c68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:19:04 +0200
Subject: [PATCH 089/404] evince: update to 40.1.

---
 srcpkgs/evince/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index fa19b7bf1c40..08abe9e5ab8a 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,6 +1,6 @@
 # Template file for 'evince'
 pkgname=evince
-version=3.38.2
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
  libgxps-devel libsecret-devel libspectre-devel nautilus-devel
- poppler-glib-devel gspell-devel gst-plugins-base1-devel"
+ poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evince"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94
+checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 311f7b0405b96dc3bd989d3e07ddf71d8ccbf90c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:22 +0200
Subject: [PATCH 090/404] tepl: update to 6.00.0.

---
 common/shlibs         | 2 +-
 srcpkgs/tepl/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f6410b689142..874bd3ba6053 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3447,7 +3447,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-5.so.0 tepl-4.2.0_1
+libtepl-6.so.0 tepl-6.00.0_1
 libnomacsCore.so.3 nomacs-3.10.2_4
 libaudit.so.1 libaudit-2.8.4_1
 libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 798d5cd00775..2213a79cc0f1 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
 # Template file for 'tepl'
 pkgname=tepl
-version=5.0.0
+version=6.00.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Tepl"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74
+checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
 
 build_options="gir"
 build_options_default="gir"

From 0c41499d35dc36dd83bce96ad6fc878be4fd9962 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 091/404] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

From 8012c4b05a2f97f115a0bf7bd1395291d5f2e580 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:28:33 +0200
Subject: [PATCH 092/404] gedit: update to 40.0.

---
 common/shlibs          | 2 +-
 srcpkgs/gedit/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 874bd3ba6053..db975d7164c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3566,7 +3566,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
 libyang.so.1 libyang-1.0r5_1
 libhtp.so.2 libhtp-0.5.30_1
-libgedit-3.38.so gedit-3.37.3_1
+libgedit-40.0.so gedit-40.0_1
 libchewing.so.3 libchewing-0.5.1_1
 libdwarves.so.1 pahole-1.12_1
 libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index f73d3735b645..8ec2ec020a9b 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,8 +17,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d
-shlib_provides="libgedit-3.38.so"
+checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+shlib_provides="libgedit-40.0.so"
 python_version=3
 
 build_options="gir"

From 9801d2dec438bcb039e031fe3d7a9bba3a6f03a6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:11:49 +0200
Subject: [PATCH 093/404] gedit-plugins: update to 40.0.

---
 srcpkgs/gedit-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index e288f0d3812b..5bbd7832900b 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit-plugins'
 pkgname=gedit-plugins
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf
+checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641
 python_version=3

From 7e3a1d524e35fcf0e15942b8039a966785d7ef9d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:04 +0200
Subject: [PATCH 094/404] gnome-disk-utility: update to 40.0.

---
 srcpkgs/gnome-disk-utility/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index d90f7d7d9fc4..4c94a74f037a 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,17 +1,18 @@
 # Template file for 'gnome-disk-utility'
 pkgname=gnome-disk-utility
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dlogind=none"
 hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
 makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
- libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel"
+ libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
+ libhandy1-devel"
 depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
 short_desc="GNOME libraries and applications for dealing with storage devices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Disks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9
+checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897
 lib32disabled=yes

From 7d5edf04c8ec107935f8eb61232581a0f931b501 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:19 +0200
Subject: [PATCH 095/404] baobab: update to 40.0.

---
 srcpkgs/baobab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 882155356a45..f6264797e694 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,14 +1,14 @@
 # Template file for 'baobab'
 pkgname=baobab
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel vala"
-makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel"
+makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel"
 depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14"
 short_desc="Graphical directory tree analyzer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329
+checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7

From 55d9421ade7e27f6defbf4e9040690c42aafa6f0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:27 +0200
Subject: [PATCH 096/404] gnome-calculator: update to 40.0.

---
 srcpkgs/gnome-calculator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
 makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel"
+ libmpc-devel libsoup-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

From 7ce78531bdf2634343292da4fa99335d5dd08f16 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:38 +0200
Subject: [PATCH 097/404] gnome-characters: update to 40.0.

---
 srcpkgs/gnome-characters/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index ac264e51a6af..472b961b1eeb 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-characters'
 pkgname=gnome-characters
-version=3.34.0
-revision=3
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext gjs glib-devel itstool pkg-config"
-makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel"
+makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel"
 depends="gnome-desktop gjs"
 short_desc="Utility to find and insert unusual characters for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57
+checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c
 lib32disabled=yes

From 5c26f6a0078cc7c02b177d0df0f8b53bf0d7e332 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:38:46 +0200
Subject: [PATCH 098/404] gnome-clocks: update to 40.0.

---
 srcpkgs/gnome-clocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

From d014dc81cf6505d03ddc43c23465acea2015e14c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:07 +0200
Subject: [PATCH 099/404] gnome-font-viewer: update to 40.0.

---
 srcpkgs/gnome-font-viewer/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index f74fcbcb000e..92748bbb386e 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel"
 makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel
- gnome-desktop-devel harfbuzz-devel"
+ gnome-desktop-devel harfbuzz-devel libhandy1-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b
+checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42

From 3320ae58572e86ff7c863e347a9d08ab07904965 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:14 +0200
Subject: [PATCH 100/404] gnome-maps: update to 40.0.

---
 srcpkgs/gnome-maps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index fa518223ce79..04fa87106e7a 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-maps'
 pkgname=gnome-maps
-version=3.38.4
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,4 +13,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Maps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3
+checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49

From c524423640b76efbb421ad9b6c5bb5db4900b395 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:19 +0200
Subject: [PATCH 101/404] gnome-music: update to 40.0.

---
 srcpkgs/gnome-music/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index cba2e901581a..40244199bba1 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Music"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030
+checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6
 lib32disabled=yes

From 38083ce107a82b08a21f79a2ed187e94f4776137 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:24 +0200
Subject: [PATCH 102/404] gnome-screenshot: update to 40.0.

---
 srcpkgs/gnome-screenshot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 0a5511db2173..579db2f88827 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-screenshot'
 pkgname=gnome-screenshot
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0
+checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2

From 0ee28f2cb777522722c2921ce6cd45515c8e5a25 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:49:30 +0200
Subject: [PATCH 103/404] gnome-system-monitor: update to 40.0.

---
 srcpkgs/gnome-system-monitor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index 069637e231c0..ecde52ba4395 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -1,14 +1,14 @@
 # Template file for 'gnome-system-monitor'
 pkgname=gnome-system-monitor
-version=3.38.0
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="pkg-config intltool itstool glib-devel polkit"
-makedepends="gtkmm-devel librsvg-devel libgtop-devel"
+makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel"
 short_desc="Process viewer and system resource monitor for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SystemMonitor"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4
+checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756

From 8e4b7f8eb6cf9083b039fc433bd60589f529c8a5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:22 +0200
Subject: [PATCH 104/404] vte3: update to 0.63.91.

---
 srcpkgs/vte3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 90278ecf1523..300f20e19e8e 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.62.1
+version=0.63.91
 revision=1
 wrksrc="vte-${version}"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
 distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d
+checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 5be591b9f300c80945c8d499f680aa46578ecd39 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:54:26 +0200
Subject: [PATCH 105/404] gnome-terminal: update to 3.40.0.

---
 srcpkgs/gnome-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 303ad85bdb18..4430ac709829 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

From c95d0a6c2609ddcaf001a22e7a0c29850bbff6b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:55:55 +0200
Subject: [PATCH 106/404] gnome-tweaks: update to 40.0.

---
 srcpkgs/gnome-tweaks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index d07507984433..10e7a38cf566 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
-version=3.34.1
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later, CC0-1.0"
 homepage="https://wiki.gnome.org/Apps/Tweaks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7
+checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {

From 119fc963fbc43ae7fcf122562a762e87c7d8b829 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 107/404] gnome-weather: update to 40.0.

---
 srcpkgs/gnome-weather/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index c028e46ba65d..f70aa2c3410e 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-weather'
 pkgname=gnome-weather
-version=3.36.1
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel gjs"
-makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel"
+makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel"
 depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop"
 short_desc="Access current weather conditions and forecasts for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Weather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787
+checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef
 lib32disabled=yes

From 12bcb837931b0f26541423b4170bfd048d453707 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:59:26 +0200
Subject: [PATCH 108/404] gspell: update to 1.8.4.

---
 srcpkgs/gspell/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -9,17 +9,22 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6402892b3a234a65f9e7304bb586521375a034f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:03:01 +0200
Subject: [PATCH 109/404] orca: update to 40.0.

---
 srcpkgs/orca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 21f6450b37d0..58c745b3d803 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,6 +1,6 @@
 # Template file for 'orca'
 pkgname=orca
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c
+checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From bd3989fc18ff5eb134a49fbebafb5b4b9a04c360 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 17:07:12 +0200
Subject: [PATCH 110/404] simple-scan: update to 40.0.

---
 srcpkgs/simple-scan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b9df63878f87..4702a74b46b8 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -1,14 +1,14 @@
 # Template file for 'simple-scan'
 pkgname=simple-scan
-version=3.38.5
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel "
+makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel"
 depends="hicolor-icon-theme sane"
 short_desc="GTK Simple scanning utility"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/simple-scan"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d
+checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af

From ad48f2ebc1bc5dcf6e8d3f5a4d749ec831aad4b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 111/404] gnome-builder: update to 3.40.0.

---
 srcpkgs/gnome-builder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
 changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

From c615f5094f502ee3724d41a0fcad897c2f5f8588 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:39 +0200
Subject: [PATCH 112/404] libvirt-glib: update to 4.0.0.

* make gtk doc a build_option to fix cross. Default is off.
---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 +++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 22 +++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff
new file mode 100644
index 000000000000..9ce7da845c3e
--- /dev/null
+++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff
@@ -0,0 +1,20 @@
+--- meson.build.orig	2021-04-05 19:05:59.233949995 +0200
++++ meson.build	2021-04-05 19:06:10.010949599 +0200
+@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti
+ 
+ # gobject introspection
+ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+-enable_introspection = gir.found() and not meson.is_cross_build()
++enable_introspection = gir.found()
+ 
+ # vala
+ vapi_opt = get_option('vapi')
+@@ -76,7 +76,7 @@ endif
+ # gtk-doc
+ if not get_option('docs').disabled()
+   gtk_doc = find_program('gtkdoc-scan', required: get_option('docs'))
+-  enable_doc = gtk_doc.found() and not meson.is_cross_build()
++  enable_doc = gtk_doc.found()
+ else
+   enable_doc = false
+ endif
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 5dbae0eed23c..032188df7f73 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -1,23 +1,23 @@
 # Template file for 'libvirt-glib'
 pkgname=libvirt-glib
-version=3.0.0
+version=4.0.0
 revision=1
 build_helper="gir"
-build_style=gnu-configure
-configure_args="--disable-static $(vopt_enable gir introspection)
- $(vopt_enable vala)"
-hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc
- python-devel $(vopt_if vala vala)"
+build_style=meson
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)"
+hostmakedepends="automake pkg-config intltool glib-devel gettext-devel
+ python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
 makedepends="libglib-devel libvirt-devel libxml2-devel python-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
-distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz"
-checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe
+distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz"
+checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd
 replaces="libvirt-glib-python>=0"
 
-build_options="gir vala"
+build_options="doc gir vala"
 build_options_default="gir vala"
 
 libvirt-glib-devel_package() {
@@ -27,7 +27,9 @@ libvirt-glib-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
+		if [ "$build_option_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala

From b45bbd190f433c06f5104b9a8e5f132a1570fb44 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:58:55 +0200
Subject: [PATCH 113/404] gnome-sound-recorder: update to 40.0.

---
 srcpkgs/gnome-sound-recorder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template
index 2378517ae3f4..24431907839c 100644
--- a/srcpkgs/gnome-sound-recorder/template
+++ b/srcpkgs/gnome-sound-recorder/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-sound-recorder'
 pkgname=gnome-sound-recorder
-version=3.38.1
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/SoundRecorder"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521
+checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501
 lib32disabled=yes

From b426e4c91c4414a97c6695f8f9e704d27cd26635 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:09 +0200
Subject: [PATCH 114/404] gnome-dictionary: update to 40.0.

---
 srcpkgs/gnome-dictionary/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 111d3bb484aa..15de25089c21 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-dictionary'
 pkgname=gnome-dictionary
-version=3.26.1
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel gsettings-desktop-schemas-devel"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dictionary"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300
+checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5
 replaces="gnome-utils>=3.0"
 
 post_install() {

From 0753bccee603c94c1b771311040e5e89fd633fb7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:16 +0200
Subject: [PATCH 115/404] gnome-boxes: update to 40.0.

---
 srcpkgs/gnome-boxes/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index e51d2d19a5d7..86f01ea8432f 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-boxes'
 pkgname=gnome-boxes
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -8,13 +8,13 @@ hostmakedepends="gettext itstool pkg-config vala glib-devel"
 makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel
  libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel
  libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol
- tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel
- libhandy-devel"
-depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker"
+ vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel
+ tracker3-devel"
+depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3"
 short_desc="GNOME 3 application to access remote or virtual systems"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Boxes"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b
+checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5

From b375e61883ee0262f0f6b72e81438bb8a0ea5541 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:24 +0200
Subject: [PATCH 116/404] epiphany: update to 40.0.

---
 srcpkgs/epiphany/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 7b8c824af59e..db7e343e5c9b 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,6 +1,6 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
  gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
  libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel"
+ nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel
+ libarchive-devel"
 depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk"
 short_desc="Intuitive GNOME web browser"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,4 +18,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Web"
 changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275
+checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844

From e8f5cc3207b471ab8847251d707773f8bc9c1827 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 117/404] gnome-books: update to 40.0.

---
 srcpkgs/gnome-books/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
  gettext appstream-glib desktop-file-utils"
-makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel tracker-devel
- gnome-desktop-devel evince-devel libgepub-devel"
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
+ gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
+checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130

From 40cee3622c4108c70eff7b096f904edf3fc53804 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 118/404] gnome-bluetooth: update to 3.34.5.

* fix tests
---
 srcpkgs/gnome-bluetooth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.3
+version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -10,12 +10,13 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
 
 build_options="gir"
 build_options_default="gir"

From 539be8bb43e4759eb8adbbaccdff987f239c58f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 119/404] gnome-usage: update to 3.38.1.

---
 srcpkgs/gnome-usage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index 5ece1950473b..d57dd57a1c82 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-usage'
 pkgname=gnome-usage
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala gettext"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Usage"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57
+checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393

From 756e29e9bdbc0760c37cbf4d946d2d13e8b40f42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 120/404] gnote: update to 40.0.

---
 srcpkgs/gnote/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 0ed64fd9239b..e2e25c08375f 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
 # Template file for 'gnote'
 pkgname=gnote
-version=3.38.1
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gnote"
 distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9
+checksum=e224caf8bb433dec9a2258ea2f8739afabde577210e7fb17596614569f7d0b3b
 lib32disabled=yes

From f578ff6b5e9dc3b80217af6a6ff02c473a1499af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 121/404] gtk+3: update to 3.24.28.

---
 srcpkgs/gtk+3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 03f4a90c4992..60c6459b24b5 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.26
+version=3.24.28
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -28,7 +28,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9
+checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

From 7a801e75233302d514caa2807c4e6ac6e052479d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 122/404] gtkmm: update to 3.24.4.

---
 srcpkgs/gtkmm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 8efe5d72596d..d3beee8a20aa 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.3
+version=3.24.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config mm-common gdk-pixbuf"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
+checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743
 
 do_check() {
 	xvfb-run ninja -C build test

From 77ccdc5f5388d567c3951662a675d1ef6f626b8c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 123/404] gtranslator: update to 40.0.

---
 srcpkgs/gtranslator/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index f9f9d0e3bc13..9f5b702461df 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,15 +1,16 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
  gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel"
+ libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
+ libhandy1-devel"
 short_desc="GNOME translation making program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gtranslator"
 distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635
+checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834

From 9cb2147009303e0379cb0061e472a42b051be1d8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 124/404] jsonrpc-glib: update to 3.38.0.

---
 srcpkgs/jsonrpc-glib/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.32.0
-revision=2
+version=3.38.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-32/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=bc60aa36c8bdc9c701ad490508445633a9f3973ae0bd5bdd0633d5f6ffeea6eb
+checksum=dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82
 
 build_options="gir vala"
 build_options_default="gir vala"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From 97ae6419492f7d6d246bd3ea94d97b234094e79d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 125/404] libdazzle: update to 3.40.0.

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 9b807be94745..334e0f6a5433 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f
+checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5
 
 build_options="gir"
 build_options_default="gir"

From fe259e15f8631ed38e12200d12c93b05517f3b49 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 126/404] libmanette: update to 0.2.6.

---
 srcpkgs/libmanette/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index c05dff01bf1c..cdf3888ac140 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.5
+version=0.2.6
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
+checksum=63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From c7a9bf79e276bcded6c9895c8dcfe856531b1fcb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 127/404] libgudev: update to 236.

---
 srcpkgs/libgudev/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 7f95c3ee2db9..47d1b8fc365d 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,20 +1,21 @@
 # Template file for 'libgudev'
 pkgname=libgudev
-version=233
+version=236
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-umockdev"
-hostmakedepends="pkg-config glib-devel"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvala=$(vopt_if vala enabled disabled)"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://wiki.gnome.org/Projects/libgudev"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03
+checksum=e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524
 
-build_options="gir"
+build_options="gir vala"
 build_options_default="gir"
 
 replaces="eudev-libgudev>=0"
@@ -27,6 +28,9 @@ libgudev-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi

From d65cee7e50b18168c883e2c625e639ae97729697 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 128/404] metacity: update to 3.40.0.

---
 srcpkgs/metacity/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 643ee4396b95..51904e577fbb 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,6 +1,6 @@
 # Template file for 'metacity'
 pkgname=metacity
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/metacity"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81193121b0d85dc93fef5701c00d0caf5313d10d9b19008403a4286cb04e11ac
+checksum=224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5

From 5908fd4b68f35369f9b4adcc6538c0299f5ddc6f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 129/404] retro-gtk: update to 1.0.2.

---
 srcpkgs/retro-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 04ad9cf051b0..6fbb483b6e51 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=1.0.0
+version=1.0.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5c7437a768125a6f627d063ed890e9328d4108db52a6d5aa10e52d2f25bb88db
+checksum=7118b0b5f9c1f2f0bc742faf8689eb48b44833efada0f6dbce990ec9783bcbd2
 
 build_options="gir"
 build_options_default="gir"

From cbabb484feb7bed500b6a33e539460ed621630cb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 130/404] libpeas: update to 1.30.0.

* fix tests
---
 srcpkgs/libpeas/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.26.0
-revision=2
+version=1.30.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376
+checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From a96672a6c53c3865cfb6880e4c7e4ce10df7cf70 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 131/404] libgexiv2: update to 0.12.2.

---
 srcpkgs/libgexiv2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index d1e5e2f53046..41b9138d7f4e 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgexiv2'
 pkgname=libgexiv2
-version=0.12.1
+version=0.12.2
 revision=1
 wrksrc="${pkgname/lib/}-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gexiv2"
 distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz"
-checksum=8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77
+checksum=2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c
 
 build_options="gir vala"
 build_options_default="gir vala"

From 6d1835aea189d70aa4c2dca6a399b61cda7f4022 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 132/404] gnome-getting-started-docs: remove, no longer part of
 gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

From 5f0b3fc078fb7dea6bc8a941109074a0602a8166 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:14:51 +0200
Subject: [PATCH 133/404] removed-packaes: add gnome-getting-started-docs

---
 srcpkgs/removed-packages/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 79e7c4d1c77e..3dee863e0d27 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=40
+revision=41
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -67,6 +67,7 @@ replaces="
  geoip-data<=20171002_2
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
+ gnome-getting-started-docs<=3.38.1_1
  gnome-twitch<=0.4.2_1
  go1.4-bootstrap<=20171003_2
  goat<=0.0.0.28022016_10

From d3d4e080db8609a10741a2c153b9a14d2e90073e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 134/404] libgxps: update to 0.3.2.

---
 srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 --------------
 srcpkgs/libgxps/template                    |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch

diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch
deleted file mode 100644
index 4685b98184d9..000000000000
--- a/srcpkgs/libgxps/patches/fix-gir-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a34a616..2d6eb1e 100644
---- meson.build
-+++ meson.build
-@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false)
- 
- gnome = import('gnome')
- gir = find_program('g-ir-scanner', required: false)
--build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection')
-+build_gir = gir.found() and not get_option('disable-introspection')
- 
- configure_file(output: 'config.h', configuration: cdata)
- 
-
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index 6a353e1ca812..075c6e54e446 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -1,7 +1,7 @@
 # Template file for 'libgxps'
 pkgname=libgxps
-version=0.3.1
-revision=3
+version=0.3.2
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-test=false
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgxps"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94
+checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c
 
 # Package build options
 build_options="gir"

From ef4b2bd0ee5a70e3507a9bc111d36d8c8d69b48b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:40 +0200
Subject: [PATCH 135/404] gnome-core: update to 40.0.

---
 srcpkgs/gnome-core/template | 57 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 075bd15cdd37..fedf6b594530 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=3.38.0
-revision=3
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
 maintainer="q66 <daniel@octaforge.org>"
@@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
 depends="
- adwaita-icon-theme>=3.38.0
- at-spi2-core>=2.38.0
+ adwaita-icon-theme>=40.rc
+ at-spi2-core>=2.40.0
  at-spi2-atk>=2.38.0
- cantarell-fonts>=0.201
- dconf>=0.36.0
- evolution-data-server>=3.38.0
+ cantarell-fonts>=0.301
+ dconf>=0.40.0
+ evolution-data-server>=3.40.0
  folks>=0.14.0
  font-adobe-source-code-pro>=2.030R
- gcr>=3.38.0
- gdm>=3.38.0
- geocode-glib>=3.26.0
+ gcr>=3.40.0
+ gdm>=3.40.0
+ geocode-glib>=3.26.2
  gfbgraph>=0.2.4
- gjs>=1.66.0
- glib>=2.66.0
- glib-networking>=2.66.0
+ gjs>=1.68.0
+ glib>=2.68.0
+ glib-networking>=2.68.0
  gmime3>=3.2.7
- gnome-backgrounds>=3.38.0
- gnome-bluetooth>=3.34.1
+ gnome-backgrounds>=40.rc
+ gnome-bluetooth>=3.34.5
  gnome-color-manager>=3.36.0
- gnome-control-center>=3.38.0
- gnome-desktop>=3.38.0
- gnome-getting-started-docs>=3.36.2
- gnome-initial-setup>=3.38.0
- gnome-keyring>=3.36.0
+ gnome-control-center>=40.0
+ gnome-desktop>=40.0
+ gnome-initial-setup>=40.0
+ gnome-keyring>=40.0
  gnome-online-accounts>=3.38.0
  gnome-online-miners>=3.34.0
  gnome-session>=3.38.0
  gnome-settings-daemon>=3.38.0
- gnome-shell>=3.38.0
- gnome-shell-extensions>=3.38.0
+ gnome-shell>=40.0
+ gnome-shell-extensions>=40.0
  gnome-themes-standard>=3.28
- gnome-user-docs>=3.38.0
+ gnome-user-docs>=40.0
  gnome-video-effects>=0.5.0
- gsettings-desktop-schemas>=3.38.0
- gvfs>=1.46.0
- mutter>=3.38.0
- nautilus>=3.38.0
+ gsettings-desktop-schemas>=40.0
+ gvfs>=1.48.0
+ mutter>=40.0
+ nautilus>=40.0
  sushi>=3.38.0
- tracker3>=3.0.0
- yelp>=3.38.0
+ tracker3>=3.0.2
+ yelp>=40.0
  xdg-desktop-portal-gtk>=1.8.0
  zenity>=3.32.0"

From cb7ed6f8ca8dfd8200575f53181bcba590e41497 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:59:45 +0200
Subject: [PATCH 136/404] gnome: update to 40.0.

---
 srcpkgs/gnome/template | 92 +++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 32b678e9e49d..40d177182045 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -10,69 +10,71 @@ homepage="https://www.gnome.org"
 
 depends="
  gnome-core>=${version}
- baobab>=3.38.0
+ baobab>=40.0
  cheese>=3.38.0
- eog>=3.38.0
- evince>=3.38.0
+ eog>=40.0
+ evince>=40.1
  file-roller>=3.38.0
- gedit>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-contacts>=3.38.0
- gnome-disk-utility>=3.38.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
- gnome-screenshot>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
- gnome-tweaks>=3.34.0
- gnome-weather>=3.36.1
+ gedit>=40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-contacts>=40.0
+ gnome-disk-utility>=40.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
+ gnome-screenshot>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
+ gnome-tweaks>=40.0
+ gnome-weather>=40.0
  gsound>=1.0.2
- gspell>=1.8.3
+ gspell>=1.8.4
  mousetweaks>=3.32.0
- network-manager-applet>=1.8.2
- orca>=3.38.0
+ network-manager-applet>=1.20.0
+ orca>=40.0
  phodav>=2.5
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
- yelp-tools>=3.38.0"
+ yelp-tools>=40.0"
 
 _apps_depends="
- bijiben>=3.38.0
+ bijiben>=40.0
  dconf-editor>=3.38.0
  devhelp>=3.38.0
- epiphany>=3.38.0
- evolution>=3.38.0
+ epiphany>=40.0
+ evolution>=3.40.0
  ghex>=3.18.4
  gitg>=3.32.1
- gedit-plugins>=3.38.0
- gnome-boxes>=3.38.0
- gnome-builder>=3.38.0
- gnome-calculator>=3.38.0
- gnome-calendar>=3.38.0
- gnome-characters>=3.34.0
- gnome-clocks>=3.38.0
- gnome-dictionary>=3.26.1
- gnome-disk-utility>=3.38.0
+ gedit-plugins>=40.0
+ gnome-books>=40.0
+ gnome-boxes>=40.0
+ gnome-builder>=3.40.0
+ gnome-calculator>=40.0
+ gnome-calendar>=40.0
+ gnome-characters>=40.0
+ gnome-clocks>=40.0
+ gnome-dictionary>=40.0
+ gnome-disk-utility>=40.0
  gnome-documents>=3.34.0
- gnome-font-viewer>=3.34.0
- gnome-maps>=3.38.0
- gnome-music>=3.38.0
+ gnome-font-viewer>=40.0
+ gnome-maps>=40.0
+ gnome-music>=40.0
  gnome-nettool>=3.8.1
  gnome-photos>=3.38.0
  gnome-recipes>=2.0.2
- gnome-screenshot>=3.38.0
- gnome-sound-recorder>=3.38.0
- gnome-system-monitor>=3.38.0
- gnome-terminal>=3.38.0
+ gnome-screenshot>=40.0
+ gnome-sound-recorder>=40.0
+ gnome-system-monitor>=40.0
+ gnome-terminal>=3.40.0
  gnome-todo>=3.28.1
+ gnote>=40.0
  nemiver>=0.9.6
  polari>=3.38.0
  rygel>=0.40.0
- simple-scan>=3.38.0
+ simple-scan>=40.0
  totem>=3.38.0
  vino>=3.22.0"
 

From a640e6941fb8300a27ea63fe052fd6f77630ff5b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 137/404] planner: update to 2.6.9.

---
 srcpkgs/planner/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
+version=2.6.9
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From ba65101b97cea3cc9567ed82ee13cc5023e2cc4d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 138/404] giggle: doesn't need vte290.

---
 srcpkgs/giggle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

From cceb8b2676b45b296967b104cf412331a152a5e2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:07:13 +0200
Subject: [PATCH 139/404] common/xbps-src: update-check checks new gnome
 upstream sites

---
 common/xbps-src/shutils/update_check.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 911aa4da5178..3cbbfe95c2ac 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -130,9 +130,9 @@ update_check() {
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
                 url="https://bitbucket.org/$pkgurlname/downloads"
                 rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
-            *ftp.gnome.org*)
+            *ftp.gnome.org*|*download.gnome.org*)
                 : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
-                url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
+                url="https://download.gnome.org/sources/$pkgname/cache.json";;
             *kernel.org/pub/linux/kernel/*)
                 rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
             *cran.r-project.org/src/contrib*)

From 490e2230440a5e385bd75b05c2cf65501ff51ea5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:08:24 +0200
Subject: [PATCH 140/404] common/environment: update GNOME_SITE to new url

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index bf84fce10da5..d22a7388d689 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="https://www.x.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
-GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
+GNOME_SITE="https://download.gnome.org/sources"
 KERNEL_SITE="https://www.kernel.org/pub/linux"
 CPAN_SITE="https://www.cpan.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"

From ac73fbfade3c51a271418cb8f9cbd368a580e1ab Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Fri, 9 Apr 2021 05:02:00 +0200
Subject: [PATCH 141/404] New package: Converseen-0.9.9.0.

---
 srcpkgs/Converseen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/Converseen/template

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
new file mode 100644
index 000000000000..7117f14e87a9
--- /dev/null
+++ b/srcpkgs/Converseen/template
@@ -0,0 +1,14 @@
+# Template file for 'Converseen'
+pkgname=Converseen
+version=0.9.9.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"
+depends="ghostscript openexr hicolor-icon-theme"
+short_desc="Free batch image processor"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Faster3ck/Converseen"
+distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
+checksum=627f2578dd0ec6629118bb781d7a876b41e9319641f711bd18cb9c2221b3ac38

From 7dd45834dcbb9366d41f95efecfcc5c1874d222d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Apr 2021 20:54:13 +0200
Subject: [PATCH 142/404] budgie-desktop: build against mutter-40.0

---
 srcpkgs/budgie-desktop/patches/mutter-8.patch | 12593 ++++++++++++++++
 srcpkgs/budgie-desktop/template               |     2 +-
 2 files changed, 12594 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/budgie-desktop/patches/mutter-8.patch

diff --git a/srcpkgs/budgie-desktop/patches/mutter-8.patch b/srcpkgs/budgie-desktop/patches/mutter-8.patch
new file mode 100644
index 000000000000..8d1754d9067b
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/mutter-8.patch
@@ -0,0 +1,12593 @@
+From 0383b5ef679d6ad4555c69bfa8a087e2f61b8679 Mon Sep 17 00:00:00 2001
+From: David Mohammed <fossfreedom@users.noreply.github.com>
+Date: Wed, 3 Mar 2021 15:55:03 +0000
+Subject: [PATCH] Compile with mutter-8 (GNOME 40 beta) (#2094)
+
+* Compile with mutter-8 (GNOME 40 alpha)
+
+* Fix vapigen warnings for 6,7 & 8 alpha
+
+* Add get_settings to custom vapi
+
+* Bypass shim compilation failure
+Note the FixMe - this needs resolving otherwise keyboard shortcuts
+and changing keyboard shortcuts will not work
+
+* Resolve shim FIXME
+
+* Regenerate vapi with mutter.40-beta
+---
+ src/wm/meson.build                |   24 +-
+ src/wm/shim.vala                  |    4 +
+ vapi/Clutter-7.metadata           |   62 +-
+ vapi/Clutter-8.metadata           |  187 +
+ vapi/Meta-7.metadata              |    8 +
+ vapi/Meta-8.metadata              |   85 +
+ vapi/generate-mutter-vapi.sh      |    2 +-
+ vapi/libmutter-7-custom.vala      |    7 +
+ vapi/libmutter-7.vapi             |   30 +-
+ vapi/libmutter-8-custom.vala      |   14 +
+ vapi/libmutter-8.deps             |    6 +
+ vapi/libmutter-8.vapi             | 1535 ++++++
+ vapi/mutter-clutter-7-custom.vala |   42 +
+ vapi/mutter-clutter-7.deps        |    1 +
+ vapi/mutter-clutter-7.vapi        |  322 +-
+ vapi/mutter-clutter-8-custom.vala |   42 +
+ vapi/mutter-clutter-8.deps        |    5 +
+ vapi/mutter-clutter-8.vapi        | 8279 +++++++++++++++++++++++++++++
+ vapi/mutter-cogl-7.vapi           |    6 +
+ vapi/mutter-cogl-8-custom.vala    |  119 +
+ vapi/mutter-cogl-8.deps           |    1 +
+ vapi/mutter-cogl-8.vapi           | 1091 ++++
+ 22 files changed, 11691 insertions(+), 181 deletions(-)
+ create mode 100644 vapi/Clutter-8.metadata
+ create mode 100644 vapi/Meta-8.metadata
+ create mode 100644 vapi/libmutter-8-custom.vala
+ create mode 100644 vapi/libmutter-8.deps
+ create mode 100644 vapi/libmutter-8.vapi
+ create mode 100644 vapi/mutter-clutter-7-custom.vala
+ create mode 100644 vapi/mutter-clutter-8-custom.vala
+ create mode 100644 vapi/mutter-clutter-8.deps
+ create mode 100644 vapi/mutter-clutter-8.vapi
+ create mode 100644 vapi/mutter-cogl-8-custom.vala
+ create mode 100644 vapi/mutter-cogl-8.deps
+ create mode 100644 vapi/mutter-cogl-8.vapi
+
+diff --git src/wm/meson.build src/wm/meson.build
+index 583ce790..17e6bc07 100644
+--- src/wm/meson.build
++++ src/wm/meson.build
+@@ -18,17 +18,25 @@ budgie_wm_sources = [
+ budgie_wm_status_vala_args = []
+ 
+ dep_graphene = dependency('graphene-gobject-1.0', version: '>= 1.10')
+-dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
++dep_mutter = dependency('libmutter-8', version: gnome_minimum_version, required: false)
+ if dep_mutter.found()
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
+-    message('Using new libmutter-7 ABI from GNOME 3.38')
+-    vapi_mutter = 'libmutter-7'
++    # Assume mutter-7 compilation argument since no additional code changes required
++    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_8']
++    message('Using new libmutter-8 ABI from GNOME 40')
++    vapi_mutter = 'libmutter-8'
+ else
+-    dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++    dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
+     if dep_mutter.found()
+-        message('Using new libmutter-6 ABI from GNOME 3.36')
+-        vapi_mutter = 'libmutter-6'
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
++        message('Using new libmutter-7 ABI from GNOME 3.38')
++        vapi_mutter = 'libmutter-7'
++    else
++        dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++        if dep_mutter.found()
++            message('Using new libmutter-6 ABI from GNOME 3.36')
++            vapi_mutter = 'libmutter-6'
++        endif
+     endif
+ endif
+ 
+diff --git src/wm/shim.vala src/wm/shim.vala
+index 4ba17a8e..5a985aa1 100644
+--- src/wm/shim.vala
++++ src/wm/shim.vala
+@@ -177,7 +177,11 @@ namespace Budgie {
+ 			foreach (string accelerator in grabs.get_keys()) {
+ 				if (grabs[accelerator] == action) {
+ 					var params = new HashTable<string,Variant>(null, null);
++#if HAVE_MUTTER_8
++					params.set("device-name", new Variant.string(dev.get_device_name()));
++#else
+ 					params.set("device-id", new Variant.uint32(dev.id));
++#endif
+ 					params.set("action-mode", new Variant.uint32(action));
+ 					params.set("device-mode", new Variant.string(dev.get_device_node()));
+ 					params.set("timestamp", new Variant.uint32(timestamp));
+diff --git vapi/Clutter-7.metadata vapi/Clutter-7.metadata
+index 1855274d..f7b1d68b 100644
+--- vapi/Clutter-7.metadata
++++ vapi/Clutter-7.metadata
+@@ -2,6 +2,8 @@
+ ActorBox struct
+ Color struct
+ Knot struct
++Margin struct
++PaintVolume struct
+ PathNode struct
+ Perspective struct
+ Units struct
+@@ -35,11 +37,13 @@ value_get_color nullable
+ // method/virtual-method/signal don't match
+ Actor
+ 	.event#method name="emit_event"
+-	.get_paint_volume#method skip
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
+ 	.queue_redraw#signal skip
+ 	.queue_redraw#virtual_method skip
+ Container
+ 	.add_actor skip=false
++	.class_* skip
+ Text
+ 	.activate#method name="try_activate"
+ 	.insert_text#signal skip
+@@ -58,6 +62,12 @@ Container
+ Stage.read_pixels
+ 	.width default=-1
+ 	.height default=-1
++Stage.get_capture_final_size
++	.width out
++	.height out
++	.scale out
++Stage.paint_to_buffer
++    .data type="uint8[]"
+ Text
+ 	.position_to_coords.line_height default=null
+ 
+@@ -70,11 +80,8 @@ LayoutManager
+ 	.create_child_meta skip=false
+ 
+ // Variadic arguments
+-Box
+-	.pack skip=false
+-	.pack_after skip=false
+-	.pack_at skip=false
+-	.pack_before skip=false
++Backend
++	.get_cogl_context skip=false
+ Container
+ 	.child_get skip=false
+ 	.child_set skip=false
+@@ -91,10 +98,6 @@ LayoutManager
+ Script
+ 	.get_objects skip=false
+ 
+-// Changing error domains
+-Texture
+-	.new_from_file throws="Clutter.TextureError"
+-
+ // Skipped upstream for unknown reasons
+ Interval.register_progress_func skip=false
+ get_option_group skip=false
+@@ -111,45 +114,46 @@ ActorBox
+ Units.from_* skip
+ Color
+ 	.new skip
++Margin
++	.new skip
+ 
+ // Class methods
+ container_class_find_child_property skip
+ container_class_list_child_properties skip
+ 
+ // Move symbols
++color_from_* skip
+ units_from_* skip
+ 
+-// Classes marked as out but not double ptr
+-Actor
+-	.get_margin.margin out=false
+-DragAction
+-	.get_drag_area.drag_area out=false
+-InputDevice
+-	.get_coords.point out=false
+-Rect
+-	.get_center.center out=false
+-	.intersection.res out=false
+-	.union.res out=false
+-Timeline
+-	.get_cubic_bezier_progress.c_* out=false
+-ZoomAction
+-	.get_focal_point.point out=false
+-	.get_transformed_focal_point.point out=false
+-
+ // Struct return values
+ color_get_static nullable
+ 
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
+ // Remove for clutter-2.0
+ /////////////////////////
+ 
++StageView.layout skip
++
+ Stage
+  	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
+ 
+ // *Event should be compact classes derived from Clutter.Event
+ Event.type skip=false
+ AnyEvent struct=false base_type="Clutter.Event"
+ ButtonEvent struct=false base_type="Clutter.Event"
+ CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
+ KeyEvent struct=false base_type="Clutter.Event"
+ MotionEvent struct=false base_type="Clutter.Event"
+ ScrollEvent struct=false base_type="Clutter.Event"
+@@ -157,6 +161,10 @@ StageStateEvent struct=false base_type="Clutter.Event"
+ TouchEvent struct=false base_type="Clutter.Event"
+ TouchpadPinchEvent struct=false base_type="Clutter.Event"
+ TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
+ 
+ // Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
+ *#constant skip
+diff --git vapi/Clutter-8.metadata vapi/Clutter-8.metadata
+new file mode 100644
+index 00000000..fa1210f1
+--- /dev/null
++++ vapi/Clutter-8.metadata
+@@ -0,0 +1,187 @@
++// Non mini-object
++ActorBox struct
++Color struct
++Knot struct
++Margin struct
++PaintVolume struct
++PathNode struct
++Perspective struct
++Units struct
++
++*.ref unowned
++
++init.argv unowned
++init_with_args
++	.argv unowned
++Actor
++	.apply_transform.matrix ref
++	.get_abs_allocation_vertices.verts out=false
++Canvas
++	.new symbol_type="constructor"
++Event.type#method name="get_type"
++Image
++	.new symbol_type="constructor"
++
++// ???
++Actor.has_pointer#method name="get_has_pointer"
++InitError errordomain=false
++
++// Not all backing symbols are deprecated
++Actor.pick deprecated=false
++
++// Nullable return values
++Actor
++	.get_parent nullable
++value_get_color nullable
++
++// method/virtual-method/signal don't match
++Actor
++	.event#method name="emit_event"
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
++Container
++	.add_actor skip=false
++	.class_* skip
++Text
++	.activate#method name="try_activate"
++	.insert_text#signal skip
++TextBuffer.get_text#virtual_method name="get_text_with_length"
++
++// virtual/abstract distinction
++Container
++	.lower virtual
++	.raise virtual
++	.*_child_meta#virtual_method virtual
++
++// Default values
++Container
++	.lower.sibling nullable default=null
++	.raise.sibling nullable default=null
++Stage.read_pixels
++	.width default=-1
++	.height default=-1
++Stage.paint_to_buffer
++    .data type="uint8[]"
++Text
++	.position_to_coords.line_height default=null
++
++// Reparented funcs methods can't be instance methods
++feature_available skip
++feature_get_all skip
++
++// Skipped by g-i for unknown reasons
++LayoutManager
++	.create_child_meta skip=false
++
++// Variadic arguments
++Backend
++	.get_cogl_context skip=false
++Container
++	.child_get skip=false
++	.child_set skip=false
++	.remove skip=false
++Interval
++	.new skip=false
++	.get_interval skip=false
++	.set_final skip=false
++	.set_initial skip=false
++	.set_interval skip=false
++LayoutManager
++	.child_get skip=false
++	.child_set skip=false
++Script
++	.get_objects skip=false
++
++// Skipped upstream for unknown reasons
++Interval.register_progress_func skip=false
++get_option_group skip=false
++get_option_group_without_init skip=false
++threads_add_idle skip=false
++threads_add_idle_full skip=false
++threads_add_timeout skip=false
++threads_add_timeout_full skip=false
++
++// struct/class confusion
++ActorBox
++	.new skip
++	.from_vertices skip
++Units.from_* skip
++Color
++	.new skip
++Margin
++	.new skip
++
++// Class methods
++container_class_find_child_property skip
++container_class_list_child_properties skip
++
++// Move symbols
++color_from_* skip
++units_from_* skip
++
++// Struct return values
++color_get_static nullable
++
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
++// Remove for clutter-2.0
++/////////////////////////
++
++StageView.layout skip
++
++Stage
++ 	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
++
++// *Event should be compact classes derived from Clutter.Event
++Event.type skip=false
++AnyEvent struct=false base_type="Clutter.Event"
++ButtonEvent struct=false base_type="Clutter.Event"
++CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
++KeyEvent struct=false base_type="Clutter.Event"
++MotionEvent struct=false base_type="Clutter.Event"
++ScrollEvent struct=false base_type="Clutter.Event"
++TouchEvent struct=false base_type="Clutter.Event"
++TouchpadPinchEvent struct=false base_type="Clutter.Event"
++TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
++
++// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
++*#constant skip
++COGL skip=false
++CURRENT_TIME skip=false
++FLAVOUR skip=false
++PATH_RELATIVE skip=false
++PRIORITY_REDRAW skip=false
++
++// Clutter devs don't like us creating nested namespaces
++value_* name="value_(.+)" parent="Clutter.Value"
++threads_* name="threads_(.+)" parent="Clutter.Threads"
++threads_add_idle name="add" parent="Clutter.Threads.Idle"
++threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
++threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
++threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
++
++// Backwards compatibility
++Color.alloc symbol_type="function"
++
++BinAlignment deprecated=false deprecated_since=null
++BinAlignment.* deprecated
++BinAlignment.start deprecated=false
++BinLayout.new.*_align default=Clutter.BinAlignment.START
++
++// Possibly keep
++KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
+diff --git vapi/Meta-7.metadata vapi/Meta-7.metadata
+index 72629fba..ababf5d9 100644
+--- vapi/Meta-7.metadata
++++ vapi/Meta-7.metadata
+@@ -9,6 +9,10 @@ Barrier cheader_filename="meta/barrier.h"
+ BarrierEvent cheader_filename="meta/barrier.h"
+ CloseDialog cheader_filename="meta/meta-close-dialog.h"
+ CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.x out
++CursorTracker.get_pointer.y out
++CursorTracker.get_pointer.mods out
+ Display cheader_filename="meta/display.h"
+ Dnd cheader_filename="meta/meta-dnd.h"
+ IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
+@@ -20,6 +24,10 @@ Preference cheader_filename="meta/prefs.h"
+ RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
+ RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
+ Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
+ ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
+ ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
+ SoundPlayer cheader_filename="meta/meta-sound-player.h"
+diff --git vapi/Meta-8.metadata vapi/Meta-8.metadata
+new file mode 100644
+index 00000000..0e00117f
+--- /dev/null
++++ vapi/Meta-8.metadata
+@@ -0,0 +1,85 @@
++Backend cheader_filename="meta/meta-backend.h"
++Background cheader_filename="meta/meta-background.h"
++BackgroundActor cheader_filename="meta/meta-background-actor.h"
++BackgroundContent cheader_filename="meta/meta-background-content.h"
++BackgroundGroup cheader_filename="meta/meta-background-group.h"
++BackgroundImage cheader_filename="meta/meta-background-image.h"
++BackgroundImageCache cheader_filename="meta/meta-background-image.h"
++Barrier cheader_filename="meta/barrier.h"
++BarrierEvent cheader_filename="meta/barrier.h"
++CloseDialog cheader_filename="meta/meta-close-dialog.h"
++CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.mods out
++Display cheader_filename="meta/display.h"
++Dnd cheader_filename="meta/meta-dnd.h"
++IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
++InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
++LaunchContext cheader_filename="meta/meta-launch-context.h"
++Meta cheader_filename="meta/main.h"
++MonitorManager cheader_filename="meta/meta-monitor-manager.h"
++Preference cheader_filename="meta/prefs.h"
++RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
++RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
++Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
++ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
++ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
++SoundPlayer cheader_filename="meta/meta-sound-player.h"
++Stage cheader_filename="meta/meta-stage.h"
++StartupNotification cheader_filename="meta/meta-startup-notification.h"
++Theme cheader_filename="meta/theme.h"
++WaylandClient cheader_filename="meta/meta-wayland-client.h"
++Window cheader_filename="meta/window.h"
++WindowActor cheader_filename="meta/meta-window-actor.h"
++WindowGroup cheader_filename="meta/meta-window-group.h"
++WindowShape cheader_filename="meta/meta-window-shape.h"
++Workspace cheader_filename="meta/workspace.h"
++WorkspaceManager cheader_filename="meta/meta-workspace-manager.h"
++X11Display cheader_filename="meta/meta-x11-display.h"
++Rectangle struct
++Plugin cheader_filename="meta/meta-plugin.h"
++PluginInfo cheader_filename="meta/meta-plugin.h"
++prefs_* cheader_filename="meta/prefs.h" parent="Meta.Prefs"
++add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_push parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop_with_return parent="Meta.Util" cheader_filename="meta/util.h"
++external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h"
++get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h"
++gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h"
++is_syncing parent="Meta.Util" cheader_filename="meta/util.h"
++is_verbose parent="Meta.Util" cheader_filename="meta/util.h"
++is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h"
++later_add parent="Meta.Util" cheader_filename="meta/util.h"
++later_remove parent="Meta.Util" cheader_filename="meta/util.h"
++pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++rect parent="Meta.Util" cheader_filename="meta/util.h"
++remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_equal parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_hash parent="Meta.Util" cheader_filename="meta/util.h"
++show_dialog parent="Meta.Util" cheader_filename="meta/util.h"
++get_stage_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_actors parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_top_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_feedback_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++disable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++enable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++focus_stage_window parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler"
++KeyHandlerFunc.event type="Clutter.KeyEvent?"
++get_backend parent="Meta.Backend"
++Window.focus#signal skip=true
++Window.get_xwindow skip=false
++get_option_context skip=false
++set_gnome_wm_keybindings skip=false
++set_wm_name skip=false
++init skip=false
++run skip=false
++show_dialog skip=false
++get_backend cheader_filename="meta/meta-backend.h"
+diff --git vapi/generate-mutter-vapi.sh vapi/generate-mutter-vapi.sh
+index b233e586..11740435 100755
+--- vapi/generate-mutter-vapi.sh
++++ vapi/generate-mutter-vapi.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -xe
+ 
+-version=${6-7}
++version=${6-8}
+ girdir=$(pkg-config libmutter-$version --variable=girdir)
+ 
+ cd $(dirname $0)
+diff --git vapi/libmutter-7-custom.vala vapi/libmutter-7-custom.vala
+index 1e0b917c..73bc5f1b 100644
+--- vapi/libmutter-7-custom.vala
++++ vapi/libmutter-7-custom.vala
+@@ -5,3 +5,10 @@ public struct before_frame {
+ [CCode (has_type_id = false)]
+ public struct frame {
+ }
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-7.vapi vapi/libmutter-7.vapi
+index 6bfdc4b7..30f8892c 100644
+--- vapi/libmutter-7.vapi
++++ vapi/libmutter-7.vapi
+@@ -149,7 +149,7 @@ namespace Meta {
+ 		public static void x11_error_trap_push (Meta.X11Display x11_display);
+ 	}
+ 	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
+-	public abstract class Backend : GLib.Object, GLib.Initable {
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
+ 		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
+@@ -277,9 +277,8 @@ namespace Meta {
+ 	public class CursorTracker : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected CursorTracker ();
+-		public static unowned Meta.CursorTracker get_for_display (Meta.Display display);
+ 		public void get_hot (out int x, out int y);
+-		public void get_pointer (int x, int y, Clutter.ModifierType mods);
++		public void get_pointer (out int x, out int y, out Clutter.ModifierType mods);
+ 		public bool get_pointer_visible ();
+ 		public unowned Cogl.Texture get_sprite ();
+ 		public void set_pointer_visible (bool visible);
+@@ -304,6 +303,8 @@ namespace Meta {
+ 		public int get_current_monitor ();
+ 		public uint32 get_current_time ();
+ 		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
+ 		public unowned Meta.Window get_focus_window ();
+ 		public Meta.GrabOp get_grab_op ();
+ 		public uint get_keybinding_action (uint keycode, ulong mask);
+@@ -422,10 +423,12 @@ namespace Meta {
+ 		public static int get_display_configuration_timeout ();
+ 		public bool get_is_builtin_display_on ();
+ 		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
+ 		public Meta.MonitorSwitchConfigType get_switch_config ();
+ 		public void switch_config (Meta.MonitorSwitchConfigType config_type);
+ 		[NoAccessorMethod]
+ 		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
+ 		public signal void confirm_display_change ();
+ 		public signal void monitors_changed ();
+ 		public signal void monitors_changed_internal ();
+@@ -504,7 +507,7 @@ namespace Meta {
+ 		public bool is_recording { get; construct; }
+ 		public signal void stopped ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
+ 	public class Selection : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		public Selection (Meta.Display display);
+@@ -514,7 +517,7 @@ namespace Meta {
+ 		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
+ 		public signal void owner_changed (uint object, Meta.SelectionSource p0);
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
+ 	public class SelectionSource : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected SelectionSource ();
+@@ -524,7 +527,7 @@ namespace Meta {
+ 		public virtual signal void activated ();
+ 		public virtual signal void deactivated ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_memory_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
+ 	public class SelectionSourceMemory : Meta.SelectionSource {
+ 		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
+ 		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
+@@ -768,6 +771,7 @@ namespace Meta {
+ 		public uint user_time { get; }
+ 		public Meta.WindowType window_type { get; }
+ 		public string wm_class { get; }
++		public signal void monitor_changed (int old_monitor);
+ 		public signal void position_changed ();
+ 		public signal void raised ();
+ 		public signal void shown ();
+@@ -1012,6 +1016,12 @@ namespace Meta {
+ 		BLANK,
+ 		LAST
+ 	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
+ 	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
+ 	[Flags]
+ 	public enum DebugTopic {
+@@ -1354,7 +1364,7 @@ namespace Meta {
+ 		CHECK_ALIVE_TIMEOUT;
+ 		public unowned string to_string ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
+ 	public enum SelectionType {
+ 		SELECTION_PRIMARY,
+ 		SELECTION_CLIPBOARD,
+@@ -1491,12 +1501,16 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void clutter_init ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void exit (Meta.ExitCode code);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static string g_utf8_strndup (string src, size_t n);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static unowned GLib.OptionContext get_option_context ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static bool get_replace_current_wm ();
+@@ -1511,6 +1525,8 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void restart (string? message);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static int run ();
+diff --git vapi/libmutter-8-custom.vala vapi/libmutter-8-custom.vala
+new file mode 100644
+index 00000000..73bc5f1b
+--- /dev/null
++++ vapi/libmutter-8-custom.vala
+@@ -0,0 +1,14 @@
++[CCode (has_type_id = false)]
++public struct before_frame {
++}
++
++[CCode (has_type_id = false)]
++public struct frame {
++}
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-8.deps vapi/libmutter-8.deps
+new file mode 100644
+index 00000000..d94a615d
+--- /dev/null
++++ vapi/libmutter-8.deps
+@@ -0,0 +1,6 @@
++gtk+-3.0
++json-glib-1.0
++mutter-clutter-8
++x11
++xfixes-4.0
++graphene-gobject-1.0
+diff --git vapi/libmutter-8.vapi vapi/libmutter-8.vapi
+new file mode 100644
+index 00000000..5cdc794f
+--- /dev/null
++++ vapi/libmutter-8.vapi
+@@ -0,0 +1,1535 @@
++/* libmutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Meta", gir_namespace = "Meta", gir_version = "8", lower_case_cprefix = "meta_")]
++namespace Meta {
++	namespace Compositor {
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_disable_unredirect_for_display")]
++		public static void disable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_enable_unredirect_for_display")]
++		public static void enable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
++		public static void focus_stage_window (Meta.Display display, uint32 timestamp);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")]
++		public static unowned Clutter.Actor get_feedback_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
++		public static unowned Clutter.Actor get_stage_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_top_window_group_for_display")]
++		public static unowned Clutter.Actor get_top_window_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_actors")]
++		public static unowned GLib.List<Clutter.Actor> get_window_actors (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_display")]
++		public static unowned Clutter.Actor get_window_group_for_display (Meta.Display display);
++	}
++	namespace Prefs {
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_bell_is_audible")]
++		public static bool prefs_bell_is_audible ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_change_workspace_name")]
++		public static void prefs_change_workspace_name (int i, string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_double_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_double_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_middle_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_middle_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_right_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_right_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_attach_modal_dialogs")]
++		public static bool prefs_get_attach_modal_dialogs ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_maximize")]
++		public static bool prefs_get_auto_maximize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise")]
++		public static bool prefs_get_auto_raise ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise_delay")]
++		public static int prefs_get_auto_raise_delay ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_button_layout")]
++		public static Meta.ButtonLayout prefs_get_button_layout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_center_new_windows")]
++		public static bool prefs_get_center_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_check_alive_timeout")]
++		public static uint prefs_get_check_alive_timeout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_compositing_manager")]
++		public static bool prefs_get_compositing_manager ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_size")]
++		public static int prefs_get_cursor_size ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_theme")]
++		public static unowned string prefs_get_cursor_theme ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_disable_workarounds")]
++		public static bool prefs_get_disable_workarounds ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_drag_threshold")]
++		public static int prefs_get_drag_threshold ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_draggable_border_width")]
++		public static int prefs_get_draggable_border_width ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_dynamic_workspaces")]
++		public static bool prefs_get_dynamic_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_edge_tiling")]
++		public static bool prefs_get_edge_tiling ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_change_on_pointer_rest")]
++		public static bool prefs_get_focus_change_on_pointer_rest ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_mode")]
++		public static GDesktop.FocusMode prefs_get_focus_mode ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_new_windows")]
++		public static GDesktop.FocusNewWindows prefs_get_focus_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_force_fullscreen")]
++		public static bool prefs_get_force_fullscreen ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_accessibility")]
++		public static bool prefs_get_gnome_accessibility ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_animations")]
++		public static bool prefs_get_gnome_animations ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_keybinding_action")]
++		public static Meta.KeyBindingAction prefs_get_keybinding_action (string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_menu")]
++		public static int prefs_get_mouse_button_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_mods")]
++		public static Meta.VirtualModifier prefs_get_mouse_button_mods ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_resize")]
++		public static int prefs_get_mouse_button_resize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_num_workspaces")]
++		public static int prefs_get_num_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_raise_on_click")]
++		public static bool prefs_get_raise_on_click ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_show_fallback_app_menu")]
++		public static bool prefs_get_show_fallback_app_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_titlebar_font")]
++		public static unowned Pango.FontDescription prefs_get_titlebar_font ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell")]
++		public static bool prefs_get_visual_bell ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell_type")]
++		public static GDesktop.VisualBellType prefs_get_visual_bell_type ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspace_name")]
++		public static unowned string prefs_get_workspace_name (int i);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspaces_only_on_primary")]
++		public static bool prefs_get_workspaces_only_on_primary ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_init")]
++		public static void prefs_init ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_force_fullscreen")]
++		public static void prefs_set_force_fullscreen (bool whether);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_num_workspaces")]
++		public static void prefs_set_num_workspaces (int n_workspaces);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_show_fallback_app_menu")]
++		public static void prefs_set_show_fallback_app_menu (bool whether);
++	}
++	namespace Util {
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_add_verbose_topic")]
++		public static void add_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_external_binding_name_for_action")]
++		public static string external_binding_name_for_action (uint keybinding_action);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_get_locale_direction")]
++		public static Meta.LocaleDirection get_locale_direction ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_gravity_to_string")]
++		public static unowned string gravity_to_string (Meta.Gravity gravity);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_syncing")]
++		public static bool is_syncing ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_verbose")]
++		public static bool is_verbose ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_wayland_compositor")]
++		public static bool is_wayland_compositor ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_add")]
++		public static uint later_add (Meta.LaterType when, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_remove")]
++		public static void later_remove (uint later_id);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_pop_no_msg_prefix")]
++		public static void pop_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_push_no_msg_prefix")]
++		public static void push_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_rect")]
++		public static Meta.Rectangle? rect (int x, int y, int width, int height);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_remove_verbose_topic")]
++		public static void remove_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_show_dialog")]
++		public static GLib.Pid show_dialog (string type, string message, string timeout, string display, string ok_text, string cancel_text, string icon_name, int transient_for, GLib.SList<void*> columns, GLib.SList<void*> entries);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_equal")]
++		public static int unsigned_long_equal (void* v1, void* v2);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_hash")]
++		public static uint unsigned_long_hash (void* v);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop")]
++		public static void x11_error_trap_pop (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop_with_return")]
++		public static int x11_error_trap_pop_with_return (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_push")]
++		public static void x11_error_trap_push (Meta.X11Display x11_display);
++	}
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
++		public static unowned Meta.Backend get_backend ();
++		public unowned Meta.Dnd get_dnd ();
++		public unowned Meta.RemoteAccessController get_remote_access_controller ();
++		public unowned Meta.Settings get_settings ();
++		public unowned Clutter.Actor get_stage ();
++		public bool is_rendering_hardware_accelerated ();
++		public void lock_layout_group (uint idx);
++		public void set_keymap (string layouts, string variants, string options);
++		public void set_numlock (bool numlock_state);
++		public signal void keymap_changed ();
++		public signal void keymap_layout_group_changed (uint object);
++		public signal void last_device_changed (Clutter.InputDevice object);
++		public signal void lid_is_closed_changed (bool object);
++	}
++	[CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")]
++	public class Background : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Background (Meta.Display display);
++		public static void refresh_all ();
++		public void set_blend (GLib.File file1, GLib.File file2, double blend_factor, GDesktop.BackgroundStyle style);
++		public void set_color (Clutter.Color color);
++		public void set_file (GLib.File? file, GDesktop.BackgroundStyle style);
++		public void set_gradient (GDesktop.BackgroundShading shading_direction, Clutter.Color color, Clutter.Color second_color);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
++	public class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundActor (Meta.Display display, int monitor);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-content.h", type_id = "meta_background_content_get_type ()")]
++	public class BackgroundContent : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected BackgroundContent ();
++		public static Clutter.Content @new (Meta.Display display, int monitor);
++		public void set_background (Meta.Background background);
++		public void set_gradient (bool enabled, int height, double tone_start);
++		public void set_rounded_clip_bounds (Graphene.Rect? bounds);
++		public void set_rounded_clip_radius (float radius);
++		public void set_vignette (bool enabled, double brightness, double sharpness);
++		[NoAccessorMethod]
++		public Meta.Background background { owned get; set; }
++		[NoAccessorMethod]
++		public double brightness { get; set; }
++		[NoAccessorMethod]
++		public bool gradient { get; set; }
++		[NoAccessorMethod]
++		public int gradient_height { get; set; }
++		[NoAccessorMethod]
++		public double gradient_max_darkness { get; set; }
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++		[NoAccessorMethod]
++		public float rounded_clip_radius { get; set; }
++		[NoAccessorMethod]
++		public bool vignette { get; set; }
++		[NoAccessorMethod]
++		public double vignette_sharpness { get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-group.h", type_id = "meta_background_group_get_type ()")]
++	public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_get_type ()")]
++	public class BackgroundImage : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImage ();
++		public bool get_success ();
++		public unowned Cogl.Texture get_texture ();
++		public bool is_loaded ();
++		public signal void loaded ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_cache_get_type ()")]
++	public class BackgroundImageCache : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImageCache ();
++		public static unowned Meta.BackgroundImageCache get_default ();
++		public Meta.BackgroundImage load (GLib.File file);
++		public void purge (GLib.File file);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", type_id = "meta_barrier_get_type ()")]
++	public class Barrier : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Barrier ();
++		public void destroy ();
++		public bool is_active ();
++		public void release (Meta.BarrierEvent event);
++		[NoAccessorMethod]
++		public Meta.BarrierDirection directions { get; construct; }
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public int x1 { get; construct; }
++		[NoAccessorMethod]
++		public int x2 { get; construct; }
++		[NoAccessorMethod]
++		public int y1 { get; construct; }
++		[NoAccessorMethod]
++		public int y2 { get; construct; }
++		public signal void hit (Meta.BarrierEvent event);
++		public signal void left (Meta.BarrierEvent event);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_barrier_event_get_type ()")]
++	[Compact]
++	public class BarrierEvent {
++		public int dt;
++		public double dx;
++		public double dy;
++		public int event_id;
++		public bool grabbed;
++		public bool released;
++		public uint32 time;
++		public double x;
++		public double y;
++	}
++	[CCode (cheader_filename = "meta/meta-cursor-tracker.h", type_id = "meta_cursor_tracker_get_type ()")]
++	public class CursorTracker : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected CursorTracker ();
++		public void get_hot (out int x, out int y);
++		public void get_pointer (Graphene.Point coords, out Clutter.ModifierType mods);
++		public bool get_pointer_visible ();
++		public unowned Cogl.Texture get_sprite ();
++		public void set_pointer_visible (bool visible);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public signal void cursor_changed ();
++		public signal void position_invalidated ();
++		public signal void visibility_changed ();
++	}
++	[CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")]
++	public class Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Display ();
++		public void add_ignored_crossing_serial (ulong serial);
++		public uint add_keybinding (string name, GLib.Settings settings, Meta.KeyBindingFlags flags, owned Meta.KeyHandlerFunc handler);
++		public bool begin_grab_op (Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
++		public void clear_mouse_mode ();
++		public void close (uint32 timestamp);
++		public void end_grab_op (uint32 timestamp);
++		public void focus_default_window (uint32 timestamp);
++		public void freeze_keyboard (uint32 timestamp);
++		public Clutter.ModifierType get_compositor_modifiers ();
++		public int get_current_monitor ();
++		public uint32 get_current_time ();
++		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
++		public unowned Meta.Window get_focus_window ();
++		public Meta.GrabOp get_grab_op ();
++		public uint get_keybinding_action (uint keycode, ulong mask);
++		public uint32 get_last_user_time ();
++		public Meta.Rectangle get_monitor_geometry (int monitor);
++		public bool get_monitor_in_fullscreen (int monitor);
++		public int get_monitor_index_for_rect (Meta.Rectangle rect);
++		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
++		public float get_monitor_scale (int monitor);
++		public int get_n_monitors ();
++		public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number);
++		public int get_primary_monitor ();
++		public unowned Meta.Selection get_selection ();
++		public void get_size (out int width, out int height);
++		public unowned Meta.SoundPlayer get_sound_player ();
++		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
++		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
++		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
++		public unowned Meta.WorkspaceManager get_workspace_manager ();
++		public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags);
++		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
++		public bool remove_keybinding (string name);
++		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
++		public void set_cursor (Meta.Cursor cursor);
++		public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp);
++		public GLib.SList<weak Meta.Window> sort_windows_by_stacking (GLib.SList<Meta.Window> windows);
++		public bool supports_extended_barriers ();
++		public void unfreeze_keyboard (uint32 timestamp);
++		public bool ungrab_accelerator (uint action_id);
++		public void ungrab_keyboard (uint32 timestamp);
++		public void unset_input_focus (uint32 timestamp);
++		public bool xserver_time_is_before (uint32 time1, uint32 time2);
++		public Clutter.ModifierType compositor_modifiers { get; }
++		public Meta.Window focus_window { get; }
++		public signal void accelerator_activated (uint object, Clutter.InputDevice p0, uint p1);
++		public signal void closing ();
++		public signal void cursor_updated ();
++		public signal void gl_video_memory_purged ();
++		public signal void grab_op_begin (Meta.Window object, Meta.GrabOp p0);
++		public signal void grab_op_end (Meta.Window object, Meta.GrabOp p0);
++		public signal void in_fullscreen_changed ();
++		public signal bool init_xserver (GLib.Task object);
++		public signal bool modifiers_accelerator_activated ();
++		public signal void overlay_key ();
++		public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1);
++		public signal void restacked ();
++		public signal bool restart ();
++		public signal void show_osd (int object, string p0, string p1);
++		public signal unowned Clutter.Actor? show_pad_osd (Clutter.InputDevice pad, GLib.Settings settings, string layout_path, bool edition_mode, int monitor_idx);
++		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
++		public signal bool show_restart_message (string? message);
++		public signal void showing_desktop_changed ();
++		public signal void window_created (Meta.Window object);
++		public signal void window_demands_attention (Meta.Window object);
++		public signal void window_entered_monitor (int object, Meta.Window p0);
++		public signal void window_left_monitor (int object, Meta.Window p0);
++		public signal void window_marked_urgent (Meta.Window object);
++		public signal void workareas_changed ();
++		public signal void x11_display_closing ();
++		public signal void x11_display_opened ();
++		public signal void x11_display_setup ();
++	}
++	[CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")]
++	public class Dnd : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Dnd ();
++		public signal void dnd_enter ();
++		public signal void dnd_leave ();
++		public signal void dnd_position_change (int object, int p0);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++	}
++	[CCode (cheader_filename = "meta/meta-idle-monitor.h", type_id = "meta_idle_monitor_get_type ()")]
++	public class IdleMonitor : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected IdleMonitor ();
++		public uint add_idle_watch (uint64 interval_msec, owned Meta.IdleMonitorWatchFunc? callback);
++		public uint add_user_active_watch (owned Meta.IdleMonitorWatchFunc? callback);
++		public static unowned Meta.IdleMonitor get_core ();
++		public int64 get_idletime ();
++		public void remove_watch (uint id);
++		[NoAccessorMethod]
++		public Clutter.InputDevice device { owned get; construct; }
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_key_binding_get_type ()")]
++	[Compact]
++	public class KeyBinding {
++		public uint get_mask ();
++		public Meta.VirtualModifier get_modifiers ();
++		public unowned string get_name ();
++		public bool is_builtin ();
++		public bool is_reversed ();
++		[CCode (cname = "meta_keybindings_set_custom_handler")]
++		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
++	}
++	[CCode (cheader_filename = "meta/meta-launch-context.h", type_id = "meta_launch_context_get_type ()")]
++	public class LaunchContext : GLib.AppLaunchContext {
++		[CCode (has_construct_function = false)]
++		protected LaunchContext ();
++		public void set_timestamp (uint32 timestamp);
++		public void set_workspace (Meta.Workspace workspace);
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public uint timestamp { get; set; }
++		[NoAccessorMethod]
++		public Meta.Workspace workspace { owned get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_monitor_manager_get_type ()")]
++	public class MonitorManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected MonitorManager ();
++		public bool can_switch_config ();
++		public static unowned Meta.MonitorManager @get ();
++		public static int get_display_configuration_timeout ();
++		public bool get_is_builtin_display_on ();
++		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
++		public Meta.MonitorSwitchConfigType get_switch_config ();
++		public void switch_config (Meta.MonitorSwitchConfigType config_type);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
++		public signal void confirm_display_change ();
++		public signal void monitors_changed ();
++		public signal void monitors_changed_internal ();
++		public signal void power_save_mode_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
++	public abstract class Plugin : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Plugin ();
++		public bool begin_modal (Meta.ModalOptions options, uint32 timestamp);
++		public void complete_display_change (bool ok);
++		[NoWrapper]
++		public virtual void confirm_display_change ();
++		[NoWrapper]
++		public virtual void destroy (Meta.WindowActor actor);
++		public void destroy_completed (Meta.WindowActor actor);
++		public void end_modal (uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.PluginInfo? get_info ();
++		[NoWrapper]
++		public virtual void hide_tile_preview ();
++		[NoWrapper]
++		public virtual bool keybinding_filter (Meta.KeyBinding binding);
++		[NoWrapper]
++		public virtual void kill_switch_workspace ();
++		[NoWrapper]
++		public virtual void kill_window_effects (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void locate_pointer ();
++		public static void manager_set_plugin_type (GLib.Type gtype);
++		[NoWrapper]
++		public virtual void map (Meta.WindowActor actor);
++		public void map_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void minimize (Meta.WindowActor actor);
++		public void minimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual unowned Meta.PluginInfo? plugin_info ();
++		[NoWrapper]
++		public virtual void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number);
++		[NoWrapper]
++		public virtual void show_window_menu (Meta.Window window, Meta.WindowMenuType menu, int x, int y);
++		[NoWrapper]
++		public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Meta.Rectangle rect);
++		[NoWrapper]
++		public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Meta.Rectangle old_frame_rect, Meta.Rectangle old_buffer_rect);
++		public void size_change_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void size_changed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void start ();
++		[NoWrapper]
++		public virtual void switch_workspace (int from, int to, Meta.MotionDirection direction);
++		public void switch_workspace_completed ();
++		[NoWrapper]
++		public virtual void unminimize (Meta.WindowActor actor);
++		public void unminimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual bool xevent_filter (X.Event event);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_controller_get_type ()")]
++	public class RemoteAccessController : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessController ();
++		public void inhibit_remote_access ();
++		public void uninhibit_remote_access ();
++		public signal void new_handle (Meta.RemoteAccessHandle object);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_handle_get_type ()")]
++	public class RemoteAccessHandle : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessHandle ();
++		public bool get_disable_animations ();
++		public virtual void stop ();
++		[NoAccessorMethod]
++		public bool is_recording { get; construct; }
++		public signal void stopped ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
++	public class Selection : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Selection (Meta.Display display);
++		public GLib.List<string> get_mimetypes (Meta.SelectionType selection_type);
++		public void set_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public async bool transfer_async (Meta.SelectionType selection_type, string mimetype, ssize_t size, GLib.OutputStream output, GLib.Cancellable? cancellable) throws GLib.Error;
++		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public signal void owner_changed (uint object, Meta.SelectionSource p0);
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
++	public class SelectionSource : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SelectionSource ();
++		public virtual GLib.List<string> get_mimetypes ();
++		public bool is_active ();
++		public virtual async GLib.InputStream read_async (string mimetype, GLib.Cancellable? cancellable) throws GLib.Error;
++		public virtual signal void activated ();
++		public virtual signal void deactivated ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
++	public class SelectionSourceMemory : Meta.SelectionSource {
++		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
++		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
++	}
++	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
++	[Compact]
++	public class Settings {
++		public int get_font_dpi ();
++		public int get_ui_scaling_factor ();
++	}
++	[CCode (cheader_filename = "meta/main.h", ref_function = "meta_shadow_ref", type_id = "meta_shadow_get_type ()", unref_function = "meta_shadow_unref")]
++	[Compact]
++	public class Shadow {
++		public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds);
++		public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
++		public Meta.Shadow @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/meta-shadow-factory.h", type_id = "meta_shadow_factory_get_type ()")]
++	public class ShadowFactory : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public ShadowFactory ();
++		public static unowned Meta.ShadowFactory get_default ();
++		public Meta.ShadowParams get_params (string class_name, bool focused);
++		public Meta.Shadow get_shadow (Meta.WindowShape shape, int width, int height, string class_name, bool focused);
++		public void set_params (string class_name, bool focused, Meta.ShadowParams @params);
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-shaped-texture.h", type_id = "meta_shaped_texture_get_type ()")]
++	public class ShapedTexture : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected ShapedTexture ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Cogl.Texture get_texture ();
++		public void set_create_mipmaps (bool create_mipmaps);
++		public void set_mask_texture (Cogl.Texture mask_texture);
++		public signal void size_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")]
++	public class SoundPlayer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SoundPlayer ();
++		public void play_from_file (GLib.File file, string description, GLib.Cancellable? cancellable = null);
++		public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null);
++	}
++	[CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")]
++	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public static bool is_focused (Meta.Display display);
++		public signal void actors_painted ();
++	}
++	[CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")]
++	public class StartupNotification : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupNotification ();
++		public Meta.LaunchContext create_launcher ();
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		public signal void changed (void* object);
++	}
++	[CCode (cheader_filename = "meta/main.h", type_id = "meta_startup_sequence_get_type ()")]
++	public class StartupSequence : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupSequence ();
++		public unowned string get_application_id ();
++		public bool get_completed ();
++		public unowned string get_icon_name ();
++		public unowned string get_id ();
++		public unowned string get_name ();
++		public uint64 get_timestamp ();
++		public unowned string get_wmclass ();
++		public int get_workspace ();
++		public string application_id { get; construct; }
++		public string icon_name { get; construct; }
++		public string id { get; construct; }
++		public string name { get; construct; }
++		public uint64 timestamp { get; construct; }
++		public string wmclass { get; construct; }
++		public int workspace { get; construct; }
++		[HasEmitter]
++		public signal void complete ();
++	}
++	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
++	[Compact]
++	public class Theme {
++		public void free ();
++	}
++	[CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")]
++	public class WaylandClient : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public WaylandClient (GLib.SubprocessLauncher launcher) throws GLib.Error;
++		public void hide_from_window_list (Meta.Window window);
++		public bool owns_window (Meta.Window window);
++		public void show_in_window_list (Meta.Window window);
++		public GLib.Subprocess spawnv (Meta.Display display, [CCode (array_length = false, array_null_terminated = true)] string[] argv) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "meta/window.h", type_id = "meta_window_get_type ()")]
++	public abstract class Window : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Window ();
++		public void activate (uint32 current_time);
++		public void activate_with_workspace (uint32 current_time, Meta.Workspace workspace);
++		public bool allows_move ();
++		public bool allows_resize ();
++		public void begin_grab_op (Meta.GrabOp op, bool frame_action, uint32 timestamp);
++		public bool can_close ();
++		public bool can_maximize ();
++		public bool can_minimize ();
++		public bool can_shade ();
++		public void change_workspace (Meta.Workspace workspace);
++		public void change_workspace_by_index (int space_index, bool append);
++		public void check_alive (uint32 timestamp);
++		public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect);
++		public void compute_group ();
++		public void @delete (uint32 timestamp);
++		public unowned Meta.Window find_root_ancestor ();
++		public void focus (uint32 timestamp);
++		public void foreach_ancestor (Meta.WindowForeachFunc func);
++		public void foreach_transient (Meta.WindowForeachFunc func);
++		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
++		public Meta.Rectangle get_buffer_rect ();
++		public unowned string get_client_machine ();
++		public Meta.WindowClientType get_client_type ();
++		public unowned GLib.Object get_compositor_private ();
++		public unowned string get_description ();
++		public unowned Meta.Display get_display ();
++		public unowned Cairo.Region? get_frame_bounds ();
++		public Meta.Rectangle get_frame_rect ();
++		public Meta.FrameType get_frame_type ();
++		public unowned string get_gtk_app_menu_object_path ();
++		public unowned string get_gtk_application_id ();
++		public unowned string get_gtk_application_object_path ();
++		public unowned string get_gtk_menubar_object_path ();
++		public unowned string get_gtk_theme_variant ();
++		public unowned string get_gtk_unique_bus_name ();
++		public unowned string get_gtk_window_object_path ();
++		public bool get_icon_geometry (out Meta.Rectangle rect);
++		public uint64 get_id ();
++		public Meta.StackLayer get_layer ();
++		public Meta.MaximizeFlags get_maximized ();
++		public int get_monitor ();
++		public unowned string get_mutter_hints ();
++		public int get_pid ();
++		public unowned string get_role ();
++		public unowned string get_sandboxed_app_id ();
++		public uint get_stable_sequence ();
++		public unowned string get_startup_id ();
++		public unowned Meta.Window? get_tile_match ();
++		public unowned string get_title ();
++		public unowned Meta.Window get_transient_for ();
++		public uint32 get_user_time ();
++		public Meta.WindowType get_window_type ();
++		public unowned string get_wm_class ();
++		public unowned string get_wm_class_instance ();
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_current_monitor ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public unowned Meta.Workspace get_workspace ();
++		public X.Window get_xwindow ();
++		public void group_leader_changed ();
++		public bool has_focus ();
++		public bool is_above ();
++		public bool is_always_on_all_workspaces ();
++		public bool is_ancestor_of_transient (Meta.Window transient);
++		public bool is_attached_dialog ();
++		public bool is_client_decorated ();
++		public bool is_fullscreen ();
++		public bool is_hidden ();
++		public bool is_monitor_sized ();
++		public bool is_on_all_workspaces ();
++		public bool is_on_primary_monitor ();
++		public bool is_override_redirect ();
++		public bool is_remote ();
++		public bool is_screen_sized ();
++		public bool is_shaded ();
++		public bool is_skip_taskbar ();
++		public void kill ();
++		public bool located_on_workspace (Meta.Workspace workspace);
++		public void lower ();
++		public void make_above ();
++		public void make_fullscreen ();
++		public void maximize (Meta.MaximizeFlags directions);
++		public void minimize ();
++		public void move_frame (bool user_op, int root_x_nw, int root_y_nw);
++		public void move_resize_frame (bool user_op, int root_x_nw, int root_y_nw, int w, int h);
++		public void move_to_monitor (int monitor);
++		public void raise ();
++		public void set_compositor_private (GLib.Object priv);
++		public void set_demands_attention ();
++		public void set_icon_geometry (Meta.Rectangle? rect);
++		public void shade (uint32 timestamp);
++		public void shove_titlebar_onscreen ();
++		public bool showing_on_its_workspace ();
++		public void shutdown_group ();
++		public void stick ();
++		public bool titlebar_is_onscreen ();
++		public void unmake_above ();
++		public void unmake_fullscreen ();
++		public void unmaximize (Meta.MaximizeFlags directions);
++		public void unminimize ();
++		public void unset_demands_attention ();
++		public void unshade (uint32 timestamp);
++		public void unstick ();
++		[NoAccessorMethod]
++		public bool above { get; }
++		[NoAccessorMethod]
++		public bool appears_focused { get; }
++		[NoAccessorMethod]
++		public bool decorated { get; }
++		[NoAccessorMethod]
++		public bool demands_attention { get; }
++		[NoAccessorMethod]
++		public bool fullscreen { get; }
++		public string gtk_app_menu_object_path { get; }
++		public string gtk_application_id { get; }
++		public string gtk_application_object_path { get; }
++		public string gtk_menubar_object_path { get; }
++		public string gtk_unique_bus_name { get; }
++		public string gtk_window_object_path { get; }
++		[NoAccessorMethod]
++		public void* icon { get; }
++		[NoAccessorMethod]
++		public bool maximized_horizontally { get; }
++		[NoAccessorMethod]
++		public bool maximized_vertically { get; }
++		[NoAccessorMethod]
++		public void* mini_icon { get; }
++		[NoAccessorMethod]
++		public bool minimized { get; }
++		public string mutter_hints { get; }
++		[NoAccessorMethod]
++		public bool on_all_workspaces { get; }
++		[NoAccessorMethod]
++		public bool resizeable { get; }
++		[NoAccessorMethod]
++		public bool skip_taskbar { get; }
++		public string title { get; }
++		[NoAccessorMethod]
++		public bool urgent { get; }
++		public uint user_time { get; }
++		public Meta.WindowType window_type { get; }
++		public string wm_class { get; }
++		public signal void position_changed ();
++		public signal void raised ();
++		public signal void shown ();
++		public signal void size_changed ();
++		public signal void unmanaged ();
++		public signal void unmanaging ();
++		public signal void workspace_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")]
++	public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowActor ();
++		public void freeze ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Meta.Window get_meta_window ();
++		public unowned Meta.ShapedTexture get_texture ();
++		public bool is_destroyed ();
++		public void sync_visibility ();
++		public void thaw ();
++		public Meta.Window meta_window { get; construct; }
++		public signal void damaged ();
++		public signal void effects_completed ();
++		public signal void first_frame ();
++		public signal void thawed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-group.h", type_id = "meta_window_group_get_type ()")]
++	public class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-shape.h", ref_function = "meta_window_shape_ref", type_id = "meta_window_shape_get_type ()", unref_function = "meta_window_shape_unref")]
++	[Compact]
++	public class WindowShape {
++		[CCode (has_construct_function = false)]
++		public WindowShape (Cairo.Region region);
++		public bool equal (Meta.WindowShape shape_b);
++		public void get_borders (int border_top, int border_right, int border_bottom, int border_left);
++		public uint hash ();
++		public Meta.WindowShape @ref ();
++		public Cairo.Region to_region (int center_width, int center_height);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/workspace.h", type_id = "meta_workspace_get_type ()")]
++	public class Workspace : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Workspace ();
++		public void activate (uint32 timestamp);
++		public void activate_with_focus (Meta.Window focus_this, uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction);
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public int index ();
++		public GLib.List<weak Meta.Window> list_windows ();
++		public void set_builtin_struts (GLib.SList<Meta.Strut?> struts);
++		[NoAccessorMethod]
++		public bool active { get; }
++		[NoAccessorMethod]
++		public uint n_windows { get; }
++		[NoAccessorMethod]
++		public uint workspace_index { get; }
++		public signal void window_added (Meta.Window object);
++		public signal void window_removed (Meta.Window object);
++	}
++	[CCode (cheader_filename = "meta/meta-workspace-manager.h", type_id = "meta_workspace_manager_get_type ()")]
++	public class WorkspaceManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected WorkspaceManager ();
++		public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp);
++		public unowned Meta.Workspace get_active_workspace ();
++		public int get_active_workspace_index ();
++		public int get_n_workspaces ();
++		public unowned Meta.Workspace? get_workspace_by_index (int index);
++		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
++		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
++		public void reorder_workspace (Meta.Workspace workspace, int new_index);
++		[NoAccessorMethod]
++		public int layout_columns { get; }
++		[NoAccessorMethod]
++		public int layout_rows { get; }
++		public int n_workspaces { get; }
++		public signal void active_workspace_changed ();
++		public signal void showing_desktop_changed ();
++		public signal void workspace_added (int object);
++		public signal void workspace_removed (int object);
++		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
++		public signal void workspaces_reordered ();
++	}
++	[CCode (cheader_filename = "meta/meta-x11-display.h", type_id = "meta_x11_display_get_type ()")]
++	public class X11Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected X11Display ();
++		public void clear_stage_input_region ();
++		public int get_damage_event_base ();
++		public int get_screen_number ();
++		public int get_shape_event_base ();
++		public bool has_shape ();
++		public void set_cm_selection ();
++		public void set_stage_input_region (X.XserverRegion region);
++		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
++	}
++	[CCode (cheader_filename = "meta/meta-close-dialog.h", type_cname = "MetaCloseDialogInterface", type_id = "meta_close_dialog_get_type ()")]
++	public interface CloseDialog : GLib.Object {
++		public abstract void focus ();
++		public abstract void hide ();
++		public bool is_visible ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.CloseDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/meta-inhibit-shortcuts-dialog.h", type_cname = "MetaInhibitShortcutsDialogInterface", type_id = "meta_inhibit_shortcuts_dialog_get_type ()")]
++	public interface InhibitShortcutsDialog : GLib.Object {
++		public abstract void hide ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.InhibitShortcutsDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ButtonLayout {
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction left_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool left_buttons_has_spacer[4];
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction right_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool right_buttons_has_spacer[4];
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Edge {
++		public Meta.Rectangle rect;
++		public Meta.Side side_type;
++		public Meta.EdgeType edge_type;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct FrameBorders {
++		public Gtk.Border visible;
++		public Gtk.Border invisible;
++		public Gtk.Border total;
++		public void clear ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", has_type_id = false)]
++	public struct PluginInfo {
++		public weak string name;
++		public weak string version;
++		public weak string author;
++		public weak string license;
++		public weak string description;
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_rectangle_get_type ()")]
++	public struct Rectangle {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++		public int area ();
++		public bool contains_rect (Meta.Rectangle inner_rect);
++		public Meta.Rectangle? copy ();
++		public bool could_fit_rect (Meta.Rectangle inner_rect);
++		public bool equal (Meta.Rectangle src2);
++		public void free ();
++		public bool horiz_overlap (Meta.Rectangle rect2);
++		public bool intersect (Meta.Rectangle src2, out Meta.Rectangle dest);
++		public bool overlap (Meta.Rectangle rect2);
++		public Meta.Rectangle union (Meta.Rectangle rect2);
++		public bool vert_overlap (Meta.Rectangle rect2);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ShadowParams {
++		public int radius;
++		public int top_fade;
++		public int x_offset;
++		public int y_offset;
++		public uint8 opacity;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Strut {
++		public Meta.Rectangle rect;
++		public Meta.Side side;
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BARRIER_DIRECTION_", type_id = "meta_barrier_direction_get_type ()")]
++	[Flags]
++	public enum BarrierDirection {
++		POSITIVE_X,
++		POSITIVE_Y,
++		NEGATIVE_X,
++		NEGATIVE_Y
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BUTTON_FUNCTION_", type_id = "meta_button_function_get_type ()")]
++	public enum ButtonFunction {
++		MENU,
++		MINIMIZE,
++		MAXIMIZE,
++		CLOSE,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CLOSE_DIALOG_RESPONSE_", type_id = "meta_close_dialog_response_get_type ()")]
++	public enum CloseDialogResponse {
++		WAIT,
++		FORCE_CLOSE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_COMP_EFFECT_", type_id = "meta_comp_effect_get_type ()")]
++	public enum CompEffect {
++		CREATE,
++		UNMINIMIZE,
++		DESTROY,
++		MINIMIZE,
++		NONE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CURSOR_", type_id = "meta_cursor_get_type ()")]
++	public enum Cursor {
++		NONE,
++		DEFAULT,
++		NORTH_RESIZE,
++		SOUTH_RESIZE,
++		WEST_RESIZE,
++		EAST_RESIZE,
++		SE_RESIZE,
++		SW_RESIZE,
++		NE_RESIZE,
++		NW_RESIZE,
++		MOVE_OR_RESIZE_WINDOW,
++		BUSY,
++		DND_IN_DRAG,
++		DND_MOVE,
++		DND_COPY,
++		DND_UNSUPPORTED_TARGET,
++		POINTING_HAND,
++		CROSSHAIR,
++		IBEAM,
++		BLANK,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
++	[Flags]
++	public enum DebugTopic {
++		VERBOSE,
++		FOCUS,
++		WORKAREA,
++		STACK,
++		SM,
++		EVENTS,
++		WINDOW_STATE,
++		WINDOW_OPS,
++		GEOMETRY,
++		PLACEMENT,
++		PING,
++		KEYBINDINGS,
++		SYNC,
++		STARTUP,
++		PREFS,
++		GROUPS,
++		RESIZING,
++		SHAPES,
++		EDGE_RESISTANCE,
++		DBUS,
++		INPUT,
++		WAYLAND,
++		KMS,
++		SCREEN_CAST,
++		REMOTE_DESKTOP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DIRECTION_", type_id = "meta_direction_get_type ()")]
++	[Flags]
++	public enum Direction {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM,
++		UP,
++		DOWN,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_corner_get_type ()")]
++	public enum DisplayCorner {
++		TOPLEFT,
++		TOPRIGHT,
++		BOTTOMLEFT,
++		BOTTOMRIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_direction_get_type ()")]
++	public enum DisplayDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EDGE_", type_id = "meta_edge_type_get_type ()")]
++	public enum EdgeType {
++		WINDOW,
++		MONITOR,
++		SCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")]
++	public enum ExitCode {
++		SUCCESS,
++		ERROR
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_", type_id = "meta_frame_flags_get_type ()")]
++	[Flags]
++	public enum FrameFlags {
++		ALLOWS_DELETE,
++		ALLOWS_MENU,
++		ALLOWS_MINIMIZE,
++		ALLOWS_MAXIMIZE,
++		ALLOWS_VERTICAL_RESIZE,
++		ALLOWS_HORIZONTAL_RESIZE,
++		HAS_FOCUS,
++		SHADED,
++		STUCK,
++		MAXIMIZED,
++		ALLOWS_SHADE,
++		ALLOWS_MOVE,
++		FULLSCREEN,
++		ABOVE,
++		TILED_LEFT,
++		TILED_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_TYPE_", type_id = "meta_frame_type_get_type ()")]
++	public enum FrameType {
++		NORMAL,
++		DIALOG,
++		MODAL_DIALOG,
++		UTILITY,
++		MENU,
++		BORDER,
++		ATTACHED,
++		LAST;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAB_OP_", type_id = "meta_grab_op_get_type ()")]
++	public enum GrabOp {
++		NONE,
++		WINDOW_BASE,
++		COMPOSITOR,
++		WAYLAND_POPUP,
++		FRAME_BUTTON,
++		MOVING,
++		RESIZING_NW,
++		RESIZING_N,
++		RESIZING_NE,
++		RESIZING_E,
++		RESIZING_SW,
++		RESIZING_S,
++		RESIZING_SE,
++		RESIZING_W,
++		KEYBOARD_MOVING,
++		KEYBOARD_RESIZING_UNKNOWN,
++		KEYBOARD_RESIZING_NW,
++		KEYBOARD_RESIZING_N,
++		KEYBOARD_RESIZING_NE,
++		KEYBOARD_RESIZING_E,
++		KEYBOARD_RESIZING_SW,
++		KEYBOARD_RESIZING_S,
++		KEYBOARD_RESIZING_SE,
++		KEYBOARD_RESIZING_W
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")]
++	public enum Gravity {
++		NONE,
++		NORTH_WEST,
++		NORTH,
++		NORTH_EAST,
++		WEST,
++		CENTER,
++		EAST,
++		SOUTH_WEST,
++		SOUTH,
++		SOUTH_EAST,
++		STATIC
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_INHIBIT_SHORTCUTS_DIALOG_RESPONSE_", type_id = "meta_inhibit_shortcuts_dialog_response_get_type ()")]
++	public enum InhibitShortcutsDialogResponse {
++		ALLOW,
++		DENY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEYBINDING_ACTION_", type_id = "meta_key_binding_action_get_type ()")]
++	public enum KeyBindingAction {
++		NONE,
++		WORKSPACE_1,
++		WORKSPACE_2,
++		WORKSPACE_3,
++		WORKSPACE_4,
++		WORKSPACE_5,
++		WORKSPACE_6,
++		WORKSPACE_7,
++		WORKSPACE_8,
++		WORKSPACE_9,
++		WORKSPACE_10,
++		WORKSPACE_11,
++		WORKSPACE_12,
++		WORKSPACE_LEFT,
++		WORKSPACE_RIGHT,
++		WORKSPACE_UP,
++		WORKSPACE_DOWN,
++		WORKSPACE_LAST,
++		SWITCH_APPLICATIONS,
++		SWITCH_APPLICATIONS_BACKWARD,
++		SWITCH_GROUP,
++		SWITCH_GROUP_BACKWARD,
++		SWITCH_WINDOWS,
++		SWITCH_WINDOWS_BACKWARD,
++		SWITCH_PANELS,
++		SWITCH_PANELS_BACKWARD,
++		CYCLE_GROUP,
++		CYCLE_GROUP_BACKWARD,
++		CYCLE_WINDOWS,
++		CYCLE_WINDOWS_BACKWARD,
++		CYCLE_PANELS,
++		CYCLE_PANELS_BACKWARD,
++		SHOW_DESKTOP,
++		PANEL_MAIN_MENU,
++		PANEL_RUN_DIALOG,
++		TOGGLE_RECORDING,
++		SET_SPEW_MARK,
++		ACTIVATE_WINDOW_MENU,
++		TOGGLE_FULLSCREEN,
++		TOGGLE_MAXIMIZED,
++		TOGGLE_TILED_LEFT,
++		TOGGLE_TILED_RIGHT,
++		TOGGLE_ABOVE,
++		MAXIMIZE,
++		UNMAXIMIZE,
++		TOGGLE_SHADED,
++		MINIMIZE,
++		CLOSE,
++		BEGIN_MOVE,
++		BEGIN_RESIZE,
++		TOGGLE_ON_ALL_WORKSPACES,
++		MOVE_TO_WORKSPACE_1,
++		MOVE_TO_WORKSPACE_2,
++		MOVE_TO_WORKSPACE_3,
++		MOVE_TO_WORKSPACE_4,
++		MOVE_TO_WORKSPACE_5,
++		MOVE_TO_WORKSPACE_6,
++		MOVE_TO_WORKSPACE_7,
++		MOVE_TO_WORKSPACE_8,
++		MOVE_TO_WORKSPACE_9,
++		MOVE_TO_WORKSPACE_10,
++		MOVE_TO_WORKSPACE_11,
++		MOVE_TO_WORKSPACE_12,
++		MOVE_TO_WORKSPACE_LEFT,
++		MOVE_TO_WORKSPACE_RIGHT,
++		MOVE_TO_WORKSPACE_UP,
++		MOVE_TO_WORKSPACE_DOWN,
++		MOVE_TO_WORKSPACE_LAST,
++		MOVE_TO_MONITOR_LEFT,
++		MOVE_TO_MONITOR_RIGHT,
++		MOVE_TO_MONITOR_UP,
++		MOVE_TO_MONITOR_DOWN,
++		RAISE_OR_LOWER,
++		RAISE,
++		LOWER,
++		MAXIMIZE_VERTICALLY,
++		MAXIMIZE_HORIZONTALLY,
++		MOVE_TO_CORNER_NW,
++		MOVE_TO_CORNER_NE,
++		MOVE_TO_CORNER_SW,
++		MOVE_TO_CORNER_SE,
++		MOVE_TO_SIDE_N,
++		MOVE_TO_SIDE_S,
++		MOVE_TO_SIDE_E,
++		MOVE_TO_SIDE_W,
++		MOVE_TO_CENTER,
++		OVERLAY_KEY,
++		LOCATE_POINTER_KEY,
++		ISO_NEXT_GROUP,
++		ALWAYS_ON_TOP,
++		SWITCH_MONITOR,
++		ROTATE_MONITOR,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEY_BINDING_", type_id = "meta_key_binding_flags_get_type ()")]
++	[Flags]
++	public enum KeyBindingFlags {
++		NONE,
++		PER_WINDOW,
++		BUILTIN,
++		IS_REVERSED,
++		NON_MASKABLE,
++		IGNORE_AUTOREPEAT,
++		NO_AUTO_GRAB
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LATER_", type_id = "meta_later_type_get_type ()")]
++	public enum LaterType {
++		RESIZE,
++		CALC_SHOWING,
++		CHECK_FULLSCREEN,
++		SYNC_STACK,
++		BEFORE_REDRAW,
++		IDLE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LOCALE_DIRECTION_", type_id = "meta_locale_direction_get_type ()")]
++	public enum LocaleDirection {
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MAXIMIZE_", type_id = "meta_maximize_flags_get_type ()")]
++	[Flags]
++	public enum MaximizeFlags {
++		HORIZONTAL,
++		VERTICAL,
++		BOTH
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MODAL_", type_id = "meta_modal_options_get_type ()")]
++	[Flags]
++	public enum ModalOptions {
++		POINTER_ALREADY_GRABBED,
++		KEYBOARD_ALREADY_GRABBED
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MONITOR_SWITCH_CONFIG_", type_id = "meta_monitor_switch_config_type_get_type ()")]
++	public enum MonitorSwitchConfigType {
++		ALL_MIRROR,
++		ALL_LINEAR,
++		EXTERNAL,
++		BUILTIN,
++		UNKNOWN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MOTION_", type_id = "meta_motion_direction_get_type ()")]
++	public enum MotionDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		UP_LEFT,
++		UP_RIGHT,
++		DOWN_LEFT,
++		DOWN_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_PAD_ACTION_", type_id = "meta_pad_action_type_get_type ()")]
++	public enum PadActionType {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "meta/prefs.h", cprefix = "META_PREF_", type_id = "meta_preference_get_type ()")]
++	public enum Preference {
++		MOUSE_BUTTON_MODS,
++		FOCUS_MODE,
++		FOCUS_NEW_WINDOWS,
++		ATTACH_MODAL_DIALOGS,
++		RAISE_ON_CLICK,
++		ACTION_DOUBLE_CLICK_TITLEBAR,
++		ACTION_MIDDLE_CLICK_TITLEBAR,
++		ACTION_RIGHT_CLICK_TITLEBAR,
++		AUTO_RAISE,
++		AUTO_RAISE_DELAY,
++		FOCUS_CHANGE_ON_POINTER_REST,
++		TITLEBAR_FONT,
++		NUM_WORKSPACES,
++		DYNAMIC_WORKSPACES,
++		KEYBINDINGS,
++		DISABLE_WORKAROUNDS,
++		BUTTON_LAYOUT,
++		WORKSPACE_NAMES,
++		VISUAL_BELL,
++		AUDIBLE_BELL,
++		VISUAL_BELL_TYPE,
++		GNOME_ACCESSIBILITY,
++		GNOME_ANIMATIONS,
++		CURSOR_THEME,
++		CURSOR_SIZE,
++		RESIZE_WITH_RIGHT_BUTTON,
++		EDGE_TILING,
++		FORCE_FULLSCREEN,
++		WORKSPACES_ONLY_ON_PRIMARY,
++		DRAGGABLE_BORDER_WIDTH,
++		AUTO_MAXIMIZE,
++		CENTER_NEW_WINDOWS,
++		DRAG_THRESHOLD,
++		LOCATE_POINTER,
++		CHECK_ALIVE_TIMEOUT;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	public enum SelectionType {
++		SELECTION_PRIMARY,
++		SELECTION_CLIPBOARD,
++		SELECTION_DND,
++		N_SELECTION_TYPES
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")]
++	public enum ShadowMode {
++		AUTO,
++		FORCED_OFF,
++		FORCED_ON
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIDE_", type_id = "meta_side_get_type ()")]
++	public enum Side {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIZE_CHANGE_", type_id = "meta_size_change_get_type ()")]
++	public enum SizeChange {
++		MAXIMIZE,
++		UNMAXIMIZE,
++		FULLSCREEN,
++		UNFULLSCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LAYER_", type_id = "meta_stack_layer_get_type ()")]
++	public enum StackLayer {
++		DESKTOP,
++		BOTTOM,
++		NORMAL,
++		TOP,
++		DOCK,
++		OVERRIDE_REDIRECT,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_LIST_", type_id = "meta_tab_list_get_type ()")]
++	public enum TabList {
++		NORMAL,
++		DOCKS,
++		GROUP,
++		NORMAL_ALL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_SHOW_", type_id = "meta_tab_show_type_get_type ()")]
++	public enum TabShowType {
++		ICON,
++		INSTANTLY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")]
++	[Flags]
++	public enum VirtualModifier {
++		SHIFT_MASK,
++		CONTROL_MASK,
++		ALT_MASK,
++		META_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")]
++	public enum WindowClientType {
++		WAYLAND,
++		X11
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_MENU_", type_id = "meta_window_menu_type_get_type ()")]
++	public enum WindowMenuType {
++		WM,
++		APP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_", type_id = "meta_window_type_get_type ()")]
++	public enum WindowType {
++		NORMAL,
++		DESKTOP,
++		DOCK,
++		DIALOG,
++		MODAL_DIALOG,
++		TOOLBAR,
++		MENU,
++		UTILITY,
++		SPLASHSCREEN,
++		DROPDOWN_MENU,
++		POPUP_MENU,
++		TOOLTIP,
++		NOTIFICATION,
++		COMBO,
++		DND,
++		OVERRIDE_OTHER
++	}
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 2.9)]
++	public delegate void IdleMonitorWatchFunc (Meta.IdleMonitor monitor, uint watch_id);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 4.9)]
++	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Window window, [CCode (type = "ClutterKeyEvent*")] Clutter.KeyEvent? event, Meta.KeyBinding binding);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate void PrefsChangedFunc (Meta.Preference pref);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate bool WindowForeachFunc (Meta.Window window);
++	[CCode (cheader_filename = "meta/main.h", cname = "META_CURRENT_TIME")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
++	public const string DEFAULT_ICON_NAME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_HEIGHT")]
++	public const int ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_WIDTH")]
++	public const int ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_HEIGHT")]
++	public const int MINI_ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_WIDTH")]
++	public const int MINI_ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_BEFORE_REDRAW")]
++	public const int PRIORITY_BEFORE_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_PREFS_NOTIFY")]
++	public const int PRIORITY_PREFS_NOTIFY;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_REDRAW")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_RESIZE")]
++	public const int PRIORITY_RESIZE;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_KEYBOARD_ID")]
++	public const int VIRTUAL_CORE_KEYBOARD_ID;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_POINTER_ID")]
++	public const int VIRTUAL_CORE_POINTER_ID;
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void clutter_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void exit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static string g_utf8_strndup (string src, size_t n);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static unowned GLib.OptionContext get_option_context ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool get_replace_current_wm ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_restart ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_topic_enabled (Meta.DebugTopic topic);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void quit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void register_with_session ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void restart (string? message);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static int run ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_gnome_wm_keybindings (string wm_keybindings);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_wm_name (string wm_name);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void test_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool x11_init_gdk_display () throws GLib.Error;
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct before_frame {
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct frame {
++}
+diff --git vapi/mutter-clutter-7-custom.vala vapi/mutter-clutter-7-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-7-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-7.deps vapi/mutter-clutter-7.deps
+index 6bd1ccf7..2f4cf3e8 100644
+--- vapi/mutter-clutter-7.deps
++++ vapi/mutter-clutter-7.deps
+@@ -2,3 +2,4 @@ atk
+ cairo
+ json-glib-1.0
+ mutter-cogl-7
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-7.vapi vapi/mutter-clutter-7.vapi
+index d7e133df..b1cdd185 100644
+--- vapi/mutter-clutter-7.vapi
++++ vapi/mutter-clutter-7.vapi
+@@ -4659,11 +4659,11 @@ namespace Clutter {
+ 		[Version (since = "0.8")]
+ 		public void allocate_preferred_size (float x, float y);
+ 		[Version (since = "0.6")]
+-		public void apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
+ 		[NoWrapper]
+ 		public virtual void apply_transform (ref Clutter.Matrix matrix);
+ 		[Version (since = "0.4")]
+-		public void apply_transform_to_point (Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
+ 		[Version (since = "1.24")]
+ 		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
+ 		[NoWrapper]
+@@ -4724,7 +4724,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
+ 		[Version (since = "1.10")]
+-		public unowned Clutter.PaintVolume get_default_paint_volume ();
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
+ 		[Version (since = "1.10")]
+ 		public uint get_easing_delay ();
+ 		[Version (since = "1.10")]
+@@ -4751,7 +4751,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public unowned Clutter.LayoutManager get_layout_manager ();
+ 		[Version (since = "1.10")]
+-		public void get_margin (Clutter.Margin margin);
++		public Clutter.Margin get_margin ();
+ 		[Version (since = "1.10")]
+ 		public float get_margin_bottom ();
+ 		[Version (since = "1.10")]
+@@ -4776,8 +4776,11 @@ namespace Clutter {
+ 		public uint8 get_paint_opacity ();
+ 		[Version (since = "0.8")]
+ 		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
+ 		[NoWrapper]
+-		public virtual bool get_paint_volume (Clutter.PaintVolume volume);
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
+ 		[Version (since = "1.0")]
+ 		public unowned Pango.Context get_pango_context ();
+ 		public unowned Clutter.Actor? get_parent ();
+@@ -4814,9 +4817,9 @@ namespace Clutter {
+ 		public Clutter.TextDirection get_text_direction ();
+ 		[Version (since = "1.12")]
+ 		public Clutter.Matrix get_transform ();
+-		public void get_transformed_extents (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_transformed_extents ();
+ 		[Version (since = "1.6")]
+-		public unowned Clutter.PaintVolume get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
+ 		[Version (since = "0.8")]
+ 		public void get_transformed_position (out float x, out float y);
+ 		[Version (since = "0.8")]
+@@ -5275,7 +5278,7 @@ namespace Clutter {
+ 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
+ 		public Clutter.AlignAxis get_align_axis ();
+ 		public float get_factor ();
+-		public void get_pivot_point (out unowned Graphene.Point pivot_point);
++		public Graphene.Point get_pivot_point ();
+ 		public unowned Clutter.Actor get_source ();
+ 		public void set_align_axis (Clutter.AlignAxis axis);
+ 		public void set_factor (float factor);
+@@ -5283,8 +5286,7 @@ namespace Clutter {
+ 		public void set_source (Clutter.Actor? source);
+ 		public Clutter.AlignAxis align_axis { get; set construct; }
+ 		public float factor { get; set construct; }
+-		[NoAccessorMethod]
+-		public Graphene.Point pivot_point { owned get; set; }
++		public Graphene.Point pivot_point { get; set; }
+ 		public Clutter.Actor source { get; set construct; }
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+@@ -5302,6 +5304,8 @@ namespace Clutter {
+ 	public abstract class Backend : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
+ 		public unowned Clutter.Seat get_default_seat ();
+ 		[Version (since = "0.8")]
+ 		public unowned Cairo.FontOptions get_font_options ();
+@@ -5561,6 +5565,16 @@ namespace Clutter {
+ 		public void set_factor (double factor);
+ 		public double factor { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public abstract class Effect : Clutter.ActorMeta {
+@@ -5630,7 +5644,7 @@ namespace Clutter {
+ 		public uint get_mode_group ();
+ 		public bool get_pad_event_details (out uint number, out uint mode, out double value);
+ 		[Version (since = "1.12")]
+-		public void get_position (Graphene.Point position);
++		public Graphene.Point get_position ();
+ 		[Version (since = "1.0")]
+ 		public unowned Clutter.Actor get_related ();
+ 		[Version (since = "1.10")]
+@@ -5752,7 +5766,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
+ 	public class FrameClock : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+-		public FrameClock (float refresh_rate, Clutter.FrameListenerIface iface, void* user_data);
++		protected FrameClock ();
+ 		public void add_timeline (Clutter.Timeline timeline);
+ 		public float get_refresh_rate ();
+ 		public void inhibit ();
+@@ -5850,6 +5864,18 @@ namespace Clutter {
+ 		public bool row_homogeneous { get; set; }
+ 		public uint row_spacing { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
+ 	[Version (since = "1.10")]
+ 	public class Image : GLib.Object, Clutter.Content {
+@@ -5874,7 +5900,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_axis_value ([CCode (array_length = false)] double[] axes, Clutter.InputAxis axis, out double value);
+ 		[Version (since = "1.12")]
+-		public bool get_coords (Clutter.EventSequence? sequence, Graphene.Point point);
++		public bool get_coords (Clutter.EventSequence? sequence, out Graphene.Point point);
+ 		[Version (since = "1.0")]
+ 		public int get_device_id ();
+ 		[Version (since = "1.6")]
+@@ -5904,13 +5930,13 @@ namespace Clutter {
+ 		public int get_n_mode_groups ();
+ 		public int get_n_rings ();
+ 		public int get_n_strips ();
++		[Version (since = "1.6")]
++		public GLib.List<weak Clutter.InputDevice> get_physical_devices ();
+ 		[Version (since = "1.2")]
+ 		public unowned Clutter.Stage get_pointer_stage ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_product_id ();
+ 		public unowned Clutter.Seat get_seat ();
+-		[Version (since = "1.6")]
+-		public GLib.List<weak Clutter.InputDevice> get_slave_devices ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_vendor_id ();
+ 		[Version (since = "1.10")]
+@@ -5987,7 +6013,7 @@ namespace Clutter {
+ 		public virtual void commit_text (string text);
+ 		[NoWrapper]
+ 		public virtual void delete_surrounding (int offset, uint len);
+-		public bool filter_key_event (Clutter.KeyEvent key);
++		public bool filter_event (Clutter.Event event);
+ 		[NoWrapper]
+ 		public virtual void focus_in (Clutter.InputMethod input_method);
+ 		[NoWrapper]
+@@ -6153,19 +6179,6 @@ namespace Clutter {
+ 		public unowned Clutter.LayoutManager get_manager ();
+ 		public Clutter.LayoutManager manager { get; construct; }
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.10")]
+-	public class Margin {
+-		public float bottom;
+-		public float left;
+-		public float right;
+-		public float top;
+-		[CCode (has_construct_function = false)]
+-		public Margin ();
+-		public Clutter.Margin copy ();
+-		public void free ();
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	[Compact]
+ 	[Version (since = "0.2")]
+@@ -6188,13 +6201,56 @@ namespace Clutter {
+ 		protected OffscreenEffect ();
+ 		public virtual Cogl.Handle create_texture (float width, float height);
+ 		[Version (since = "1.14")]
+-		public bool get_target_rect (out unowned Graphene.Rect rect);
++		public bool get_target_rect (out Graphene.Rect rect);
+ 		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
+ 		public bool get_target_size (out float width, out float height);
+ 		[Version (since = "1.10")]
+ 		public unowned Cogl.Handle get_texture ();
+ 		public virtual void paint_target (Clutter.PaintContext paint_context);
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public class PageTurnEffect : Clutter.DeformEffect {
+@@ -6236,37 +6292,6 @@ namespace Clutter {
+ 		public void set_name (string name);
+ 		public void unref ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.4")]
+-	public class PaintVolume {
+-		[Version (since = "1.6")]
+-		public Clutter.PaintVolume copy ();
+-		[Version (since = "1.6")]
+-		public void free ();
+-		[Version (since = "1.6")]
+-		public float get_depth ();
+-		[Version (since = "1.6")]
+-		public float get_height ();
+-		[Version (since = "1.6")]
+-		public void get_origin (out unowned Graphene.Point3D vertex);
+-		[Version (since = "1.6")]
+-		public float get_width ();
+-		[Version (since = "1.6")]
+-		public void set_depth (float depth);
+-		[Version (since = "1.6")]
+-		public bool set_from_allocation (Clutter.Actor actor);
+-		[Version (since = "1.6")]
+-		public void set_height (float height);
+-		[Version (since = "1.6")]
+-		public void set_origin (Graphene.Point3D origin);
+-		[Version (since = "1.6")]
+-		public void set_width (float width);
+-		[Version (since = "1.6")]
+-		public void union (Clutter.PaintVolume another_pv);
+-		[Version (since = "1.10")]
+-		public void union_box (Clutter.ActorBox box);
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
+ 	[Version (since = "1.12")]
+ 	public class PanAction : Clutter.GestureAction {
+@@ -6370,6 +6395,17 @@ namespace Clutter {
+ 		public void set_property_name (string? property_name);
+ 		public string property_name { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
+ 	public class RootNode : Clutter.PaintNode {
+ 		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
+@@ -6464,6 +6500,7 @@ namespace Clutter {
+ 		public virtual unowned Clutter.InputDevice get_pointer ();
+ 		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
+ 		public bool get_touch_mode ();
++		public virtual bool handle_device_event (Clutter.Event event);
+ 		public void inhibit_unfocus ();
+ 		public bool is_unfocus_inhibited ();
+ 		public GLib.List<weak Clutter.InputDevice> list_devices ();
+@@ -6588,7 +6625,7 @@ namespace Clutter {
+ 		[Version (since = "1.0")]
+ 		public void ensure_viewport ();
+ 		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
+-		public bool get_capture_final_size (Cairo.RectangleInt rect, int width, int height, float scale);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int width, out int height, out float scale);
+ 		public int64 get_frame_counter ();
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor get_key_focus ();
+@@ -6602,7 +6639,7 @@ namespace Clutter {
+ 		[Version (since = "0.4")]
+ 		public unowned string get_title ();
+ 		public bool get_use_alpha ();
+-		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, uint8 data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
+ 		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
+ 		[CCode (array_length = false)]
+ 		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
+@@ -6629,7 +6666,7 @@ namespace Clutter {
+ 		[Version (since = "1.20")]
+ 		public signal void after_paint (Clutter.StageView view);
+ 		public signal void after_update (Clutter.StageView view);
+-		public signal void before_paint (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
+ 		public signal void before_update (Clutter.StageView view);
+ 		[Version (since = "0.6")]
+ 		public virtual signal void deactivate ();
+@@ -6676,6 +6713,7 @@ namespace Clutter {
+ 		public void get_layout (Cairo.RectangleInt rect);
+ 		public virtual void get_offscreen_transformation_matrix (Cogl.Matrix matrix);
+ 		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
+ 		public float get_scale ();
+ 		public void invalidate_offscreen_blit_pipeline ();
+ 		[NoWrapper]
+@@ -6683,8 +6721,6 @@ namespace Clutter {
+ 		[NoWrapper]
+ 		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
+ 		[NoAccessorMethod]
+-		public Cairo.RectangleInt layout { owned get; set construct; }
+-		[NoAccessorMethod]
+ 		public string name { owned get; construct; }
+ 		[NoAccessorMethod]
+ 		public float refresh_rate { get; set construct; }
+@@ -6732,7 +6768,7 @@ namespace Clutter {
+ 		public Clutter.Color get_cursor_color ();
+ 		public int get_cursor_position ();
+ 		[Version (since = "1.16")]
+-		public void get_cursor_rect (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_cursor_rect ();
+ 		public uint get_cursor_size ();
+ 		public bool get_cursor_visible ();
+ 		public bool get_editable ();
+@@ -6916,7 +6952,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_auto_reverse ();
+ 		[Version (since = "1.12")]
+-		public bool get_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
+ 		[Version (since = "1.10")]
+ 		public int get_current_repeat ();
+ 		[Version (since = "0.4")]
+@@ -7108,8 +7144,8 @@ namespace Clutter {
+ 	public class ZoomAction : Clutter.GestureAction {
+ 		[CCode (has_construct_function = false, type = "ClutterAction*")]
+ 		public ZoomAction ();
+-		public void get_focal_point (Graphene.Point point);
+-		public void get_transformed_focal_point (Graphene.Point point);
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
+ 		public Clutter.ZoomAxis get_zoom_axis ();
+ 		public void set_zoom_axis (Clutter.ZoomAxis axis);
+ 		public Clutter.ZoomAxis zoom_axis { get; set; }
+@@ -7130,6 +7166,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
+ 	[Version (since = "0.4")]
+ 	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
+ 		[CCode (vfunc_name = "add")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public abstract void add_actor (Clutter.Actor actor);
+@@ -7141,21 +7178,20 @@ namespace Clutter {
+ 		public void child_set (Clutter.Actor actor, ...);
+ 		[Version (since = "0.8")]
+ 		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
+-		[Version (since = "0.8")]
+-		public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass klass, string property_name);
+-		[CCode (array_length_pos = 1.1, array_length_type = "guint")]
+-		[Version (since = "0.8")]
+-		public static GLib.ParamSpec[] class_list_child_properties (GLib.ObjectClass klass);
+ 		[Version (since = "1.2")]
+ 		public virtual void create_child_meta (Clutter.Actor actor);
+ 		[Version (since = "1.2")]
+ 		public virtual void destroy_child_meta (Clutter.Actor actor);
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
+ 		[Version (since = "0.8")]
+ 		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
+ 		[CCode (vfunc_name = "lower")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
+ 		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
+@@ -7256,9 +7292,9 @@ namespace Clutter {
+ 		public bool prev (out unowned Clutter.Actor child);
+ 		public void remove ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
+ 	public struct Capture {
+-		public weak Cairo.Surface image;
++		public Cairo.ImageSurface image;
+ 		public Cairo.RectangleInt rect;
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
+@@ -7277,11 +7313,12 @@ namespace Clutter {
+ 		public bool equal (Clutter.Color v2);
+ 		[Version (since = "0.2")]
+ 		public void free ();
+-		public static void from_hls (out Clutter.Color color, float hue, float luminance, float saturation);
+-		public static void from_pixel (out Clutter.Color color, uint32 pixel);
+-		[Version (since = "1.0")]
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
+ 		public static bool from_string (out Clutter.Color color, string str);
+-		[Version (since = "1.6")]
+ 		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
+ 		[Version (since = "1.0")]
+ 		public uint hash ();
+@@ -7290,6 +7327,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public Clutter.Color interpolate (Clutter.Color final, double progress);
+ 		public Clutter.Color lighten ();
++		public bool parse_string (string str);
+ 		public Clutter.Color shade (double factor);
+ 		public Clutter.Color subtract (Clutter.Color b);
+ 		public void to_hls (out float hue, out float luminance, out float saturation);
+@@ -7298,11 +7336,6 @@ namespace Clutter {
+ 		public string to_string ();
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct FrameListenerIface {
+-		public weak global::before_frame before_frame;
+-		public weak global::frame frame;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	public struct KbdA11ySettings {
+ 		public Clutter.KeyboardA11yFlags controls;
+ 		public int slowkeys_delay;
+@@ -7321,6 +7354,16 @@ namespace Clutter {
+ 		public bool equal (Clutter.Knot knot_b);
+ 		public void free ();
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "COGL_TYPE_MATRIX")]
+ 	public struct Matrix : Cogl.Matrix {
+ 		[Version (since = "1.12")]
+@@ -7335,45 +7378,35 @@ namespace Clutter {
+ 		[Version (since = "1.12")]
+ 		public unowned Clutter.Matrix? init_identity ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadButtonEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public uint32 button;
+-		public uint32 group;
+-		public weak Clutter.InputDevice device;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadRingEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource ring_source;
+-		public uint32 ring_number;
+-		public uint32 group;
+-		public double angle;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadStripEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource strip_source;
+-		public uint32 strip_number;
+-		public uint32 group;
+-		public double value;
+-		public uint32 mode;
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
+ 	[Version (since = "1.0")]
+@@ -7406,21 +7439,25 @@ namespace Clutter {
+ 		public int dwell_delay;
+ 		public int dwell_threshold;
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	[Version (since = "1.28")]
+-	public struct ProximityEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
+ 	[Version (since = "1.0")]
+ 	public struct Units {
+ 		public Clutter.Units? copy ();
+ 		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
+ 		public Clutter.UnitType get_unit_type ();
+ 		public float get_unit_value ();
+ 		public float to_pixels ();
+@@ -7638,6 +7675,11 @@ namespace Clutter {
+ 		PAD_BUTTON_RELEASE,
+ 		PAD_STRIP,
+ 		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
+ 		EVENT_LAST
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
+@@ -7787,8 +7829,8 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
+ 	[Version (since = "1.6")]
+ 	public enum InputMode {
+-		MASTER,
+-		SLAVE,
++		LOGICAL,
++		PHYSICAL,
+ 		FLOATING
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
+@@ -7889,7 +7931,8 @@ namespace Clutter {
+ 	public enum PaintFlag {
+ 		NONE,
+ 		NO_CURSORS,
+-		FORCE_CURSORS
++		FORCE_CURSORS,
++		CLEAR
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
+ 	[Version (since = "1.12")]
+@@ -8231,6 +8274,9 @@ namespace Clutter {
+ 	[Version (since = "1.0")]
+ 	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
+ 	[Version (since = "1.14")]
+ 	public static void disable_accessibility ();
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
+diff --git vapi/mutter-clutter-8-custom.vala vapi/mutter-clutter-8-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-8-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-8.deps vapi/mutter-clutter-8.deps
+new file mode 100644
+index 00000000..a03b108b
+--- /dev/null
++++ vapi/mutter-clutter-8.deps
+@@ -0,0 +1,5 @@
++atk
++cairo
++json-glib-1.0
++mutter-cogl-8
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-8.vapi vapi/mutter-clutter-8.vapi
+new file mode 100644
+index 00000000..e2fe5989
+--- /dev/null
++++ vapi/mutter-clutter-8.vapi
+@@ -0,0 +1,8279 @@
++/* mutter-clutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "8", lower_case_cprefix = "clutter_")]
++namespace Clutter {
++	namespace Key {
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_0")]
++		public const uint @0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_1")]
++		public const uint @1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_2")]
++		public const uint @2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3")]
++		public const uint @3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_AltCursor")]
++		public const uint @3270_AltCursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Attn")]
++		public const uint @3270_Attn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_BackTab")]
++		public const uint @3270_BackTab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ChangeScreen")]
++		public const uint @3270_ChangeScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Copy")]
++		public const uint @3270_Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorBlink")]
++		public const uint @3270_CursorBlink;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorSelect")]
++		public const uint @3270_CursorSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_DeleteWord")]
++		public const uint @3270_DeleteWord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Duplicate")]
++		public const uint @3270_Duplicate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Enter")]
++		public const uint @3270_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseEOF")]
++		public const uint @3270_EraseEOF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseInput")]
++		public const uint @3270_EraseInput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ExSelect")]
++		public const uint @3270_ExSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_FieldMark")]
++		public const uint @3270_FieldMark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Ident")]
++		public const uint @3270_Ident;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Jump")]
++		public const uint @3270_Jump;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_KeyClick")]
++		public const uint @3270_KeyClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Left2")]
++		public const uint @3270_Left2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA1")]
++		public const uint @3270_PA1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA2")]
++		public const uint @3270_PA2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA3")]
++		public const uint @3270_PA3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Play")]
++		public const uint @3270_Play;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PrintScreen")]
++		public const uint @3270_PrintScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Quit")]
++		public const uint @3270_Quit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Record")]
++		public const uint @3270_Record;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Reset")]
++		public const uint @3270_Reset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Right2")]
++		public const uint @3270_Right2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Rule")]
++		public const uint @3270_Rule;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Setup")]
++		public const uint @3270_Setup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Test")]
++		public const uint @3270_Test;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_4")]
++		public const uint @4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_5")]
++		public const uint @5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_6")]
++		public const uint @6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_7")]
++		public const uint @7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_8")]
++		public const uint @8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_9")]
++		public const uint @9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_A")]
++		public const uint A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AE")]
++		public const uint AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aacute")]
++		public const uint Aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abelowdot")]
++		public const uint Abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreve")]
++		public const uint Abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreveacute")]
++		public const uint Abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevebelowdot")]
++		public const uint Abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevegrave")]
++		public const uint Abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevehook")]
++		public const uint Abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevetilde")]
++		public const uint Abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Enable")]
++		public const uint AccessX_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Feedback_Enable")]
++		public const uint AccessX_Feedback_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflex")]
++		public const uint Acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexacute")]
++		public const uint Acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexbelowdot")]
++		public const uint Acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexgrave")]
++		public const uint Acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexhook")]
++		public const uint Acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflextilde")]
++		public const uint Acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AddFavorite")]
++		public const uint AddFavorite;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Adiaeresis")]
++		public const uint Adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Agrave")]
++		public const uint Agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ahook")]
++		public const uint Ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_L")]
++		public const uint Alt_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_R")]
++		public const uint Alt_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Amacron")]
++		public const uint Amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aogonek")]
++		public const uint Aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationLeft")]
++		public const uint ApplicationLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationRight")]
++		public const uint ApplicationRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_0")]
++		public const uint Arabic_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_1")]
++		public const uint Arabic_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_2")]
++		public const uint Arabic_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_3")]
++		public const uint Arabic_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_4")]
++		public const uint Arabic_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_5")]
++		public const uint Arabic_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_6")]
++		public const uint Arabic_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_7")]
++		public const uint Arabic_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_8")]
++		public const uint Arabic_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_9")]
++		public const uint Arabic_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ain")]
++		public const uint Arabic_ain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alef")]
++		public const uint Arabic_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alefmaksura")]
++		public const uint Arabic_alefmaksura;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_beh")]
++		public const uint Arabic_beh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_comma")]
++		public const uint Arabic_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dad")]
++		public const uint Arabic_dad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dal")]
++		public const uint Arabic_dal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_damma")]
++		public const uint Arabic_damma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dammatan")]
++		public const uint Arabic_dammatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ddal")]
++		public const uint Arabic_ddal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_farsi_yeh")]
++		public const uint Arabic_farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fatha")]
++		public const uint Arabic_fatha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fathatan")]
++		public const uint Arabic_fathatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_feh")]
++		public const uint Arabic_feh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fullstop")]
++		public const uint Arabic_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_gaf")]
++		public const uint Arabic_gaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ghain")]
++		public const uint Arabic_ghain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ha")]
++		public const uint Arabic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hah")]
++		public const uint Arabic_hah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza")]
++		public const uint Arabic_hamza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_above")]
++		public const uint Arabic_hamza_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_below")]
++		public const uint Arabic_hamza_below;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonalef")]
++		public const uint Arabic_hamzaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonwaw")]
++		public const uint Arabic_hamzaonwaw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonyeh")]
++		public const uint Arabic_hamzaonyeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaunderalef")]
++		public const uint Arabic_hamzaunderalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh")]
++		public const uint Arabic_heh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_doachashmee")]
++		public const uint Arabic_heh_doachashmee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_goal")]
++		public const uint Arabic_heh_goal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeem")]
++		public const uint Arabic_jeem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeh")]
++		public const uint Arabic_jeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kaf")]
++		public const uint Arabic_kaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasra")]
++		public const uint Arabic_kasra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasratan")]
++		public const uint Arabic_kasratan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_keheh")]
++		public const uint Arabic_keheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_khah")]
++		public const uint Arabic_khah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_lam")]
++		public const uint Arabic_lam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_madda_above")]
++		public const uint Arabic_madda_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_maddaonalef")]
++		public const uint Arabic_maddaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_meem")]
++		public const uint Arabic_meem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon")]
++		public const uint Arabic_noon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon_ghunna")]
++		public const uint Arabic_noon_ghunna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_peh")]
++		public const uint Arabic_peh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_percent")]
++		public const uint Arabic_percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_qaf")]
++		public const uint Arabic_qaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_question_mark")]
++		public const uint Arabic_question_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ra")]
++		public const uint Arabic_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_rreh")]
++		public const uint Arabic_rreh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sad")]
++		public const uint Arabic_sad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_seen")]
++		public const uint Arabic_seen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_semicolon")]
++		public const uint Arabic_semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_shadda")]
++		public const uint Arabic_shadda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sheen")]
++		public const uint Arabic_sheen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sukun")]
++		public const uint Arabic_sukun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_superscript_alef")]
++		public const uint Arabic_superscript_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_switch")]
++		public const uint Arabic_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tah")]
++		public const uint Arabic_tah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tatweel")]
++		public const uint Arabic_tatweel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tcheh")]
++		public const uint Arabic_tcheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_teh")]
++		public const uint Arabic_teh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tehmarbuta")]
++		public const uint Arabic_tehmarbuta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_thal")]
++		public const uint Arabic_thal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_theh")]
++		public const uint Arabic_theh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tteh")]
++		public const uint Arabic_tteh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_veh")]
++		public const uint Arabic_veh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_waw")]
++		public const uint Arabic_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh")]
++		public const uint Arabic_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh_baree")]
++		public const uint Arabic_yeh_baree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zah")]
++		public const uint Arabic_zah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zain")]
++		public const uint Arabic_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aring")]
++		public const uint Aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AT")]
++		public const uint Armenian_AT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AYB")]
++		public const uint Armenian_AYB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_BEN")]
++		public const uint Armenian_BEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_CHA")]
++		public const uint Armenian_CHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DA")]
++		public const uint Armenian_DA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DZA")]
++		public const uint Armenian_DZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_E")]
++		public const uint Armenian_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_FE")]
++		public const uint Armenian_FE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GHAT")]
++		public const uint Armenian_GHAT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GIM")]
++		public const uint Armenian_GIM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HI")]
++		public const uint Armenian_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HO")]
++		public const uint Armenian_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_INI")]
++		public const uint Armenian_INI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_JE")]
++		public const uint Armenian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KE")]
++		public const uint Armenian_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KEN")]
++		public const uint Armenian_KEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KHE")]
++		public const uint Armenian_KHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_LYUN")]
++		public const uint Armenian_LYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_MEN")]
++		public const uint Armenian_MEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_NU")]
++		public const uint Armenian_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_O")]
++		public const uint Armenian_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PE")]
++		public const uint Armenian_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PYUR")]
++		public const uint Armenian_PYUR;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RA")]
++		public const uint Armenian_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RE")]
++		public const uint Armenian_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SE")]
++		public const uint Armenian_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SHA")]
++		public const uint Armenian_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TCHE")]
++		public const uint Armenian_TCHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TO")]
++		public const uint Armenian_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSA")]
++		public const uint Armenian_TSA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSO")]
++		public const uint Armenian_TSO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TYUN")]
++		public const uint Armenian_TYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VEV")]
++		public const uint Armenian_VEV;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VO")]
++		public const uint Armenian_VO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VYUN")]
++		public const uint Armenian_VYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_YECH")]
++		public const uint Armenian_YECH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZA")]
++		public const uint Armenian_ZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZHE")]
++		public const uint Armenian_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_accent")]
++		public const uint Armenian_accent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_amanak")]
++		public const uint Armenian_amanak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_apostrophe")]
++		public const uint Armenian_apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_at")]
++		public const uint Armenian_at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ayb")]
++		public const uint Armenian_ayb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ben")]
++		public const uint Armenian_ben;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_but")]
++		public const uint Armenian_but;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_cha")]
++		public const uint Armenian_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_da")]
++		public const uint Armenian_da;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_dza")]
++		public const uint Armenian_dza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_e")]
++		public const uint Armenian_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_exclam")]
++		public const uint Armenian_exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_fe")]
++		public const uint Armenian_fe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_full_stop")]
++		public const uint Armenian_full_stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ghat")]
++		public const uint Armenian_ghat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_gim")]
++		public const uint Armenian_gim;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hi")]
++		public const uint Armenian_hi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ho")]
++		public const uint Armenian_ho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hyphen")]
++		public const uint Armenian_hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ini")]
++		public const uint Armenian_ini;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_je")]
++		public const uint Armenian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ke")]
++		public const uint Armenian_ke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ken")]
++		public const uint Armenian_ken;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_khe")]
++		public const uint Armenian_khe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ligature_ew")]
++		public const uint Armenian_ligature_ew;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_lyun")]
++		public const uint Armenian_lyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_men")]
++		public const uint Armenian_men;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_nu")]
++		public const uint Armenian_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_o")]
++		public const uint Armenian_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_paruyk")]
++		public const uint Armenian_paruyk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pe")]
++		public const uint Armenian_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pyur")]
++		public const uint Armenian_pyur;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_question")]
++		public const uint Armenian_question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ra")]
++		public const uint Armenian_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_re")]
++		public const uint Armenian_re;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_se")]
++		public const uint Armenian_se;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_separation_mark")]
++		public const uint Armenian_separation_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_sha")]
++		public const uint Armenian_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_shesht")]
++		public const uint Armenian_shesht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tche")]
++		public const uint Armenian_tche;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_to")]
++		public const uint Armenian_to;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tsa")]
++		public const uint Armenian_tsa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tso")]
++		public const uint Armenian_tso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tyun")]
++		public const uint Armenian_tyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_verjaket")]
++		public const uint Armenian_verjaket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vev")]
++		public const uint Armenian_vev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vo")]
++		public const uint Armenian_vo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vyun")]
++		public const uint Armenian_vyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yech")]
++		public const uint Armenian_yech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yentamna")]
++		public const uint Armenian_yentamna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_za")]
++		public const uint Armenian_za;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_zhe")]
++		public const uint Armenian_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Atilde")]
++		public const uint Atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudibleBell_Enable")]
++		public const uint AudibleBell_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioCycleTrack")]
++		public const uint AudioCycleTrack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioForward")]
++		public const uint AudioForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioLowerVolume")]
++		public const uint AudioLowerVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMedia")]
++		public const uint AudioMedia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMicMute")]
++		public const uint AudioMicMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMute")]
++		public const uint AudioMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioNext")]
++		public const uint AudioNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPause")]
++		public const uint AudioPause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPlay")]
++		public const uint AudioPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPrev")]
++		public const uint AudioPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRaiseVolume")]
++		public const uint AudioRaiseVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRandomPlay")]
++		public const uint AudioRandomPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRecord")]
++		public const uint AudioRecord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRepeat")]
++		public const uint AudioRepeat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRewind")]
++		public const uint AudioRewind;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioStop")]
++		public const uint AudioStop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Away")]
++		public const uint Away;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_B")]
++		public const uint B;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Babovedot")]
++		public const uint Babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Back")]
++		public const uint Back;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackForward")]
++		public const uint BackForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackSpace")]
++		public const uint BackSpace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Battery")]
++		public const uint Battery;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Begin")]
++		public const uint Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Blue")]
++		public const uint Blue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Bluetooth")]
++		public const uint Bluetooth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Book")]
++		public const uint Book;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BounceKeys_Enable")]
++		public const uint BounceKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Break")]
++		public const uint Break;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BrightnessAdjust")]
++		public const uint BrightnessAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_SHORTU")]
++		public const uint Byelorussian_SHORTU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_shortu")]
++		public const uint Byelorussian_shortu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C")]
++		public const uint C;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CD")]
++		public const uint CD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CH")]
++		public const uint CH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_H")]
++		public const uint C_H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_h")]
++		public const uint C_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cabovedot")]
++		public const uint Cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cacute")]
++		public const uint Cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calculator")]
++		public const uint Calculator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calendar")]
++		public const uint Calendar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cancel")]
++		public const uint Cancel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Caps_Lock")]
++		public const uint Caps_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccaron")]
++		public const uint Ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccedilla")]
++		public const uint Ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccircumflex")]
++		public const uint Ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ch")]
++		public const uint Ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Clear")]
++		public const uint Clear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ClearGrab")]
++		public const uint ClearGrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Close")]
++		public const uint Close;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Codeinput")]
++		public const uint Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ColonSign")]
++		public const uint ColonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Community")]
++		public const uint Community;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ContrastAdjust")]
++		public const uint ContrastAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_L")]
++		public const uint Control_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_R")]
++		public const uint Control_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Copy")]
++		public const uint Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CruzeiroSign")]
++		public const uint CruzeiroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cut")]
++		public const uint Cut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CycleAngle")]
++		public const uint CycleAngle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_A")]
++		public const uint Cyrillic_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_BE")]
++		public const uint Cyrillic_BE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE")]
++		public const uint Cyrillic_CHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_descender")]
++		public const uint Cyrillic_CHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_vertstroke")]
++		public const uint Cyrillic_CHE_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DE")]
++		public const uint Cyrillic_DE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DZHE")]
++		public const uint Cyrillic_DZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_E")]
++		public const uint Cyrillic_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EF")]
++		public const uint Cyrillic_EF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EL")]
++		public const uint Cyrillic_EL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EM")]
++		public const uint Cyrillic_EM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN")]
++		public const uint Cyrillic_EN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN_descender")]
++		public const uint Cyrillic_EN_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ER")]
++		public const uint Cyrillic_ER;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ES")]
++		public const uint Cyrillic_ES;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE")]
++		public const uint Cyrillic_GHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE_bar")]
++		public const uint Cyrillic_GHE_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA")]
++		public const uint Cyrillic_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HARDSIGN")]
++		public const uint Cyrillic_HARDSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA_descender")]
++		public const uint Cyrillic_HA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I")]
++		public const uint Cyrillic_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IE")]
++		public const uint Cyrillic_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IO")]
++		public const uint Cyrillic_IO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I_macron")]
++		public const uint Cyrillic_I_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_JE")]
++		public const uint Cyrillic_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA")]
++		public const uint Cyrillic_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_descender")]
++		public const uint Cyrillic_KA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_vertstroke")]
++		public const uint Cyrillic_KA_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_LJE")]
++		public const uint Cyrillic_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_NJE")]
++		public const uint Cyrillic_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O")]
++		public const uint Cyrillic_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O_bar")]
++		public const uint Cyrillic_O_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_PE")]
++		public const uint Cyrillic_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SCHWA")]
++		public const uint Cyrillic_SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHA")]
++		public const uint Cyrillic_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHCHA")]
++		public const uint Cyrillic_SHCHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHHA")]
++		public const uint Cyrillic_SHHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHORTI")]
++		public const uint Cyrillic_SHORTI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SOFTSIGN")]
++		public const uint Cyrillic_SOFTSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TE")]
++		public const uint Cyrillic_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TSE")]
++		public const uint Cyrillic_TSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U")]
++		public const uint Cyrillic_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_macron")]
++		public const uint Cyrillic_U_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight")]
++		public const uint Cyrillic_U_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight_bar")]
++		public const uint Cyrillic_U_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_VE")]
++		public const uint Cyrillic_VE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YA")]
++		public const uint Cyrillic_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YERU")]
++		public const uint Cyrillic_YERU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YU")]
++		public const uint Cyrillic_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZE")]
++		public const uint Cyrillic_ZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE")]
++		public const uint Cyrillic_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE_descender")]
++		public const uint Cyrillic_ZHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_a")]
++		public const uint Cyrillic_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_be")]
++		public const uint Cyrillic_be;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che")]
++		public const uint Cyrillic_che;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_descender")]
++		public const uint Cyrillic_che_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_vertstroke")]
++		public const uint Cyrillic_che_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_de")]
++		public const uint Cyrillic_de;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_dzhe")]
++		public const uint Cyrillic_dzhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_e")]
++		public const uint Cyrillic_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ef")]
++		public const uint Cyrillic_ef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_el")]
++		public const uint Cyrillic_el;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_em")]
++		public const uint Cyrillic_em;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en")]
++		public const uint Cyrillic_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en_descender")]
++		public const uint Cyrillic_en_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_er")]
++		public const uint Cyrillic_er;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_es")]
++		public const uint Cyrillic_es;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe")]
++		public const uint Cyrillic_ghe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe_bar")]
++		public const uint Cyrillic_ghe_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha")]
++		public const uint Cyrillic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha_descender")]
++		public const uint Cyrillic_ha_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_hardsign")]
++		public const uint Cyrillic_hardsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i")]
++		public const uint Cyrillic_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i_macron")]
++		public const uint Cyrillic_i_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ie")]
++		public const uint Cyrillic_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_io")]
++		public const uint Cyrillic_io;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_je")]
++		public const uint Cyrillic_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka")]
++		public const uint Cyrillic_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_descender")]
++		public const uint Cyrillic_ka_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_vertstroke")]
++		public const uint Cyrillic_ka_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_lje")]
++		public const uint Cyrillic_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_nje")]
++		public const uint Cyrillic_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o")]
++		public const uint Cyrillic_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o_bar")]
++		public const uint Cyrillic_o_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_pe")]
++		public const uint Cyrillic_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_schwa")]
++		public const uint Cyrillic_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_sha")]
++		public const uint Cyrillic_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shcha")]
++		public const uint Cyrillic_shcha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shha")]
++		public const uint Cyrillic_shha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shorti")]
++		public const uint Cyrillic_shorti;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_softsign")]
++		public const uint Cyrillic_softsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_te")]
++		public const uint Cyrillic_te;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_tse")]
++		public const uint Cyrillic_tse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u")]
++		public const uint Cyrillic_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_macron")]
++		public const uint Cyrillic_u_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight")]
++		public const uint Cyrillic_u_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight_bar")]
++		public const uint Cyrillic_u_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ve")]
++		public const uint Cyrillic_ve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ya")]
++		public const uint Cyrillic_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yeru")]
++		public const uint Cyrillic_yeru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yu")]
++		public const uint Cyrillic_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ze")]
++		public const uint Cyrillic_ze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe")]
++		public const uint Cyrillic_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe_descender")]
++		public const uint Cyrillic_zhe_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_D")]
++		public const uint D;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DOS")]
++		public const uint DOS;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dabovedot")]
++		public const uint Dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dcaron")]
++		public const uint Dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Delete")]
++		public const uint Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Display")]
++		public const uint Display;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Documents")]
++		public const uint Documents;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DongSign")]
++		public const uint DongSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Down")]
++		public const uint Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dstroke")]
++		public const uint Dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_E")]
++		public const uint E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ENG")]
++		public const uint ENG;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ETH")]
++		public const uint ETH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EZH")]
++		public const uint EZH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eabovedot")]
++		public const uint Eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eacute")]
++		public const uint Eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ebelowdot")]
++		public const uint Ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecaron")]
++		public const uint Ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflex")]
++		public const uint Ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexacute")]
++		public const uint Ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexbelowdot")]
++		public const uint Ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexgrave")]
++		public const uint Ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexhook")]
++		public const uint Ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflextilde")]
++		public const uint Ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EcuSign")]
++		public const uint EcuSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ediaeresis")]
++		public const uint Ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Egrave")]
++		public const uint Egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ehook")]
++		public const uint Ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_Shift")]
++		public const uint Eisu_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_toggle")]
++		public const uint Eisu_toggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eject")]
++		public const uint Eject;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Emacron")]
++		public const uint Emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_End")]
++		public const uint End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eogonek")]
++		public const uint Eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Escape")]
++		public const uint Escape;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eth")]
++		public const uint Eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Etilde")]
++		public const uint Etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EuroSign")]
++		public const uint EuroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Excel")]
++		public const uint Excel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Execute")]
++		public const uint Execute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Explorer")]
++		public const uint Explorer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F")]
++		public const uint F;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F1")]
++		public const uint F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F10")]
++		public const uint F10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F11")]
++		public const uint F11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F12")]
++		public const uint F12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F13")]
++		public const uint F13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F14")]
++		public const uint F14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F15")]
++		public const uint F15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F16")]
++		public const uint F16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F17")]
++		public const uint F17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F18")]
++		public const uint F18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F19")]
++		public const uint F19;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F2")]
++		public const uint F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F20")]
++		public const uint F20;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F21")]
++		public const uint F21;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F22")]
++		public const uint F22;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F23")]
++		public const uint F23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F24")]
++		public const uint F24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F25")]
++		public const uint F25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F26")]
++		public const uint F26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F27")]
++		public const uint F27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F28")]
++		public const uint F28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F29")]
++		public const uint F29;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F3")]
++		public const uint F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F30")]
++		public const uint F30;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F31")]
++		public const uint F31;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F32")]
++		public const uint F32;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F33")]
++		public const uint F33;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F34")]
++		public const uint F34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F35")]
++		public const uint F35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F4")]
++		public const uint F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F5")]
++		public const uint F5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F6")]
++		public const uint F6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F7")]
++		public const uint F7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F8")]
++		public const uint F8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F9")]
++		public const uint F9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FFrancSign")]
++		public const uint FFrancSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Fabovedot")]
++		public const uint Fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_0")]
++		public const uint Farsi_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_1")]
++		public const uint Farsi_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_2")]
++		public const uint Farsi_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_3")]
++		public const uint Farsi_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_4")]
++		public const uint Farsi_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_5")]
++		public const uint Farsi_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_6")]
++		public const uint Farsi_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_7")]
++		public const uint Farsi_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_8")]
++		public const uint Farsi_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_9")]
++		public const uint Farsi_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_yeh")]
++		public const uint Farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Favorites")]
++		public const uint Favorites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Finance")]
++		public const uint Finance;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Find")]
++		public const uint Find;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_First_Virtual_Screen")]
++		public const uint First_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Forward")]
++		public const uint Forward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameBack")]
++		public const uint FrameBack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameForward")]
++		public const uint FrameForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_G")]
++		public const uint G;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gabovedot")]
++		public const uint Gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Game")]
++		public const uint Game;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gbreve")]
++		public const uint Gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcaron")]
++		public const uint Gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcedilla")]
++		public const uint Gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcircumflex")]
++		public const uint Gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_an")]
++		public const uint Georgian_an;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ban")]
++		public const uint Georgian_ban;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_can")]
++		public const uint Georgian_can;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_char")]
++		public const uint Georgian_char;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_chin")]
++		public const uint Georgian_chin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_cil")]
++		public const uint Georgian_cil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_don")]
++		public const uint Georgian_don;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_en")]
++		public const uint Georgian_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_fi")]
++		public const uint Georgian_fi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_gan")]
++		public const uint Georgian_gan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ghan")]
++		public const uint Georgian_ghan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hae")]
++		public const uint Georgian_hae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_har")]
++		public const uint Georgian_har;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_he")]
++		public const uint Georgian_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hie")]
++		public const uint Georgian_hie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hoe")]
++		public const uint Georgian_hoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_in")]
++		public const uint Georgian_in;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jhan")]
++		public const uint Georgian_jhan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jil")]
++		public const uint Georgian_jil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_kan")]
++		public const uint Georgian_kan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_khar")]
++		public const uint Georgian_khar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_las")]
++		public const uint Georgian_las;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_man")]
++		public const uint Georgian_man;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_nar")]
++		public const uint Georgian_nar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_on")]
++		public const uint Georgian_on;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_par")]
++		public const uint Georgian_par;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_phar")]
++		public const uint Georgian_phar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_qar")]
++		public const uint Georgian_qar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_rae")]
++		public const uint Georgian_rae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_san")]
++		public const uint Georgian_san;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_shin")]
++		public const uint Georgian_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tan")]
++		public const uint Georgian_tan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tar")]
++		public const uint Georgian_tar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_un")]
++		public const uint Georgian_un;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_vin")]
++		public const uint Georgian_vin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_we")]
++		public const uint Georgian_we;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_xan")]
++		public const uint Georgian_xan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zen")]
++		public const uint Georgian_zen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zhar")]
++		public const uint Georgian_zhar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Go")]
++		public const uint Go;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHA")]
++		public const uint Greek_ALPHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHAaccent")]
++		public const uint Greek_ALPHAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_BETA")]
++		public const uint Greek_BETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_CHI")]
++		public const uint Greek_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_DELTA")]
++		public const uint Greek_DELTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILON")]
++		public const uint Greek_EPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILONaccent")]
++		public const uint Greek_EPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETA")]
++		public const uint Greek_ETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETAaccent")]
++		public const uint Greek_ETAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_GAMMA")]
++		public const uint Greek_GAMMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTA")]
++		public const uint Greek_IOTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAaccent")]
++		public const uint Greek_IOTAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdiaeresis")]
++		public const uint Greek_IOTAdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdieresis")]
++		public const uint Greek_IOTAdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_KAPPA")]
++		public const uint Greek_KAPPA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMBDA")]
++		public const uint Greek_LAMBDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMDA")]
++		public const uint Greek_LAMDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_MU")]
++		public const uint Greek_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_NU")]
++		public const uint Greek_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGA")]
++		public const uint Greek_OMEGA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGAaccent")]
++		public const uint Greek_OMEGAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRON")]
++		public const uint Greek_OMICRON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRONaccent")]
++		public const uint Greek_OMICRONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PHI")]
++		public const uint Greek_PHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PI")]
++		public const uint Greek_PI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PSI")]
++		public const uint Greek_PSI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_RHO")]
++		public const uint Greek_RHO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_SIGMA")]
++		public const uint Greek_SIGMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_TAU")]
++		public const uint Greek_TAU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_THETA")]
++		public const uint Greek_THETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILON")]
++		public const uint Greek_UPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONaccent")]
++		public const uint Greek_UPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONdieresis")]
++		public const uint Greek_UPSILONdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_XI")]
++		public const uint Greek_XI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ZETA")]
++		public const uint Greek_ZETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_accentdieresis")]
++		public const uint Greek_accentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alpha")]
++		public const uint Greek_alpha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alphaaccent")]
++		public const uint Greek_alphaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_beta")]
++		public const uint Greek_beta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_chi")]
++		public const uint Greek_chi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_delta")]
++		public const uint Greek_delta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilon")]
++		public const uint Greek_epsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilonaccent")]
++		public const uint Greek_epsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_eta")]
++		public const uint Greek_eta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_etaaccent")]
++		public const uint Greek_etaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_finalsmallsigma")]
++		public const uint Greek_finalsmallsigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_gamma")]
++		public const uint Greek_gamma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_horizbar")]
++		public const uint Greek_horizbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iota")]
++		public const uint Greek_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccent")]
++		public const uint Greek_iotaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccentdieresis")]
++		public const uint Greek_iotaaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotadieresis")]
++		public const uint Greek_iotadieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_kappa")]
++		public const uint Greek_kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lambda")]
++		public const uint Greek_lambda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lamda")]
++		public const uint Greek_lamda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_mu")]
++		public const uint Greek_mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_nu")]
++		public const uint Greek_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omega")]
++		public const uint Greek_omega;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omegaaccent")]
++		public const uint Greek_omegaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicron")]
++		public const uint Greek_omicron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicronaccent")]
++		public const uint Greek_omicronaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_phi")]
++		public const uint Greek_phi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_pi")]
++		public const uint Greek_pi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_psi")]
++		public const uint Greek_psi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_rho")]
++		public const uint Greek_rho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_sigma")]
++		public const uint Greek_sigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_switch")]
++		public const uint Greek_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_tau")]
++		public const uint Greek_tau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_theta")]
++		public const uint Greek_theta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilon")]
++		public const uint Greek_upsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccent")]
++		public const uint Greek_upsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccentdieresis")]
++		public const uint Greek_upsilonaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilondieresis")]
++		public const uint Greek_upsilondieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_xi")]
++		public const uint Greek_xi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_zeta")]
++		public const uint Greek_zeta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Green")]
++		public const uint Green;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_H")]
++		public const uint H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul")]
++		public const uint Hangul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_A")]
++		public const uint Hangul_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AE")]
++		public const uint Hangul_AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeA")]
++		public const uint Hangul_AraeA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeAE")]
++		public const uint Hangul_AraeAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Banja")]
++		public const uint Hangul_Banja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Cieuc")]
++		public const uint Hangul_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Codeinput")]
++		public const uint Hangul_Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Dikeud")]
++		public const uint Hangul_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_E")]
++		public const uint Hangul_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EO")]
++		public const uint Hangul_EO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EU")]
++		public const uint Hangul_EU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_End")]
++		public const uint Hangul_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hanja")]
++		public const uint Hangul_Hanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hieuh")]
++		public const uint Hangul_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_I")]
++		public const uint Hangul_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Ieung")]
++		public const uint Hangul_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Cieuc")]
++		public const uint Hangul_J_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Dikeud")]
++		public const uint Hangul_J_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Hieuh")]
++		public const uint Hangul_J_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Ieung")]
++		public const uint Hangul_J_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Jieuj")]
++		public const uint Hangul_J_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Khieuq")]
++		public const uint Hangul_J_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Kiyeog")]
++		public const uint Hangul_J_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KiyeogSios")]
++		public const uint Hangul_J_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KkogjiDalrinIeung")]
++		public const uint Hangul_J_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Mieum")]
++		public const uint Hangul_J_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Nieun")]
++		public const uint Hangul_J_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunHieuh")]
++		public const uint Hangul_J_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunJieuj")]
++		public const uint Hangul_J_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PanSios")]
++		public const uint Hangul_J_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Phieuf")]
++		public const uint Hangul_J_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Pieub")]
++		public const uint Hangul_J_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PieubSios")]
++		public const uint Hangul_J_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Rieul")]
++		public const uint Hangul_J_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulHieuh")]
++		public const uint Hangul_J_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulKiyeog")]
++		public const uint Hangul_J_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulMieum")]
++		public const uint Hangul_J_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPhieuf")]
++		public const uint Hangul_J_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPieub")]
++		public const uint Hangul_J_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulSios")]
++		public const uint Hangul_J_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulTieut")]
++		public const uint Hangul_J_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Sios")]
++		public const uint Hangul_J_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangKiyeog")]
++		public const uint Hangul_J_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangSios")]
++		public const uint Hangul_J_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Tieut")]
++		public const uint Hangul_J_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_YeorinHieuh")]
++		public const uint Hangul_J_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jamo")]
++		public const uint Hangul_Jamo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jeonja")]
++		public const uint Hangul_Jeonja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jieuj")]
++		public const uint Hangul_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Khieuq")]
++		public const uint Hangul_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Kiyeog")]
++		public const uint Hangul_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KiyeogSios")]
++		public const uint Hangul_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KkogjiDalrinIeung")]
++		public const uint Hangul_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Mieum")]
++		public const uint Hangul_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_MultipleCandidate")]
++		public const uint Hangul_MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Nieun")]
++		public const uint Hangul_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunHieuh")]
++		public const uint Hangul_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunJieuj")]
++		public const uint Hangul_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_O")]
++		public const uint Hangul_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_OE")]
++		public const uint Hangul_OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PanSios")]
++		public const uint Hangul_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Phieuf")]
++		public const uint Hangul_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Pieub")]
++		public const uint Hangul_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PieubSios")]
++		public const uint Hangul_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PostHanja")]
++		public const uint Hangul_PostHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreHanja")]
++		public const uint Hangul_PreHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreviousCandidate")]
++		public const uint Hangul_PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Rieul")]
++		public const uint Hangul_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulHieuh")]
++		public const uint Hangul_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulKiyeog")]
++		public const uint Hangul_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulMieum")]
++		public const uint Hangul_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPhieuf")]
++		public const uint Hangul_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPieub")]
++		public const uint Hangul_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulSios")]
++		public const uint Hangul_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulTieut")]
++		public const uint Hangul_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulYeorinHieuh")]
++		public const uint Hangul_RieulYeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Romaja")]
++		public const uint Hangul_Romaja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SingleCandidate")]
++		public const uint Hangul_SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Sios")]
++		public const uint Hangul_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Special")]
++		public const uint Hangul_Special;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangDikeud")]
++		public const uint Hangul_SsangDikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangJieuj")]
++		public const uint Hangul_SsangJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangKiyeog")]
++		public const uint Hangul_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangPieub")]
++		public const uint Hangul_SsangPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangSios")]
++		public const uint Hangul_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Start")]
++		public const uint Hangul_Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumMieum")]
++		public const uint Hangul_SunkyeongeumMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPhieuf")]
++		public const uint Hangul_SunkyeongeumPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPieub")]
++		public const uint Hangul_SunkyeongeumPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Tieut")]
++		public const uint Hangul_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_U")]
++		public const uint Hangul_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WA")]
++		public const uint Hangul_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WAE")]
++		public const uint Hangul_WAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WE")]
++		public const uint Hangul_WE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WEO")]
++		public const uint Hangul_WEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WI")]
++		public const uint Hangul_WI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YA")]
++		public const uint Hangul_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YAE")]
++		public const uint Hangul_YAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YE")]
++		public const uint Hangul_YE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YEO")]
++		public const uint Hangul_YEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YI")]
++		public const uint Hangul_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YO")]
++		public const uint Hangul_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YU")]
++		public const uint Hangul_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YeorinHieuh")]
++		public const uint Hangul_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_switch")]
++		public const uint Hangul_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hankaku")]
++		public const uint Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hcircumflex")]
++		public const uint Hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hebrew_switch")]
++		public const uint Hebrew_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Help")]
++		public const uint Help;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan")]
++		public const uint Henkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan_Mode")]
++		public const uint Henkan_Mode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hibernate")]
++		public const uint Hibernate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana")]
++		public const uint Hiragana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana_Katakana")]
++		public const uint Hiragana_Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_History")]
++		public const uint History;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Home")]
++		public const uint Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HomePage")]
++		public const uint HomePage;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HotLinks")]
++		public const uint HotLinks;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hstroke")]
++		public const uint Hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_L")]
++		public const uint Hyper_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_R")]
++		public const uint Hyper_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_I")]
++		public const uint I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Center_Object")]
++		public const uint ISO_Center_Object;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Continuous_Underline")]
++		public const uint ISO_Continuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Discontinuous_Underline")]
++		public const uint ISO_Discontinuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Emphasize")]
++		public const uint ISO_Emphasize;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Enter")]
++		public const uint ISO_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Down")]
++		public const uint ISO_Fast_Cursor_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Left")]
++		public const uint ISO_Fast_Cursor_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Right")]
++		public const uint ISO_Fast_Cursor_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Up")]
++		public const uint ISO_Fast_Cursor_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group")]
++		public const uint ISO_First_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group_Lock")]
++		public const uint ISO_First_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Latch")]
++		public const uint ISO_Group_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Lock")]
++		public const uint ISO_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Shift")]
++		public const uint ISO_Group_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group")]
++		public const uint ISO_Last_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group_Lock")]
++		public const uint ISO_Last_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Left_Tab")]
++		public const uint ISO_Left_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level2_Latch")]
++		public const uint ISO_Level2_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Latch")]
++		public const uint ISO_Level3_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Lock")]
++		public const uint ISO_Level3_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Shift")]
++		public const uint ISO_Level3_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Latch")]
++		public const uint ISO_Level5_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Lock")]
++		public const uint ISO_Level5_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Shift")]
++		public const uint ISO_Level5_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Lock")]
++		public const uint ISO_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Down")]
++		public const uint ISO_Move_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Up")]
++		public const uint ISO_Move_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group")]
++		public const uint ISO_Next_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group_Lock")]
++		public const uint ISO_Next_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Down")]
++		public const uint ISO_Partial_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Up")]
++		public const uint ISO_Partial_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Left")]
++		public const uint ISO_Partial_Space_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Right")]
++		public const uint ISO_Partial_Space_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group")]
++		public const uint ISO_Prev_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group_Lock")]
++		public const uint ISO_Prev_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Both_Margins")]
++		public const uint ISO_Release_Both_Margins;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Left")]
++		public const uint ISO_Release_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Right")]
++		public const uint ISO_Release_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Left")]
++		public const uint ISO_Set_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Right")]
++		public const uint ISO_Set_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iabovedot")]
++		public const uint Iabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iacute")]
++		public const uint Iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibelowdot")]
++		public const uint Ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibreve")]
++		public const uint Ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Icircumflex")]
++		public const uint Icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Idiaeresis")]
++		public const uint Idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Igrave")]
++		public const uint Igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ihook")]
++		public const uint Ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Imacron")]
++		public const uint Imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Insert")]
++		public const uint Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iogonek")]
++		public const uint Iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Itilde")]
++		public const uint Itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_J")]
++		public const uint J;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Jcircumflex")]
++		public const uint Jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_K")]
++		public const uint K;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_0")]
++		public const uint KP_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_1")]
++		public const uint KP_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_2")]
++		public const uint KP_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_3")]
++		public const uint KP_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_4")]
++		public const uint KP_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_5")]
++		public const uint KP_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_6")]
++		public const uint KP_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_7")]
++		public const uint KP_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_8")]
++		public const uint KP_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_9")]
++		public const uint KP_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Add")]
++		public const uint KP_Add;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Begin")]
++		public const uint KP_Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Decimal")]
++		public const uint KP_Decimal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Delete")]
++		public const uint KP_Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Divide")]
++		public const uint KP_Divide;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Down")]
++		public const uint KP_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_End")]
++		public const uint KP_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Enter")]
++		public const uint KP_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Equal")]
++		public const uint KP_Equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F1")]
++		public const uint KP_F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F2")]
++		public const uint KP_F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F3")]
++		public const uint KP_F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F4")]
++		public const uint KP_F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Home")]
++		public const uint KP_Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Insert")]
++		public const uint KP_Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Left")]
++		public const uint KP_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Multiply")]
++		public const uint KP_Multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Next")]
++		public const uint KP_Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Down")]
++		public const uint KP_Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Up")]
++		public const uint KP_Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Prior")]
++		public const uint KP_Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Right")]
++		public const uint KP_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Separator")]
++		public const uint KP_Separator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Space")]
++		public const uint KP_Space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Subtract")]
++		public const uint KP_Subtract;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Tab")]
++		public const uint KP_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Up")]
++		public const uint KP_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Lock")]
++		public const uint Kana_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Shift")]
++		public const uint Kana_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji")]
++		public const uint Kanji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji_Bangou")]
++		public const uint Kanji_Bangou;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Katakana")]
++		public const uint Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessDown")]
++		public const uint KbdBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessUp")]
++		public const uint KbdBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdLightOnOff")]
++		public const uint KbdLightOnOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kcedilla")]
++		public const uint Kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Korean_Won")]
++		public const uint Korean_Won;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L")]
++		public const uint L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L1")]
++		public const uint L1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L10")]
++		public const uint L10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L2")]
++		public const uint L2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L3")]
++		public const uint L3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L4")]
++		public const uint L4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L5")]
++		public const uint L5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L6")]
++		public const uint L6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L7")]
++		public const uint L7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L8")]
++		public const uint L8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L9")]
++		public const uint L9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lacute")]
++		public const uint Lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Last_Virtual_Screen")]
++		public const uint Last_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch0")]
++		public const uint Launch0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch1")]
++		public const uint Launch1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch2")]
++		public const uint Launch2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch3")]
++		public const uint Launch3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch4")]
++		public const uint Launch4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch5")]
++		public const uint Launch5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch6")]
++		public const uint Launch6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch7")]
++		public const uint Launch7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch8")]
++		public const uint Launch8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch9")]
++		public const uint Launch9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchA")]
++		public const uint LaunchA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchB")]
++		public const uint LaunchB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchC")]
++		public const uint LaunchC;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchD")]
++		public const uint LaunchD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchE")]
++		public const uint LaunchE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchF")]
++		public const uint LaunchF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lbelowdot")]
++		public const uint Lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcaron")]
++		public const uint Lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcedilla")]
++		public const uint Lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Left")]
++		public const uint Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LightBulb")]
++		public const uint LightBulb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Linefeed")]
++		public const uint Linefeed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LiraSign")]
++		public const uint LiraSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogGrabInfo")]
++		public const uint LogGrabInfo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogOff")]
++		public const uint LogOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogWindowTree")]
++		public const uint LogWindowTree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lstroke")]
++		public const uint Lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_M")]
++		public const uint M;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mabovedot")]
++		public const uint Mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_DSE")]
++		public const uint Macedonia_DSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_GJE")]
++		public const uint Macedonia_GJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_KJE")]
++		public const uint Macedonia_KJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_dse")]
++		public const uint Macedonia_dse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_gje")]
++		public const uint Macedonia_gje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_kje")]
++		public const uint Macedonia_kje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mae_Koho")]
++		public const uint Mae_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mail")]
++		public const uint Mail;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MailForward")]
++		public const uint MailForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Market")]
++		public const uint Market;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Massyo")]
++		public const uint Massyo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meeting")]
++		public const uint Meeting;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Memo")]
++		public const uint Memo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Menu")]
++		public const uint Menu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuKB")]
++		public const uint MenuKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuPB")]
++		public const uint MenuPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Messenger")]
++		public const uint Messenger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_L")]
++		public const uint Meta_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_R")]
++		public const uint Meta_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MillSign")]
++		public const uint MillSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ModeLock")]
++		public const uint ModeLock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mode_switch")]
++		public const uint Mode_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessDown")]
++		public const uint MonBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessUp")]
++		public const uint MonBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Accel_Enable")]
++		public const uint MouseKeys_Accel_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Enable")]
++		public const uint MouseKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Muhenkan")]
++		public const uint Muhenkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Multi_key")]
++		public const uint Multi_key;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MultipleCandidate")]
++		public const uint MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Music")]
++		public const uint Music;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MyComputer")]
++		public const uint MyComputer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MySites")]
++		public const uint MySites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_N")]
++		public const uint N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Nacute")]
++		public const uint Nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NairaSign")]
++		public const uint NairaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncaron")]
++		public const uint Ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncedilla")]
++		public const uint Ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_New")]
++		public const uint New;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NewSheqelSign")]
++		public const uint NewSheqelSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_News")]
++		public const uint News;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next")]
++		public const uint Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_VMode")]
++		public const uint Next_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_Virtual_Screen")]
++		public const uint Next_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ntilde")]
++		public const uint Ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Num_Lock")]
++		public const uint Num_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_O")]
++		public const uint O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OE")]
++		public const uint OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oacute")]
++		public const uint Oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obarred")]
++		public const uint Obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obelowdot")]
++		public const uint Obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocaron")]
++		public const uint Ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflex")]
++		public const uint Ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexacute")]
++		public const uint Ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexbelowdot")]
++		public const uint Ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexgrave")]
++		public const uint Ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexhook")]
++		public const uint Ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflextilde")]
++		public const uint Ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odiaeresis")]
++		public const uint Odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odoubleacute")]
++		public const uint Odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OfficeHome")]
++		public const uint OfficeHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ograve")]
++		public const uint Ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohook")]
++		public const uint Ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorn")]
++		public const uint Ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornacute")]
++		public const uint Ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornbelowdot")]
++		public const uint Ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorngrave")]
++		public const uint Ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornhook")]
++		public const uint Ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorntilde")]
++		public const uint Ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Omacron")]
++		public const uint Omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ooblique")]
++		public const uint Ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Open")]
++		public const uint Open;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OpenURL")]
++		public const uint OpenURL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Option")]
++		public const uint Option;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oslash")]
++		public const uint Oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Otilde")]
++		public const uint Otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay1_Enable")]
++		public const uint Overlay1_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay2_Enable")]
++		public const uint Overlay2_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_P")]
++		public const uint P;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pabovedot")]
++		public const uint Pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Down")]
++		public const uint Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Up")]
++		public const uint Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Paste")]
++		public const uint Paste;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pause")]
++		public const uint Pause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PesetaSign")]
++		public const uint PesetaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Phone")]
++		public const uint Phone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pictures")]
++		public const uint Pictures;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Accelerate")]
++		public const uint Pointer_Accelerate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button1")]
++		public const uint Pointer_Button1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button2")]
++		public const uint Pointer_Button2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button3")]
++		public const uint Pointer_Button3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button4")]
++		public const uint Pointer_Button4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button5")]
++		public const uint Pointer_Button5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button_Dflt")]
++		public const uint Pointer_Button_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick1")]
++		public const uint Pointer_DblClick1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick2")]
++		public const uint Pointer_DblClick2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick3")]
++		public const uint Pointer_DblClick3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick4")]
++		public const uint Pointer_DblClick4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick5")]
++		public const uint Pointer_DblClick5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick_Dflt")]
++		public const uint Pointer_DblClick_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnNext")]
++		public const uint Pointer_DfltBtnNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnPrev")]
++		public const uint Pointer_DfltBtnPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Down")]
++		public const uint Pointer_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownLeft")]
++		public const uint Pointer_DownLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownRight")]
++		public const uint Pointer_DownRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag1")]
++		public const uint Pointer_Drag1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag2")]
++		public const uint Pointer_Drag2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag3")]
++		public const uint Pointer_Drag3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag4")]
++		public const uint Pointer_Drag4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag5")]
++		public const uint Pointer_Drag5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag_Dflt")]
++		public const uint Pointer_Drag_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_EnableKeys")]
++		public const uint Pointer_EnableKeys;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Left")]
++		public const uint Pointer_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Right")]
++		public const uint Pointer_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Up")]
++		public const uint Pointer_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpLeft")]
++		public const uint Pointer_UpLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpRight")]
++		public const uint Pointer_UpRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerDown")]
++		public const uint PowerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerOff")]
++		public const uint PowerOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_VMode")]
++		public const uint Prev_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_Virtual_Screen")]
++		public const uint Prev_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PreviousCandidate")]
++		public const uint PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Print")]
++		public const uint Print;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prior")]
++		public const uint Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Q")]
++		public const uint Q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R")]
++		public const uint R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R1")]
++		public const uint R1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R10")]
++		public const uint R10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R11")]
++		public const uint R11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R12")]
++		public const uint R12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R13")]
++		public const uint R13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R14")]
++		public const uint R14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R15")]
++		public const uint R15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R2")]
++		public const uint R2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R3")]
++		public const uint R3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R4")]
++		public const uint R4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R5")]
++		public const uint R5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R6")]
++		public const uint R6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R7")]
++		public const uint R7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R8")]
++		public const uint R8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R9")]
++		public const uint R9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Racute")]
++		public const uint Racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcaron")]
++		public const uint Rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcedilla")]
++		public const uint Rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Red")]
++		public const uint Red;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Redo")]
++		public const uint Redo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Refresh")]
++		public const uint Refresh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reload")]
++		public const uint Reload;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RepeatKeys_Enable")]
++		public const uint RepeatKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reply")]
++		public const uint Reply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Return")]
++		public const uint Return;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Right")]
++		public const uint Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerDown")]
++		public const uint RockerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerEnter")]
++		public const uint RockerEnter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerUp")]
++		public const uint RockerUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Romaji")]
++		public const uint Romaji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotateWindows")]
++		public const uint RotateWindows;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationKB")]
++		public const uint RotationKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationPB")]
++		public const uint RotationPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RupeeSign")]
++		public const uint RupeeSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_S")]
++		public const uint S;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SCHWA")]
++		public const uint SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sabovedot")]
++		public const uint Sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sacute")]
++		public const uint Sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Save")]
++		public const uint Save;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scaron")]
++		public const uint Scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scedilla")]
++		public const uint Scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scircumflex")]
++		public const uint Scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScreenSaver")]
++		public const uint ScreenSaver;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollClick")]
++		public const uint ScrollClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollDown")]
++		public const uint ScrollDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollUp")]
++		public const uint ScrollUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scroll_Lock")]
++		public const uint Scroll_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Search")]
++		public const uint Search;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Select")]
++		public const uint Select;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SelectButton")]
++		public const uint SelectButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Send")]
++		public const uint Send;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DJE")]
++		public const uint Serbian_DJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DZE")]
++		public const uint Serbian_DZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_JE")]
++		public const uint Serbian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_LJE")]
++		public const uint Serbian_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_NJE")]
++		public const uint Serbian_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_TSHE")]
++		public const uint Serbian_TSHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dje")]
++		public const uint Serbian_dje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dze")]
++		public const uint Serbian_dze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_je")]
++		public const uint Serbian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_lje")]
++		public const uint Serbian_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_nje")]
++		public const uint Serbian_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_tshe")]
++		public const uint Serbian_tshe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_L")]
++		public const uint Shift_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_Lock")]
++		public const uint Shift_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_R")]
++		public const uint Shift_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shop")]
++		public const uint Shop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SingleCandidate")]
++		public const uint SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_a")]
++		public const uint Sinh_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa")]
++		public const uint Sinh_aa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa2")]
++		public const uint Sinh_aa2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae")]
++		public const uint Sinh_ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae2")]
++		public const uint Sinh_ae2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee")]
++		public const uint Sinh_aee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee2")]
++		public const uint Sinh_aee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai")]
++		public const uint Sinh_ai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai2")]
++		public const uint Sinh_ai2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_al")]
++		public const uint Sinh_al;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au")]
++		public const uint Sinh_au;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au2")]
++		public const uint Sinh_au2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ba")]
++		public const uint Sinh_ba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_bha")]
++		public const uint Sinh_bha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ca")]
++		public const uint Sinh_ca;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_cha")]
++		public const uint Sinh_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dda")]
++		public const uint Sinh_dda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ddha")]
++		public const uint Sinh_ddha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dha")]
++		public const uint Sinh_dha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dhha")]
++		public const uint Sinh_dhha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e")]
++		public const uint Sinh_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e2")]
++		public const uint Sinh_e2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee")]
++		public const uint Sinh_ee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee2")]
++		public const uint Sinh_ee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_fa")]
++		public const uint Sinh_fa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ga")]
++		public const uint Sinh_ga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_gha")]
++		public const uint Sinh_gha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_h2")]
++		public const uint Sinh_h2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ha")]
++		public const uint Sinh_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i")]
++		public const uint Sinh_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i2")]
++		public const uint Sinh_i2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii")]
++		public const uint Sinh_ii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii2")]
++		public const uint Sinh_ii2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ja")]
++		public const uint Sinh_ja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jha")]
++		public const uint Sinh_jha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jnya")]
++		public const uint Sinh_jnya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ka")]
++		public const uint Sinh_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kha")]
++		public const uint Sinh_kha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kunddaliya")]
++		public const uint Sinh_kunddaliya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_la")]
++		public const uint Sinh_la;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lla")]
++		public const uint Sinh_lla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu")]
++		public const uint Sinh_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu2")]
++		public const uint Sinh_lu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu")]
++		public const uint Sinh_luu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu2")]
++		public const uint Sinh_luu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ma")]
++		public const uint Sinh_ma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_mba")]
++		public const uint Sinh_mba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_na")]
++		public const uint Sinh_na;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndda")]
++		public const uint Sinh_ndda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndha")]
++		public const uint Sinh_ndha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng")]
++		public const uint Sinh_ng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng2")]
++		public const uint Sinh_ng2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nga")]
++		public const uint Sinh_nga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nja")]
++		public const uint Sinh_nja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nna")]
++		public const uint Sinh_nna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nya")]
++		public const uint Sinh_nya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o")]
++		public const uint Sinh_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o2")]
++		public const uint Sinh_o2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo")]
++		public const uint Sinh_oo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo2")]
++		public const uint Sinh_oo2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pa")]
++		public const uint Sinh_pa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pha")]
++		public const uint Sinh_pha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ra")]
++		public const uint Sinh_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ri")]
++		public const uint Sinh_ri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_rii")]
++		public const uint Sinh_rii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ru2")]
++		public const uint Sinh_ru2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ruu2")]
++		public const uint Sinh_ruu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sa")]
++		public const uint Sinh_sa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sha")]
++		public const uint Sinh_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ssha")]
++		public const uint Sinh_ssha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tha")]
++		public const uint Sinh_tha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_thha")]
++		public const uint Sinh_thha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tta")]
++		public const uint Sinh_tta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ttha")]
++		public const uint Sinh_ttha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u")]
++		public const uint Sinh_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u2")]
++		public const uint Sinh_u2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu")]
++		public const uint Sinh_uu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu2")]
++		public const uint Sinh_uu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_va")]
++		public const uint Sinh_va;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ya")]
++		public const uint Sinh_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sleep")]
++		public const uint Sleep;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SlowKeys_Enable")]
++		public const uint SlowKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Spell")]
++		public const uint Spell;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SplitScreen")]
++		public const uint SplitScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Standby")]
++		public const uint Standby;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Start")]
++		public const uint Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_StickyKeys_Enable")]
++		public const uint StickyKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Stop")]
++		public const uint Stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Subtitle")]
++		public const uint Subtitle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_L")]
++		public const uint Super_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_R")]
++		public const uint Super_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Support")]
++		public const uint Support;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Suspend")]
++		public const uint Suspend;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_1")]
++		public const uint Switch_VT_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_10")]
++		public const uint Switch_VT_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_11")]
++		public const uint Switch_VT_11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_12")]
++		public const uint Switch_VT_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_2")]
++		public const uint Switch_VT_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_3")]
++		public const uint Switch_VT_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_4")]
++		public const uint Switch_VT_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_5")]
++		public const uint Switch_VT_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_6")]
++		public const uint Switch_VT_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_7")]
++		public const uint Switch_VT_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_8")]
++		public const uint Switch_VT_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_9")]
++		public const uint Switch_VT_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sys_Req")]
++		public const uint Sys_Req;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_T")]
++		public const uint T;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_THORN")]
++		public const uint THORN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tab")]
++		public const uint Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tabovedot")]
++		public const uint Tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TaskPane")]
++		public const uint TaskPane;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcaron")]
++		public const uint Tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcedilla")]
++		public const uint Tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminal")]
++		public const uint Terminal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminate_Server")]
++		public const uint Terminate_Server;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_baht")]
++		public const uint Thai_baht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_bobaimai")]
++		public const uint Thai_bobaimai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochan")]
++		public const uint Thai_chochan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochang")]
++		public const uint Thai_chochang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_choching")]
++		public const uint Thai_choching;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochoe")]
++		public const uint Thai_chochoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dochada")]
++		public const uint Thai_dochada;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dodek")]
++		public const uint Thai_dodek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofa")]
++		public const uint Thai_fofa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofan")]
++		public const uint Thai_fofan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_hohip")]
++		public const uint Thai_hohip;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_honokhuk")]
++		public const uint Thai_honokhuk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhai")]
++		public const uint Thai_khokhai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhon")]
++		public const uint Thai_khokhon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhuat")]
++		public const uint Thai_khokhuat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhwai")]
++		public const uint Thai_khokhwai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khorakhang")]
++		public const uint Thai_khorakhang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_kokai")]
++		public const uint Thai_kokai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lakkhangyao")]
++		public const uint Thai_lakkhangyao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekchet")]
++		public const uint Thai_lekchet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekha")]
++		public const uint Thai_lekha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekhok")]
++		public const uint Thai_lekhok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekkao")]
++		public const uint Thai_lekkao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leknung")]
++		public const uint Thai_leknung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekpaet")]
++		public const uint Thai_lekpaet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksam")]
++		public const uint Thai_leksam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksi")]
++		public const uint Thai_leksi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksong")]
++		public const uint Thai_leksong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksun")]
++		public const uint Thai_leksun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lochula")]
++		public const uint Thai_lochula;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_loling")]
++		public const uint Thai_loling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lu")]
++		public const uint Thai_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maichattawa")]
++		public const uint Thai_maichattawa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiek")]
++		public const uint Thai_maiek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat")]
++		public const uint Thai_maihanakat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat_maitho")]
++		public const uint Thai_maihanakat_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitaikhu")]
++		public const uint Thai_maitaikhu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitho")]
++		public const uint Thai_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitri")]
++		public const uint Thai_maitri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiyamok")]
++		public const uint Thai_maiyamok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_moma")]
++		public const uint Thai_moma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ngongu")]
++		public const uint Thai_ngongu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nikhahit")]
++		public const uint Thai_nikhahit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonen")]
++		public const uint Thai_nonen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonu")]
++		public const uint Thai_nonu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_oang")]
++		public const uint Thai_oang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_paiyannoi")]
++		public const uint Thai_paiyannoi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phinthu")]
++		public const uint Thai_phinthu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophan")]
++		public const uint Thai_phophan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophung")]
++		public const uint Thai_phophung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phosamphao")]
++		public const uint Thai_phosamphao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_popla")]
++		public const uint Thai_popla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_rorua")]
++		public const uint Thai_rorua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ru")]
++		public const uint Thai_ru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraa")]
++		public const uint Thai_saraa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaa")]
++		public const uint Thai_saraaa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraae")]
++		public const uint Thai_saraae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimalai")]
++		public const uint Thai_saraaimaimalai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimuan")]
++		public const uint Thai_saraaimaimuan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraam")]
++		public const uint Thai_saraam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarae")]
++		public const uint Thai_sarae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarai")]
++		public const uint Thai_sarai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraii")]
++		public const uint Thai_saraii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarao")]
++		public const uint Thai_sarao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarau")]
++		public const uint Thai_sarau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraue")]
++		public const uint Thai_saraue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauee")]
++		public const uint Thai_sarauee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauu")]
++		public const uint Thai_sarauu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sorusi")]
++		public const uint Thai_sorusi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosala")]
++		public const uint Thai_sosala;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_soso")]
++		public const uint Thai_soso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosua")]
++		public const uint Thai_sosua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thanthakhat")]
++		public const uint Thai_thanthakhat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thonangmontho")]
++		public const uint Thai_thonangmontho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thophuthao")]
++		public const uint Thai_thophuthao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothahan")]
++		public const uint Thai_thothahan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothan")]
++		public const uint Thai_thothan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothong")]
++		public const uint Thai_thothong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothung")]
++		public const uint Thai_thothung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_topatak")]
++		public const uint Thai_topatak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_totao")]
++		public const uint Thai_totao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_wowaen")]
++		public const uint Thai_wowaen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoyak")]
++		public const uint Thai_yoyak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoying")]
++		public const uint Thai_yoying;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thorn")]
++		public const uint Thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Time")]
++		public const uint Time;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ToDoList")]
++		public const uint ToDoList;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tools")]
++		public const uint Tools;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TopMenu")]
++		public const uint TopMenu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOff")]
++		public const uint TouchpadOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOn")]
++		public const uint TouchpadOn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadToggle")]
++		public const uint TouchpadToggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Touroku")]
++		public const uint Touroku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Travel")]
++		public const uint Travel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tslash")]
++		public const uint Tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_U")]
++		public const uint U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UWB")]
++		public const uint UWB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uacute")]
++		public const uint Uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubelowdot")]
++		public const uint Ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubreve")]
++		public const uint Ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ucircumflex")]
++		public const uint Ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udiaeresis")]
++		public const uint Udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udoubleacute")]
++		public const uint Udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ugrave")]
++		public const uint Ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhook")]
++		public const uint Uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorn")]
++		public const uint Uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornacute")]
++		public const uint Uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornbelowdot")]
++		public const uint Uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorngrave")]
++		public const uint Uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornhook")]
++		public const uint Uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorntilde")]
++		public const uint Uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_GHE_WITH_UPTURN")]
++		public const uint Ukrainian_GHE_WITH_UPTURN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_I")]
++		public const uint Ukrainian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_IE")]
++		public const uint Ukrainian_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_YI")]
++		public const uint Ukrainian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ghe_with_upturn")]
++		public const uint Ukrainian_ghe_with_upturn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_i")]
++		public const uint Ukrainian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ie")]
++		public const uint Ukrainian_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_yi")]
++		public const uint Ukrainian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_I")]
++		public const uint Ukranian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_JE")]
++		public const uint Ukranian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_YI")]
++		public const uint Ukranian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_i")]
++		public const uint Ukranian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_je")]
++		public const uint Ukranian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_yi")]
++		public const uint Ukranian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Umacron")]
++		public const uint Umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Undo")]
++		public const uint Undo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ungrab")]
++		public const uint Ungrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uogonek")]
++		public const uint Uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Up")]
++		public const uint Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uring")]
++		public const uint Uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User1KB")]
++		public const uint User1KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User2KB")]
++		public const uint User2KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UserPB")]
++		public const uint UserPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Utilde")]
++		public const uint Utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_V")]
++		public const uint V;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VendorHome")]
++		public const uint VendorHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Video")]
++		public const uint Video;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_View")]
++		public const uint View;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VoidSymbol")]
++		public const uint VoidSymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_W")]
++		public const uint W;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WLAN")]
++		public const uint WLAN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WWW")]
++		public const uint WWW;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wacute")]
++		public const uint Wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WakeUp")]
++		public const uint WakeUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wcircumflex")]
++		public const uint Wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wdiaeresis")]
++		public const uint Wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WebCam")]
++		public const uint WebCam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wgrave")]
++		public const uint Wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WheelButton")]
++		public const uint WheelButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WindowClear")]
++		public const uint WindowClear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WonSign")]
++		public const uint WonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Word")]
++		public const uint Word;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_X")]
++		public const uint X;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xabovedot")]
++		public const uint Xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xfer")]
++		public const uint Xfer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Y")]
++		public const uint Y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yacute")]
++		public const uint Yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ybelowdot")]
++		public const uint Ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ycircumflex")]
++		public const uint Ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ydiaeresis")]
++		public const uint Ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yellow")]
++		public const uint Yellow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ygrave")]
++		public const uint Ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yhook")]
++		public const uint Yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ytilde")]
++		public const uint Ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Z")]
++		public const uint Z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zabovedot")]
++		public const uint Zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zacute")]
++		public const uint Zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zcaron")]
++		public const uint Zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zen_Koho")]
++		public const uint Zen_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku")]
++		public const uint Zenkaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku_Hankaku")]
++		public const uint Zenkaku_Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomIn")]
++		public const uint ZoomIn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomOut")]
++		public const uint ZoomOut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zstroke")]
++		public const uint Zstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_a")]
++		public const uint a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aacute")]
++		public const uint aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abelowdot")]
++		public const uint abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abovedot")]
++		public const uint abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreve")]
++		public const uint abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreveacute")]
++		public const uint abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevebelowdot")]
++		public const uint abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevegrave")]
++		public const uint abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevehook")]
++		public const uint abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevetilde")]
++		public const uint abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflex")]
++		public const uint acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexacute")]
++		public const uint acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexbelowdot")]
++		public const uint acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexgrave")]
++		public const uint acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexhook")]
++		public const uint acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflextilde")]
++		public const uint acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acute")]
++		public const uint acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_adiaeresis")]
++		public const uint adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ae")]
++		public const uint ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_agrave")]
++		public const uint agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ahook")]
++		public const uint ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_amacron")]
++		public const uint amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ampersand")]
++		public const uint ampersand;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aogonek")]
++		public const uint aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_apostrophe")]
++		public const uint apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approxeq")]
++		public const uint approxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approximate")]
++		public const uint approximate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aring")]
++		public const uint aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciicircum")]
++		public const uint asciicircum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciitilde")]
++		public const uint asciitilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asterisk")]
++		public const uint asterisk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_at")]
++		public const uint at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_atilde")]
++		public const uint atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_b")]
++		public const uint b;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_babovedot")]
++		public const uint babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_backslash")]
++		public const uint backslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ballotcross")]
++		public const uint ballotcross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bar")]
++		public const uint bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_because")]
++		public const uint because;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_blank")]
++		public const uint blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botintegral")]
++		public const uint botintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftparens")]
++		public const uint botleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsqbracket")]
++		public const uint botleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsummation")]
++		public const uint botleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightparens")]
++		public const uint botrightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsqbracket")]
++		public const uint botrightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsummation")]
++		public const uint botrightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bott")]
++		public const uint bott;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botvertsummationconnector")]
++		public const uint botvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceleft")]
++		public const uint braceleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceright")]
++		public const uint braceright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketleft")]
++		public const uint bracketleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketright")]
++		public const uint bracketright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_blank")]
++		public const uint braille_blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_1")]
++		public const uint braille_dot_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_10")]
++		public const uint braille_dot_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_2")]
++		public const uint braille_dot_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_3")]
++		public const uint braille_dot_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_4")]
++		public const uint braille_dot_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_5")]
++		public const uint braille_dot_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_6")]
++		public const uint braille_dot_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_7")]
++		public const uint braille_dot_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_8")]
++		public const uint braille_dot_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_9")]
++		public const uint braille_dot_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1")]
++		public const uint braille_dots_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12")]
++		public const uint braille_dots_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123")]
++		public const uint braille_dots_123;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234")]
++		public const uint braille_dots_1234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345")]
++		public const uint braille_dots_12345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123456")]
++		public const uint braille_dots_123456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234567")]
++		public const uint braille_dots_1234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345678")]
++		public const uint braille_dots_12345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234568")]
++		public const uint braille_dots_1234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123457")]
++		public const uint braille_dots_123457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234578")]
++		public const uint braille_dots_1234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123458")]
++		public const uint braille_dots_123458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12346")]
++		public const uint braille_dots_12346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123467")]
++		public const uint braille_dots_123467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234678")]
++		public const uint braille_dots_1234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123468")]
++		public const uint braille_dots_123468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12347")]
++		public const uint braille_dots_12347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123478")]
++		public const uint braille_dots_123478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12348")]
++		public const uint braille_dots_12348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235")]
++		public const uint braille_dots_1235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12356")]
++		public const uint braille_dots_12356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123567")]
++		public const uint braille_dots_123567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235678")]
++		public const uint braille_dots_1235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123568")]
++		public const uint braille_dots_123568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12357")]
++		public const uint braille_dots_12357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123578")]
++		public const uint braille_dots_123578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12358")]
++		public const uint braille_dots_12358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1236")]
++		public const uint braille_dots_1236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12367")]
++		public const uint braille_dots_12367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123678")]
++		public const uint braille_dots_123678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12368")]
++		public const uint braille_dots_12368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1237")]
++		public const uint braille_dots_1237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12378")]
++		public const uint braille_dots_12378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1238")]
++		public const uint braille_dots_1238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124")]
++		public const uint braille_dots_124;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245")]
++		public const uint braille_dots_1245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12456")]
++		public const uint braille_dots_12456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124567")]
++		public const uint braille_dots_124567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245678")]
++		public const uint braille_dots_1245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124568")]
++		public const uint braille_dots_124568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12457")]
++		public const uint braille_dots_12457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124578")]
++		public const uint braille_dots_124578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12458")]
++		public const uint braille_dots_12458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1246")]
++		public const uint braille_dots_1246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12467")]
++		public const uint braille_dots_12467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124678")]
++		public const uint braille_dots_124678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12468")]
++		public const uint braille_dots_12468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1247")]
++		public const uint braille_dots_1247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12478")]
++		public const uint braille_dots_12478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1248")]
++		public const uint braille_dots_1248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125")]
++		public const uint braille_dots_125;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1256")]
++		public const uint braille_dots_1256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12567")]
++		public const uint braille_dots_12567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125678")]
++		public const uint braille_dots_125678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12568")]
++		public const uint braille_dots_12568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1257")]
++		public const uint braille_dots_1257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12578")]
++		public const uint braille_dots_12578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1258")]
++		public const uint braille_dots_1258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_126")]
++		public const uint braille_dots_126;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1267")]
++		public const uint braille_dots_1267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12678")]
++		public const uint braille_dots_12678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1268")]
++		public const uint braille_dots_1268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_127")]
++		public const uint braille_dots_127;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1278")]
++		public const uint braille_dots_1278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_128")]
++		public const uint braille_dots_128;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13")]
++		public const uint braille_dots_13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134")]
++		public const uint braille_dots_134;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345")]
++		public const uint braille_dots_1345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13456")]
++		public const uint braille_dots_13456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134567")]
++		public const uint braille_dots_134567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345678")]
++		public const uint braille_dots_1345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134568")]
++		public const uint braille_dots_134568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13457")]
++		public const uint braille_dots_13457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134578")]
++		public const uint braille_dots_134578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13458")]
++		public const uint braille_dots_13458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1346")]
++		public const uint braille_dots_1346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13467")]
++		public const uint braille_dots_13467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134678")]
++		public const uint braille_dots_134678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13468")]
++		public const uint braille_dots_13468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1347")]
++		public const uint braille_dots_1347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13478")]
++		public const uint braille_dots_13478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1348")]
++		public const uint braille_dots_1348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135")]
++		public const uint braille_dots_135;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1356")]
++		public const uint braille_dots_1356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13567")]
++		public const uint braille_dots_13567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135678")]
++		public const uint braille_dots_135678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13568")]
++		public const uint braille_dots_13568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1357")]
++		public const uint braille_dots_1357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13578")]
++		public const uint braille_dots_13578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1358")]
++		public const uint braille_dots_1358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_136")]
++		public const uint braille_dots_136;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1367")]
++		public const uint braille_dots_1367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13678")]
++		public const uint braille_dots_13678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1368")]
++		public const uint braille_dots_1368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_137")]
++		public const uint braille_dots_137;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1378")]
++		public const uint braille_dots_1378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_138")]
++		public const uint braille_dots_138;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14")]
++		public const uint braille_dots_14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145")]
++		public const uint braille_dots_145;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1456")]
++		public const uint braille_dots_1456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14567")]
++		public const uint braille_dots_14567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145678")]
++		public const uint braille_dots_145678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14568")]
++		public const uint braille_dots_14568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1457")]
++		public const uint braille_dots_1457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14578")]
++		public const uint braille_dots_14578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1458")]
++		public const uint braille_dots_1458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_146")]
++		public const uint braille_dots_146;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1467")]
++		public const uint braille_dots_1467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14678")]
++		public const uint braille_dots_14678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1468")]
++		public const uint braille_dots_1468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_147")]
++		public const uint braille_dots_147;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1478")]
++		public const uint braille_dots_1478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_148")]
++		public const uint braille_dots_148;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15")]
++		public const uint braille_dots_15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_156")]
++		public const uint braille_dots_156;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1567")]
++		public const uint braille_dots_1567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15678")]
++		public const uint braille_dots_15678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1568")]
++		public const uint braille_dots_1568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_157")]
++		public const uint braille_dots_157;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1578")]
++		public const uint braille_dots_1578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_158")]
++		public const uint braille_dots_158;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_16")]
++		public const uint braille_dots_16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_167")]
++		public const uint braille_dots_167;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1678")]
++		public const uint braille_dots_1678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_168")]
++		public const uint braille_dots_168;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_17")]
++		public const uint braille_dots_17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_178")]
++		public const uint braille_dots_178;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_18")]
++		public const uint braille_dots_18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2")]
++		public const uint braille_dots_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23")]
++		public const uint braille_dots_23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234")]
++		public const uint braille_dots_234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345")]
++		public const uint braille_dots_2345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23456")]
++		public const uint braille_dots_23456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234567")]
++		public const uint braille_dots_234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345678")]
++		public const uint braille_dots_2345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234568")]
++		public const uint braille_dots_234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23457")]
++		public const uint braille_dots_23457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234578")]
++		public const uint braille_dots_234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23458")]
++		public const uint braille_dots_23458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2346")]
++		public const uint braille_dots_2346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23467")]
++		public const uint braille_dots_23467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234678")]
++		public const uint braille_dots_234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23468")]
++		public const uint braille_dots_23468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2347")]
++		public const uint braille_dots_2347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23478")]
++		public const uint braille_dots_23478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2348")]
++		public const uint braille_dots_2348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235")]
++		public const uint braille_dots_235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2356")]
++		public const uint braille_dots_2356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23567")]
++		public const uint braille_dots_23567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235678")]
++		public const uint braille_dots_235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23568")]
++		public const uint braille_dots_23568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2357")]
++		public const uint braille_dots_2357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23578")]
++		public const uint braille_dots_23578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2358")]
++		public const uint braille_dots_2358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_236")]
++		public const uint braille_dots_236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2367")]
++		public const uint braille_dots_2367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23678")]
++		public const uint braille_dots_23678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2368")]
++		public const uint braille_dots_2368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_237")]
++		public const uint braille_dots_237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2378")]
++		public const uint braille_dots_2378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_238")]
++		public const uint braille_dots_238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24")]
++		public const uint braille_dots_24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245")]
++		public const uint braille_dots_245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2456")]
++		public const uint braille_dots_2456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24567")]
++		public const uint braille_dots_24567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245678")]
++		public const uint braille_dots_245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24568")]
++		public const uint braille_dots_24568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2457")]
++		public const uint braille_dots_2457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24578")]
++		public const uint braille_dots_24578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2458")]
++		public const uint braille_dots_2458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_246")]
++		public const uint braille_dots_246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2467")]
++		public const uint braille_dots_2467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24678")]
++		public const uint braille_dots_24678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2468")]
++		public const uint braille_dots_2468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_247")]
++		public const uint braille_dots_247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2478")]
++		public const uint braille_dots_2478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_248")]
++		public const uint braille_dots_248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25")]
++		public const uint braille_dots_25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_256")]
++		public const uint braille_dots_256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2567")]
++		public const uint braille_dots_2567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25678")]
++		public const uint braille_dots_25678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2568")]
++		public const uint braille_dots_2568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_257")]
++		public const uint braille_dots_257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2578")]
++		public const uint braille_dots_2578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_258")]
++		public const uint braille_dots_258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_26")]
++		public const uint braille_dots_26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_267")]
++		public const uint braille_dots_267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2678")]
++		public const uint braille_dots_2678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_268")]
++		public const uint braille_dots_268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_27")]
++		public const uint braille_dots_27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_278")]
++		public const uint braille_dots_278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_28")]
++		public const uint braille_dots_28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3")]
++		public const uint braille_dots_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34")]
++		public const uint braille_dots_34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345")]
++		public const uint braille_dots_345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3456")]
++		public const uint braille_dots_3456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34567")]
++		public const uint braille_dots_34567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345678")]
++		public const uint braille_dots_345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34568")]
++		public const uint braille_dots_34568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3457")]
++		public const uint braille_dots_3457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34578")]
++		public const uint braille_dots_34578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3458")]
++		public const uint braille_dots_3458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_346")]
++		public const uint braille_dots_346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3467")]
++		public const uint braille_dots_3467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34678")]
++		public const uint braille_dots_34678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3468")]
++		public const uint braille_dots_3468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_347")]
++		public const uint braille_dots_347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3478")]
++		public const uint braille_dots_3478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_348")]
++		public const uint braille_dots_348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35")]
++		public const uint braille_dots_35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_356")]
++		public const uint braille_dots_356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3567")]
++		public const uint braille_dots_3567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35678")]
++		public const uint braille_dots_35678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3568")]
++		public const uint braille_dots_3568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_357")]
++		public const uint braille_dots_357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3578")]
++		public const uint braille_dots_3578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_358")]
++		public const uint braille_dots_358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_36")]
++		public const uint braille_dots_36;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_367")]
++		public const uint braille_dots_367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3678")]
++		public const uint braille_dots_3678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_368")]
++		public const uint braille_dots_368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_37")]
++		public const uint braille_dots_37;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_378")]
++		public const uint braille_dots_378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_38")]
++		public const uint braille_dots_38;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4")]
++		public const uint braille_dots_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45")]
++		public const uint braille_dots_45;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_456")]
++		public const uint braille_dots_456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4567")]
++		public const uint braille_dots_4567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45678")]
++		public const uint braille_dots_45678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4568")]
++		public const uint braille_dots_4568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_457")]
++		public const uint braille_dots_457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4578")]
++		public const uint braille_dots_4578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_458")]
++		public const uint braille_dots_458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_46")]
++		public const uint braille_dots_46;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_467")]
++		public const uint braille_dots_467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4678")]
++		public const uint braille_dots_4678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_468")]
++		public const uint braille_dots_468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_47")]
++		public const uint braille_dots_47;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_478")]
++		public const uint braille_dots_478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_48")]
++		public const uint braille_dots_48;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5")]
++		public const uint braille_dots_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_56")]
++		public const uint braille_dots_56;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_567")]
++		public const uint braille_dots_567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5678")]
++		public const uint braille_dots_5678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_568")]
++		public const uint braille_dots_568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_57")]
++		public const uint braille_dots_57;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_578")]
++		public const uint braille_dots_578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_58")]
++		public const uint braille_dots_58;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_6")]
++		public const uint braille_dots_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_67")]
++		public const uint braille_dots_67;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_678")]
++		public const uint braille_dots_678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_68")]
++		public const uint braille_dots_68;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_7")]
++		public const uint braille_dots_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_78")]
++		public const uint braille_dots_78;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_8")]
++		public const uint braille_dots_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_breve")]
++		public const uint breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_brokenbar")]
++		public const uint brokenbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c")]
++		public const uint c;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c_h")]
++		public const uint c_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cabovedot")]
++		public const uint cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cacute")]
++		public const uint cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_careof")]
++		public const uint careof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caret")]
++		public const uint caret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caron")]
++		public const uint caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccaron")]
++		public const uint ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccedilla")]
++		public const uint ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccircumflex")]
++		public const uint ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cedilla")]
++		public const uint cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cent")]
++		public const uint cent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ch")]
++		public const uint ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkerboard")]
++		public const uint checkerboard;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkmark")]
++		public const uint checkmark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_circle")]
++		public const uint circle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_club")]
++		public const uint club;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_colon")]
++		public const uint colon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_comma")]
++		public const uint comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_containsas")]
++		public const uint containsas;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_copyright")]
++		public const uint copyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cr")]
++		public const uint cr;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_crossinglines")]
++		public const uint crossinglines;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cuberoot")]
++		public const uint cuberoot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_currency")]
++		public const uint currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cursor")]
++		public const uint cursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_d")]
++		public const uint d;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dabovedot")]
++		public const uint dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dagger")]
++		public const uint dagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dcaron")]
++		public const uint dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_A")]
++		public const uint dead_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_E")]
++		public const uint dead_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_I")]
++		public const uint dead_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_O")]
++		public const uint dead_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_U")]
++		public const uint dead_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_a")]
++		public const uint dead_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovecomma")]
++		public const uint dead_abovecomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovedot")]
++		public const uint dead_abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovereversedcomma")]
++		public const uint dead_abovereversedcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovering")]
++		public const uint dead_abovering;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_aboveverticalline")]
++		public const uint dead_aboveverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_acute")]
++		public const uint dead_acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowbreve")]
++		public const uint dead_belowbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcircumflex")]
++		public const uint dead_belowcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcomma")]
++		public const uint dead_belowcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdiaeresis")]
++		public const uint dead_belowdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdot")]
++		public const uint dead_belowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowmacron")]
++		public const uint dead_belowmacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowring")]
++		public const uint dead_belowring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowtilde")]
++		public const uint dead_belowtilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowverticalline")]
++		public const uint dead_belowverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_breve")]
++		public const uint dead_breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_capital_schwa")]
++		public const uint dead_capital_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_caron")]
++		public const uint dead_caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_cedilla")]
++		public const uint dead_cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_circumflex")]
++		public const uint dead_circumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_currency")]
++		public const uint dead_currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_dasia")]
++		public const uint dead_dasia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_diaeresis")]
++		public const uint dead_diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doubleacute")]
++		public const uint dead_doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doublegrave")]
++		public const uint dead_doublegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_e")]
++		public const uint dead_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_grave")]
++		public const uint dead_grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_greek")]
++		public const uint dead_greek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_hook")]
++		public const uint dead_hook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_horn")]
++		public const uint dead_horn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_i")]
++		public const uint dead_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_invertedbreve")]
++		public const uint dead_invertedbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_iota")]
++		public const uint dead_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_longsolidusoverlay")]
++		public const uint dead_longsolidusoverlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_lowline")]
++		public const uint dead_lowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_macron")]
++		public const uint dead_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_o")]
++		public const uint dead_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_ogonek")]
++		public const uint dead_ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_perispomeni")]
++		public const uint dead_perispomeni;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_psili")]
++		public const uint dead_psili;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_semivoiced_sound")]
++		public const uint dead_semivoiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_small_schwa")]
++		public const uint dead_small_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_stroke")]
++		public const uint dead_stroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_tilde")]
++		public const uint dead_tilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_u")]
++		public const uint dead_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_voiced_sound")]
++		public const uint dead_voiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_decimalpoint")]
++		public const uint decimalpoint;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_degree")]
++		public const uint degree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diaeresis")]
++		public const uint diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diamond")]
++		public const uint diamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_digitspace")]
++		public const uint digitspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dintegral")]
++		public const uint dintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_division")]
++		public const uint division;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dollar")]
++		public const uint dollar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubbaselinedot")]
++		public const uint doubbaselinedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubleacute")]
++		public const uint doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubledagger")]
++		public const uint doubledagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doublelowquotemark")]
++		public const uint doublelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downarrow")]
++		public const uint downarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downcaret")]
++		public const uint downcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downshoe")]
++		public const uint downshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downstile")]
++		public const uint downstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downtack")]
++		public const uint downtack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dstroke")]
++		public const uint dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_e")]
++		public const uint e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eabovedot")]
++		public const uint eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eacute")]
++		public const uint eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ebelowdot")]
++		public const uint ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecaron")]
++		public const uint ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflex")]
++		public const uint ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexacute")]
++		public const uint ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexbelowdot")]
++		public const uint ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexgrave")]
++		public const uint ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexhook")]
++		public const uint ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflextilde")]
++		public const uint ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ediaeresis")]
++		public const uint ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_egrave")]
++		public const uint egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ehook")]
++		public const uint ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsubscript")]
++		public const uint eightsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsuperior")]
++		public const uint eightsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_elementof")]
++		public const uint elementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ellipsis")]
++		public const uint ellipsis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em3space")]
++		public const uint em3space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em4space")]
++		public const uint em4space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emacron")]
++		public const uint emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emdash")]
++		public const uint emdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledcircle")]
++		public const uint emfilledcircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledrect")]
++		public const uint emfilledrect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopencircle")]
++		public const uint emopencircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopenrectangle")]
++		public const uint emopenrectangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emptyset")]
++		public const uint emptyset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emspace")]
++		public const uint emspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_endash")]
++		public const uint endash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledcircbullet")]
++		public const uint enfilledcircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledsqbullet")]
++		public const uint enfilledsqbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eng")]
++		public const uint eng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopencircbullet")]
++		public const uint enopencircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopensquarebullet")]
++		public const uint enopensquarebullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enspace")]
++		public const uint enspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eogonek")]
++		public const uint eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_equal")]
++		public const uint equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eth")]
++		public const uint eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_etilde")]
++		public const uint etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclam")]
++		public const uint exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclamdown")]
++		public const uint exclamdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ezh")]
++		public const uint ezh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_f")]
++		public const uint f;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fabovedot")]
++		public const uint fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_femalesymbol")]
++		public const uint femalesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ff")]
++		public const uint ff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_figdash")]
++		public const uint figdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledlefttribullet")]
++		public const uint filledlefttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrectbullet")]
++		public const uint filledrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrighttribullet")]
++		public const uint filledrighttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletdown")]
++		public const uint filledtribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletup")]
++		public const uint filledtribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fiveeighths")]
++		public const uint fiveeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesixths")]
++		public const uint fivesixths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesubscript")]
++		public const uint fivesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesuperior")]
++		public const uint fivesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourfifths")]
++		public const uint fourfifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursubscript")]
++		public const uint foursubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursuperior")]
++		public const uint foursuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourthroot")]
++		public const uint fourthroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_function")]
++		public const uint function;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_g")]
++		public const uint g;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gabovedot")]
++		public const uint gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gbreve")]
++		public const uint gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcaron")]
++		public const uint gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcedilla")]
++		public const uint gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcircumflex")]
++		public const uint gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_grave")]
++		public const uint grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greater")]
++		public const uint greater;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greaterthanequal")]
++		public const uint greaterthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotleft")]
++		public const uint guillemotleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotright")]
++		public const uint guillemotright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_h")]
++		public const uint h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hairspace")]
++		public const uint hairspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hcircumflex")]
++		public const uint hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_heart")]
++		public const uint heart;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_aleph")]
++		public const uint hebrew_aleph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_ayin")]
++		public const uint hebrew_ayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_bet")]
++		public const uint hebrew_bet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_beth")]
++		public const uint hebrew_beth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_chet")]
++		public const uint hebrew_chet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_dalet")]
++		public const uint hebrew_dalet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_daleth")]
++		public const uint hebrew_daleth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_doublelowline")]
++		public const uint hebrew_doublelowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalkaph")]
++		public const uint hebrew_finalkaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalmem")]
++		public const uint hebrew_finalmem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalnun")]
++		public const uint hebrew_finalnun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalpe")]
++		public const uint hebrew_finalpe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzade")]
++		public const uint hebrew_finalzade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzadi")]
++		public const uint hebrew_finalzadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimel")]
++		public const uint hebrew_gimel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimmel")]
++		public const uint hebrew_gimmel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_he")]
++		public const uint hebrew_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_het")]
++		public const uint hebrew_het;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kaph")]
++		public const uint hebrew_kaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kuf")]
++		public const uint hebrew_kuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_lamed")]
++		public const uint hebrew_lamed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_mem")]
++		public const uint hebrew_mem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_nun")]
++		public const uint hebrew_nun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_pe")]
++		public const uint hebrew_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_qoph")]
++		public const uint hebrew_qoph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_resh")]
++		public const uint hebrew_resh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samech")]
++		public const uint hebrew_samech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samekh")]
++		public const uint hebrew_samekh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_shin")]
++		public const uint hebrew_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taf")]
++		public const uint hebrew_taf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taw")]
++		public const uint hebrew_taw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_tet")]
++		public const uint hebrew_tet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_teth")]
++		public const uint hebrew_teth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_waw")]
++		public const uint hebrew_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_yod")]
++		public const uint hebrew_yod;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zade")]
++		public const uint hebrew_zade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zadi")]
++		public const uint hebrew_zadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zain")]
++		public const uint hebrew_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zayin")]
++		public const uint hebrew_zayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hexagram")]
++		public const uint hexagram;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizconnector")]
++		public const uint horizconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan1")]
++		public const uint horizlinescan1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan3")]
++		public const uint horizlinescan3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan5")]
++		public const uint horizlinescan5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan7")]
++		public const uint horizlinescan7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan9")]
++		public const uint horizlinescan9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hstroke")]
++		public const uint hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ht")]
++		public const uint ht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hyphen")]
++		public const uint hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_i")]
++		public const uint i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iTouch")]
++		public const uint iTouch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iacute")]
++		public const uint iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibelowdot")]
++		public const uint ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibreve")]
++		public const uint ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_icircumflex")]
++		public const uint icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_identical")]
++		public const uint identical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idiaeresis")]
++		public const uint idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idotless")]
++		public const uint idotless;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ifonlyif")]
++		public const uint ifonlyif;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_igrave")]
++		public const uint igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ihook")]
++		public const uint ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_imacron")]
++		public const uint imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_implies")]
++		public const uint implies;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includedin")]
++		public const uint includedin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includes")]
++		public const uint includes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_infinity")]
++		public const uint infinity;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_integral")]
++		public const uint integral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_intersection")]
++		public const uint intersection;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iogonek")]
++		public const uint iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_itilde")]
++		public const uint itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_j")]
++		public const uint j;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jcircumflex")]
++		public const uint jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jot")]
++		public const uint jot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_k")]
++		public const uint k;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_A")]
++		public const uint kana_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_CHI")]
++		public const uint kana_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_E")]
++		public const uint kana_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_FU")]
++		public const uint kana_FU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HA")]
++		public const uint kana_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HE")]
++		public const uint kana_HE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HI")]
++		public const uint kana_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HO")]
++		public const uint kana_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HU")]
++		public const uint kana_HU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_I")]
++		public const uint kana_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KA")]
++		public const uint kana_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KE")]
++		public const uint kana_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KI")]
++		public const uint kana_KI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KO")]
++		public const uint kana_KO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KU")]
++		public const uint kana_KU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MA")]
++		public const uint kana_MA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ME")]
++		public const uint kana_ME;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MI")]
++		public const uint kana_MI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MO")]
++		public const uint kana_MO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MU")]
++		public const uint kana_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_N")]
++		public const uint kana_N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NA")]
++		public const uint kana_NA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NE")]
++		public const uint kana_NE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NI")]
++		public const uint kana_NI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NO")]
++		public const uint kana_NO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NU")]
++		public const uint kana_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_O")]
++		public const uint kana_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RA")]
++		public const uint kana_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RE")]
++		public const uint kana_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RI")]
++		public const uint kana_RI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RO")]
++		public const uint kana_RO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RU")]
++		public const uint kana_RU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SA")]
++		public const uint kana_SA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SE")]
++		public const uint kana_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SHI")]
++		public const uint kana_SHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SO")]
++		public const uint kana_SO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SU")]
++		public const uint kana_SU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TA")]
++		public const uint kana_TA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TE")]
++		public const uint kana_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TI")]
++		public const uint kana_TI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TO")]
++		public const uint kana_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TSU")]
++		public const uint kana_TSU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TU")]
++		public const uint kana_TU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_U")]
++		public const uint kana_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WA")]
++		public const uint kana_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WO")]
++		public const uint kana_WO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YA")]
++		public const uint kana_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YO")]
++		public const uint kana_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YU")]
++		public const uint kana_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_a")]
++		public const uint kana_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_closingbracket")]
++		public const uint kana_closingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_comma")]
++		public const uint kana_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_conjunctive")]
++		public const uint kana_conjunctive;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_e")]
++		public const uint kana_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_fullstop")]
++		public const uint kana_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_i")]
++		public const uint kana_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_middledot")]
++		public const uint kana_middledot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_o")]
++		public const uint kana_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_openingbracket")]
++		public const uint kana_openingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_switch")]
++		public const uint kana_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tsu")]
++		public const uint kana_tsu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tu")]
++		public const uint kana_tu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_u")]
++		public const uint kana_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ya")]
++		public const uint kana_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yo")]
++		public const uint kana_yo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yu")]
++		public const uint kana_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kappa")]
++		public const uint kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kcedilla")]
++		public const uint kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kra")]
++		public const uint kra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_l")]
++		public const uint l;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lacute")]
++		public const uint lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_latincross")]
++		public const uint latincross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lbelowdot")]
++		public const uint lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcaron")]
++		public const uint lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcedilla")]
++		public const uint lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftanglebracket")]
++		public const uint leftanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftarrow")]
++		public const uint leftarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftcaret")]
++		public const uint leftcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftdoublequotemark")]
++		public const uint leftdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftmiddlecurlybrace")]
++		public const uint leftmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftopentriangle")]
++		public const uint leftopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftpointer")]
++		public const uint leftpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftradical")]
++		public const uint leftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftshoe")]
++		public const uint leftshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftsinglequotemark")]
++		public const uint leftsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftt")]
++		public const uint leftt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lefttack")]
++		public const uint lefttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_less")]
++		public const uint less;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lessthanequal")]
++		public const uint lessthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lf")]
++		public const uint lf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicaland")]
++		public const uint logicaland;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicalor")]
++		public const uint logicalor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowleftcorner")]
++		public const uint lowleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowrightcorner")]
++		public const uint lowrightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lstroke")]
++		public const uint lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_m")]
++		public const uint m;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mabovedot")]
++		public const uint mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_macron")]
++		public const uint macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_malesymbol")]
++		public const uint malesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_maltesecross")]
++		public const uint maltesecross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_marker")]
++		public const uint marker;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_masculine")]
++		public const uint masculine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minus")]
++		public const uint minus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minutes")]
++		public const uint minutes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mu")]
++		public const uint mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_multiply")]
++		public const uint multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalflat")]
++		public const uint musicalflat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalsharp")]
++		public const uint musicalsharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_n")]
++		public const uint n;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nabla")]
++		public const uint nabla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nacute")]
++		public const uint nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncaron")]
++		public const uint ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncedilla")]
++		public const uint ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesubscript")]
++		public const uint ninesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesuperior")]
++		public const uint ninesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nl")]
++		public const uint nl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nobreakspace")]
++		public const uint nobreakspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notapproxeq")]
++		public const uint notapproxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notelementof")]
++		public const uint notelementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notequal")]
++		public const uint notequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notidentical")]
++		public const uint notidentical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notsign")]
++		public const uint notsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ntilde")]
++		public const uint ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numbersign")]
++		public const uint numbersign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numerosign")]
++		public const uint numerosign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_o")]
++		public const uint o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oacute")]
++		public const uint oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obarred")]
++		public const uint obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obelowdot")]
++		public const uint obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocaron")]
++		public const uint ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflex")]
++		public const uint ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexacute")]
++		public const uint ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexbelowdot")]
++		public const uint ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexgrave")]
++		public const uint ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexhook")]
++		public const uint ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflextilde")]
++		public const uint ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odiaeresis")]
++		public const uint odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odoubleacute")]
++		public const uint odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oe")]
++		public const uint oe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ogonek")]
++		public const uint ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ograve")]
++		public const uint ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohook")]
++		public const uint ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorn")]
++		public const uint ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornacute")]
++		public const uint ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornbelowdot")]
++		public const uint ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorngrave")]
++		public const uint ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornhook")]
++		public const uint ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorntilde")]
++		public const uint ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_omacron")]
++		public const uint omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oneeighth")]
++		public const uint oneeighth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onefifth")]
++		public const uint onefifth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onehalf")]
++		public const uint onehalf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onequarter")]
++		public const uint onequarter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesixth")]
++		public const uint onesixth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesubscript")]
++		public const uint onesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesuperior")]
++		public const uint onesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onethird")]
++		public const uint onethird;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ooblique")]
++		public const uint ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openrectbullet")]
++		public const uint openrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openstar")]
++		public const uint openstar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletdown")]
++		public const uint opentribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletup")]
++		public const uint opentribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ordfeminine")]
++		public const uint ordfeminine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oslash")]
++		public const uint oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_otilde")]
++		public const uint otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overbar")]
++		public const uint overbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overline")]
++		public const uint overline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_p")]
++		public const uint p;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_pabovedot")]
++		public const uint pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_paragraph")]
++		public const uint paragraph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenleft")]
++		public const uint parenleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenright")]
++		public const uint parenright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partdifferential")]
++		public const uint partdifferential;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partialderivative")]
++		public const uint partialderivative;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_percent")]
++		public const uint percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_period")]
++		public const uint period;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_periodcentered")]
++		public const uint periodcentered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_permille")]
++		public const uint permille;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_phonographcopyright")]
++		public const uint phonographcopyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plus")]
++		public const uint plus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plusminus")]
++		public const uint plusminus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prescription")]
++		public const uint prescription;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prolongedsound")]
++		public const uint prolongedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_punctspace")]
++		public const uint punctspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_q")]
++		public const uint q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quad")]
++		public const uint quad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_question")]
++		public const uint question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_questiondown")]
++		public const uint questiondown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quotedbl")]
++		public const uint quotedbl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteleft")]
++		public const uint quoteleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteright")]
++		public const uint quoteright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_r")]
++		public const uint r;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_racute")]
++		public const uint racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_radical")]
++		public const uint radical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcaron")]
++		public const uint rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcedilla")]
++		public const uint rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_registered")]
++		public const uint registered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightanglebracket")]
++		public const uint rightanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightarrow")]
++		public const uint rightarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightcaret")]
++		public const uint rightcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightdoublequotemark")]
++		public const uint rightdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlecurlybrace")]
++		public const uint rightmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlesummation")]
++		public const uint rightmiddlesummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightopentriangle")]
++		public const uint rightopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightpointer")]
++		public const uint rightpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightshoe")]
++		public const uint rightshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightsinglequotemark")]
++		public const uint rightsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightt")]
++		public const uint rightt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_righttack")]
++		public const uint righttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_s")]
++		public const uint s;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sabovedot")]
++		public const uint sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sacute")]
++		public const uint sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scaron")]
++		public const uint scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scedilla")]
++		public const uint scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_schwa")]
++		public const uint schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scircumflex")]
++		public const uint scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_script_switch")]
++		public const uint script_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seconds")]
++		public const uint seconds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_section")]
++		public const uint section;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semicolon")]
++		public const uint semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semivoicedsound")]
++		public const uint semivoicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seveneighths")]
++		public const uint seveneighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensubscript")]
++		public const uint sevensubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensuperior")]
++		public const uint sevensuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signaturemark")]
++		public const uint signaturemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signifblank")]
++		public const uint signifblank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_similarequal")]
++		public const uint similarequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_singlelowquotemark")]
++		public const uint singlelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsubscript")]
++		public const uint sixsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsuperior")]
++		public const uint sixsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_slash")]
++		public const uint slash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_soliddiamond")]
++		public const uint soliddiamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_space")]
++		public const uint space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_squareroot")]
++		public const uint squareroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ssharp")]
++		public const uint ssharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sterling")]
++		public const uint sterling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_stricteq")]
++		public const uint stricteq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_t")]
++		public const uint t;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tabovedot")]
++		public const uint tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcaron")]
++		public const uint tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcedilla")]
++		public const uint tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephone")]
++		public const uint telephone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephonerecorder")]
++		public const uint telephonerecorder;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_therefore")]
++		public const uint therefore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thinspace")]
++		public const uint thinspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thorn")]
++		public const uint thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threeeighths")]
++		public const uint threeeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threefifths")]
++		public const uint threefifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threequarters")]
++		public const uint threequarters;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesubscript")]
++		public const uint threesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesuperior")]
++		public const uint threesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tintegral")]
++		public const uint tintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topintegral")]
++		public const uint topintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftparens")]
++		public const uint topleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftradical")]
++		public const uint topleftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsqbracket")]
++		public const uint topleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsummation")]
++		public const uint topleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightparens")]
++		public const uint toprightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsqbracket")]
++		public const uint toprightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsummation")]
++		public const uint toprightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topt")]
++		public const uint topt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topvertsummationconnector")]
++		public const uint topvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademark")]
++		public const uint trademark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademarkincircle")]
++		public const uint trademarkincircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tslash")]
++		public const uint tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twofifths")]
++		public const uint twofifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosubscript")]
++		public const uint twosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosuperior")]
++		public const uint twosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twothirds")]
++		public const uint twothirds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_u")]
++		public const uint u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uacute")]
++		public const uint uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubelowdot")]
++		public const uint ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubreve")]
++		public const uint ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ucircumflex")]
++		public const uint ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udiaeresis")]
++		public const uint udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udoubleacute")]
++		public const uint udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ugrave")]
++		public const uint ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhook")]
++		public const uint uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorn")]
++		public const uint uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornacute")]
++		public const uint uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornbelowdot")]
++		public const uint uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorngrave")]
++		public const uint uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornhook")]
++		public const uint uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorntilde")]
++		public const uint uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_umacron")]
++		public const uint umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underbar")]
++		public const uint underbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underscore")]
++		public const uint underscore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_union")]
++		public const uint union;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uogonek")]
++		public const uint uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uparrow")]
++		public const uint uparrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upcaret")]
++		public const uint upcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upleftcorner")]
++		public const uint upleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uprightcorner")]
++		public const uint uprightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upshoe")]
++		public const uint upshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upstile")]
++		public const uint upstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uptack")]
++		public const uint uptack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uring")]
++		public const uint uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_utilde")]
++		public const uint utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_v")]
++		public const uint v;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_variation")]
++		public const uint variation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertbar")]
++		public const uint vertbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertconnector")]
++		public const uint vertconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_voicedsound")]
++		public const uint voicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vt")]
++		public const uint vt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_w")]
++		public const uint w;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wacute")]
++		public const uint wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wcircumflex")]
++		public const uint wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wdiaeresis")]
++		public const uint wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wgrave")]
++		public const uint wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_x")]
++		public const uint x;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_xabovedot")]
++		public const uint xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_y")]
++		public const uint y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yacute")]
++		public const uint yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ybelowdot")]
++		public const uint ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ycircumflex")]
++		public const uint ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ydiaeresis")]
++		public const uint ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yen")]
++		public const uint yen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ygrave")]
++		public const uint ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yhook")]
++		public const uint yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ytilde")]
++		public const uint ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_z")]
++		public const uint z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zabovedot")]
++		public const uint zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zacute")]
++		public const uint zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zcaron")]
++		public const uint zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosubscript")]
++		public const uint zerosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosuperior")]
++		public const uint zerosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zstroke")]
++		public const uint zstroke;
++	}
++	namespace Threads {
++		namespace Idle {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")]
++			[Version (since = "0.4")]
++			public static uint add (GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, owned GLib.SourceFunc func);
++		}
++		namespace Timeout {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")]
++			[Version (since = "0.4")]
++			public static uint add (uint interval, GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func);
++		}
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static uint add_repaint_func (owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static uint add_repaint_func_full (Clutter.RepaintFlags flags, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static void remove_repaint_func (uint handle_id);
++	}
++	namespace Value {
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static Clutter.PaintNode dup_paint_node (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Color? get_color (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static unowned Clutter.PaintNode get_paint_node (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_float (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned int[] get_shader_int (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_matrix (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Units? get_units (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_color (GLib.Value value, Clutter.Color color);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void set_paint_node (GLib.Value value, Clutter.PaintNode? node);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_units (GLib.Value value, Clutter.Units units);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void take_paint_node (GLib.Value value, Clutter.PaintNode? node);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_action_get_type ()")]
++	public abstract class Action : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Action ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")]
++	public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		public uint32 flags;
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.10")]
++		public Actor ();
++		[Version (since = "1.4")]
++		public void add_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void add_action_with_name (string name, Clutter.Action action);
++		[Version (since = "1.10")]
++		public void add_child (Clutter.Actor child);
++		[Version (since = "1.4")]
++		public void add_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_constraint_with_name (string name, Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void add_effect_with_name (string name, Clutter.Effect effect);
++		[Version (since = "1.10")]
++		public void add_transition (string name, Clutter.Transition transition);
++		[Version (since = "0.8")]
++		public virtual void allocate (Clutter.ActorBox box);
++		[Version (since = "1.4")]
++		public void allocate_align_fill (Clutter.ActorBox box, double x_align, double y_align, bool x_fill, bool y_fill);
++		[Version (since = "1.0")]
++		public void allocate_available_size (float x, float y, float available_width, float available_height);
++		[Version (since = "0.8")]
++		public void allocate_preferred_size (float x, float y);
++		[Version (since = "0.6")]
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
++		[NoWrapper]
++		public virtual void apply_transform (ref Graphene.Matrix matrix);
++		[Version (since = "0.4")]
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
++		[Version (since = "1.24")]
++		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
++		[NoWrapper]
++		public virtual float calculate_resource_scale (int phase);
++		[Version (since = "1.4")]
++		public void clear_actions ();
++		[Version (since = "1.4")]
++		public void clear_constraints ();
++		[Version (since = "1.4")]
++		public void clear_effects ();
++		[Version (since = "1.4")]
++		public bool contains (Clutter.Actor descendant);
++		[Version (since = "1.8")]
++		public void continue_paint (Clutter.PaintContext paint_context);
++		public void continue_pick (Clutter.PickContext pick_context);
++		[Version (since = "1.0")]
++		public Pango.Context create_pango_context ();
++		[Version (since = "1.0")]
++		public Pango.Layout create_pango_layout (string? text);
++		[Version (since = "1.10")]
++		public void destroy_all_children ();
++		[CCode (cname = "clutter_actor_event")]
++		[Version (since = "0.6")]
++		public bool emit_event (Clutter.Event event, bool capture);
++		[Version (since = "0.4")]
++		public void get_abs_allocation_vertices ([CCode (array_length = false)] Graphene.Point3D verts[4]);
++		public virtual unowned Atk.Object get_accessible ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Action get_action (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Action> get_actions ();
++		[Version (since = "0.8")]
++		public Clutter.ActorBox get_allocation_box ();
++		[Version (since = "1.10")]
++		public Clutter.Color get_background_color ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_child_at_index (int index_);
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_child_transform ();
++		[Version (since = "1.10")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[Version (since = "0.6")]
++		public void get_clip (out float xoff, out float yoff, out float width, out float height);
++		[Version (since = "1.4")]
++		public bool get_clip_to_allocation ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Constraint get_constraint (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Constraint> get_constraints ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Content get_content ();
++		[Version (since = "1.10")]
++		public Clutter.ActorBox get_content_box ();
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity get_content_gravity ();
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat get_content_repeat ();
++		[Version (since = "1.10")]
++		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
++		[Version (since = "1.10")]
++		public uint get_easing_delay ();
++		[Version (since = "1.10")]
++		public uint get_easing_duration ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_easing_mode ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Effect get_effect (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Effect> get_effects ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_first_child ();
++		public bool get_fixed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public bool get_fixed_position_set ();
++		[Version (since = "1.0")]
++		public Clutter.ActorFlags get_flags ();
++		[CCode (cname = "clutter_actor_has_pointer")]
++		[Version (since = "1.2")]
++		public bool get_has_pointer ();
++		public float get_height ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_last_child ();
++		[Version (since = "1.10")]
++		public unowned Clutter.LayoutManager get_layout_manager ();
++		[Version (since = "1.10")]
++		public Clutter.Margin get_margin ();
++		[Version (since = "1.10")]
++		public float get_margin_bottom ();
++		[Version (since = "1.10")]
++		public float get_margin_left ();
++		[Version (since = "1.10")]
++		public float get_margin_right ();
++		[Version (since = "1.10")]
++		public float get_margin_top ();
++		[Version (since = "1.10")]
++		public int get_n_children ();
++		public unowned string get_name ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_next_sibling ();
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect get_offscreen_redirect ();
++		public uint8 get_opacity ();
++		[Version (since = "1.22")]
++		public int get_opacity_override ();
++		[Version (since = "1.6")]
++		public bool get_paint_box (out Clutter.ActorBox box);
++		[Version (since = "0.8")]
++		public uint8 get_paint_opacity ();
++		[Version (since = "0.8")]
++		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
++		[NoWrapper]
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
++		[Version (since = "1.0")]
++		public unowned Pango.Context get_pango_context ();
++		public unowned Clutter.Actor? get_parent ();
++		[Version (since = "1.12")]
++		public void get_pivot_point (out float pivot_x, out float pivot_y);
++		[Version (since = "1.12")]
++		public float get_pivot_point_z ();
++		[Version (since = "0.6")]
++		public void get_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_height (float for_width, out float min_height_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public void get_preferred_size (out float min_width_p, out float min_height_p, out float natural_width_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_width (float for_height, out float min_width_p, out float natural_width_p);
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_previous_sibling ();
++		[Version (since = "0.6")]
++		public bool get_reactive ();
++		[Version (since = "1.2")]
++		public Clutter.RequestMode get_request_mode ();
++		public float get_resource_scale ();
++		[Version (since = "1.12")]
++		public double get_rotation_angle (Clutter.RotateAxis axis);
++		[Version (since = "0.2")]
++		public void get_scale (out double scale_x, out double scale_y);
++		[Version (since = "1.12")]
++		public double get_scale_z ();
++		[Version (since = "0.2")]
++		public void get_size (out float width, out float height);
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "1.2")]
++		public Clutter.TextDirection get_text_direction ();
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_transform ();
++		public Graphene.Rect get_transformed_extents ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		[Version (since = "0.8")]
++		public void get_transformed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public void get_transformed_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Clutter.Transition get_transition (string name);
++		[Version (since = "1.12")]
++		public void get_translation (out float translate_x, out float translate_y, out float translate_z);
++		public float get_width ();
++		public float get_x ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_x_align ();
++		[Version (since = "1.12")]
++		public bool get_x_expand ();
++		public float get_y ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_y_align ();
++		[Version (since = "1.12")]
++		public bool get_y_expand ();
++		[Version (since = "1.12")]
++		public float get_z_position ();
++		[Version (since = "1.0")]
++		public void grab_key_focus ();
++		public virtual bool has_accessible ();
++		[Version (since = "1.10")]
++		public bool has_actions ();
++		[Version (since = "1.4")]
++		public bool has_allocation ();
++		[Version (since = "1.10")]
++		public bool has_constraints ();
++		public bool has_damage ();
++		[Version (since = "1.10")]
++		public bool has_effects ();
++		[Version (since = "1.4")]
++		public bool has_key_focus ();
++		public bool has_mapped_clones ();
++		[Version (since = "1.8")]
++		public virtual bool has_overlaps ();
++		[NoWrapper]
++		public virtual void hide_all ();
++		public void inhibit_culling ();
++		[Version (since = "1.10")]
++		public void insert_child_above (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void insert_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void insert_child_below (Clutter.Actor child, Clutter.Actor? sibling);
++		public void invalidate_transform ();
++		public bool is_effectively_on_stage_view (Clutter.StageView view);
++		[Version (since = "1.0")]
++		public bool is_in_clone_paint ();
++		[Version (since = "1.24")]
++		public bool is_mapped ();
++		[Version (since = "1.24")]
++		public bool is_realized ();
++		[Version (since = "0.6")]
++		public bool is_rotated ();
++		[Version (since = "0.6")]
++		public bool is_scaled ();
++		[Version (since = "1.24")]
++		public bool is_visible ();
++		[Version (since = "1.0")]
++		public virtual void map ();
++		[Version (since = "0.2")]
++		public void move_by (float dx, float dy);
++		[Version (since = "1.12")]
++		public bool needs_expand (Clutter.Orientation orientation);
++		public virtual void paint (Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode root);
++		public unowned GLib.List<Clutter.StageView> peek_stage_views ();
++		public void pick_box (Clutter.PickContext pick_context, Clutter.ActorBox box);
++		public void queue_redraw ();
++		[Version (since = "1.10")]
++		public void queue_redraw_with_clip (Cairo.RectangleInt? clip);
++		[Version (since = "1.4")]
++		public void remove_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void remove_action_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_all_children ();
++		[Version (since = "1.10")]
++		public void remove_all_transitions ();
++		[Version (since = "1.10")]
++		public void remove_child (Clutter.Actor child);
++		public void remove_clip ();
++		[Version (since = "1.4")]
++		public void remove_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void remove_constraint_by_name (string name);
++		[Version (since = "1.4")]
++		public void remove_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void remove_effect_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_transition (string name);
++		[Version (since = "1.10")]
++		public void replace_child (Clutter.Actor old_child, Clutter.Actor new_child);
++		[Version (since = "1.10")]
++		public void restore_easing_state ();
++		[Version (since = "1.10")]
++		public void save_easing_state ();
++		[Version (since = "1.10")]
++		public void set_allocation (Clutter.ActorBox box);
++		[Version (since = "1.10")]
++		public void set_background_color (Clutter.Color? color);
++		[Version (since = "1.10")]
++		public void set_child_above_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void set_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void set_child_below_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.12")]
++		public void set_child_transform (Graphene.Matrix? transform);
++		[Version (since = "0.6")]
++		public void set_clip (float xoff, float yoff, float width, float height);
++		[Version (since = "1.4")]
++		public void set_clip_to_allocation (bool clip_set);
++		[Version (since = "1.10")]
++		public void set_content (Clutter.Content? content);
++		[Version (since = "1.10")]
++		public void set_content_gravity (Clutter.ContentGravity gravity);
++		[Version (since = "1.12")]
++		public void set_content_repeat (Clutter.ContentRepeat repeat);
++		[Version (since = "1.10")]
++		public void set_content_scaling_filters (Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_easing_delay (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_duration (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_mode (Clutter.AnimationMode mode);
++		[Version (since = "0.8")]
++		public void set_fixed_position_set (bool is_set);
++		[Version (since = "1.0")]
++		public void set_flags (Clutter.ActorFlags flags);
++		[Version (since = "0.2")]
++		public void set_height (float height);
++		[Version (since = "1.10")]
++		public void set_layout_manager (Clutter.LayoutManager? manager);
++		[Version (since = "1.10")]
++		public void set_margin (Clutter.Margin margin);
++		[Version (since = "1.10")]
++		public void set_margin_bottom (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_left (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_right (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_top (float margin);
++		public void set_name (string name);
++		[Version (since = "1.8")]
++		public void set_offscreen_redirect (Clutter.OffscreenRedirect redirect);
++		public void set_opacity (uint8 opacity);
++		public void set_opacity_override (int opacity);
++		[Version (since = "1.12")]
++		public void set_pivot_point (float pivot_x, float pivot_y);
++		[Version (since = "1.12")]
++		public void set_pivot_point_z (float pivot_z);
++		public void set_position (float x, float y);
++		[Version (since = "0.6")]
++		public void set_reactive (bool reactive);
++		[Version (since = "1.2")]
++		public void set_request_mode (Clutter.RequestMode mode);
++		[Version (since = "1.12")]
++		public void set_rotation_angle (Clutter.RotateAxis axis, double angle);
++		[Version (since = "0.2")]
++		public void set_scale (double scale_x, double scale_y);
++		[Version (since = "1.12")]
++		public void set_scale_z (double scale_z);
++		public void set_size (float width, float height);
++		[Version (since = "1.2")]
++		public void set_text_direction (Clutter.TextDirection text_dir);
++		[Version (since = "1.12")]
++		public void set_transform (Graphene.Matrix? transform);
++		[Version (since = "1.12")]
++		public void set_translation (float translate_x, float translate_y, float translate_z);
++		[Version (since = "0.2")]
++		public void set_width (float width);
++		[Version (since = "0.6")]
++		public void set_x (float x);
++		[Version (since = "1.10")]
++		public void set_x_align (Clutter.ActorAlign x_align);
++		[Version (since = "1.12")]
++		public void set_x_expand (bool expand);
++		[Version (since = "0.6")]
++		public void set_y (float y);
++		[Version (since = "1.10")]
++		public void set_y_align (Clutter.ActorAlign y_align);
++		[Version (since = "1.12")]
++		public void set_y_expand (bool expand);
++		[Version (since = "1.12")]
++		public void set_z_position (float z_position);
++		public bool should_pick (Clutter.PickContext pick_context);
++		[Version (since = "0.6")]
++		public bool transform_stage_point (float x, float y, out float x_out, out float y_out);
++		public void uninhibit_culling ();
++		[Version (since = "1.0")]
++		public virtual void unmap ();
++		[Version (since = "1.0")]
++		public void unset_flags (Clutter.ActorFlags flags);
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Action actions { set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public Clutter.ActorBox allocation { owned get; }
++		[Version (since = "1.10")]
++		public Clutter.Color background_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.10")]
++		public bool background_color_set { get; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix child_transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool child_transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Rect clip_rect { owned get; set; }
++		[Version (since = "1.0")]
++		public bool clip_to_allocation { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Constraint constraints { set; }
++		[Version (since = "1.10")]
++		public Clutter.Content content { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorBox content_box { get; }
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity content_gravity { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat content_repeat { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Effect effect { set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor first_child { get; }
++		[Version (since = "0.8")]
++		public bool fixed_position_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_y { get; set; }
++		[NoAccessorMethod]
++		public bool has_clip { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public bool has_pointer { get; }
++		public float height { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor last_child { get; }
++		[Version (since = "1.10")]
++		public Clutter.LayoutManager layout_manager { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter magnification_filter { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool mapped { get; }
++		[Version (since = "1.10")]
++		public float margin_bottom { get; set; }
++		[Version (since = "1.10")]
++		public float margin_left { get; set; }
++		[Version (since = "1.10")]
++		public float margin_right { get; set; }
++		[Version (since = "1.10")]
++		public float margin_top { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_width_set { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter minification_filter { get; set; }
++		[Version (since = "0.2")]
++		public string name { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_width_set { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect offscreen_redirect { get; set; }
++		public uint opacity { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point pivot_point { owned get; set; }
++		[Version (since = "1.12")]
++		public float pivot_point_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point position { owned get; set; }
++		[Version (since = "0.6")]
++		public bool reactive { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool realized { get; }
++		[Version (since = "0.8")]
++		public Clutter.RequestMode request_mode { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_y { get; set; }
++		[Version (since = "1.12")]
++		public double scale_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool show_on_set_parent { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Size size { owned get; set; }
++		[Version (since = "1.0")]
++		public Clutter.TextDirection text_direction { get; set; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_z { get; set; }
++		[NoAccessorMethod]
++		public bool visible { get; set; }
++		public float width { get; set; }
++		public float x { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign x_align { get; set; }
++		[Version (since = "1.12")]
++		public bool x_expand { get; set; }
++		public float y { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign y_align { get; set; }
++		[Version (since = "1.12")]
++		public bool y_expand { get; set; }
++		[Version (since = "1.12")]
++		public float z_position { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal bool button_press_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool button_release_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool captured_event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void destroy ();
++		[Version (since = "0.6")]
++		public virtual signal bool enter_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void hide ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_in ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_out ();
++		[Version (since = "0.6")]
++		public virtual signal bool key_press_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool key_release_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool leave_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool motion_event (Clutter.MotionEvent event);
++		[Version (since = "0.2")]
++		public virtual signal void parent_set (Clutter.Actor? old_parent);
++		[HasEmitter]
++		[Version (since = "1.0")]
++		public virtual signal void pick (Clutter.PickContext pick_context);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public virtual signal void queue_relayout ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void realize ();
++		public virtual signal void resource_scale_changed ();
++		[Version (since = "0.6")]
++		public virtual signal bool scroll_event (Clutter.ScrollEvent event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void show ();
++		public signal void stage_views_changed ();
++		[Version (since = "1.12")]
++		public virtual signal bool touch_event (Clutter.Event event);
++		[Version (since = "1.12")]
++		public signal void transition_stopped (string name, bool is_finished);
++		[Version (since = "1.10")]
++		public signal void transitions_completed ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void unrealize ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_meta_get_type ()")]
++	public abstract class ActorMeta : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected ActorMeta ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public bool get_enabled ();
++		[Version (since = "1.4")]
++		public unowned string get_name ();
++		[NoWrapper]
++		public virtual void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.4")]
++		public virtual void set_enabled (bool is_enabled);
++		[Version (since = "1.4")]
++		public void set_name (string name);
++		[Version (since = "1.4")]
++		public Clutter.Actor actor { get; }
++		[Version (since = "1.4")]
++		public bool enabled { get; set; }
++		[Version (since = "1.4")]
++		public string name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_node_get_type ()")]
++	public class ActorNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ActorNode (Clutter.Actor actor, int opacity);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class AlignConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
++		public Clutter.AlignAxis get_align_axis ();
++		public float get_factor ();
++		public Graphene.Point get_pivot_point ();
++		public unowned Clutter.Actor get_source ();
++		public void set_align_axis (Clutter.AlignAxis axis);
++		public void set_factor (float factor);
++		public void set_pivot_point (Graphene.Point pivot_point);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.AlignAxis align_axis { get; set construct; }
++		public float factor { get; set construct; }
++		public Graphene.Point pivot_point { get; set; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class AnyEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_backend_get_type ()")]
++	[Version (since = "0.4")]
++	public abstract class Backend : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
++		public unowned Clutter.Seat get_default_seat ();
++		[Version (since = "0.8")]
++		public unowned Cairo.FontOptions get_font_options ();
++		public unowned Clutter.InputMethod get_input_method ();
++		public double get_resolution ();
++		[Version (since = "0.8")]
++		public void set_font_options (Cairo.FontOptions options);
++		public void set_input_method (Clutter.InputMethod method);
++		[Version (since = "1.0")]
++		public signal void font_changed ();
++		[Version (since = "1.0")]
++		public signal void resolution_changed ();
++		[Version (since = "1.4")]
++		public signal void settings_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BinLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BinLayout (Clutter.BinAlignment x_align = Clutter.BinAlignment.START, Clutter.BinAlignment y_align = Clutter.BinAlignment.START);
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment x_align { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment y_align { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class BindConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
++		public Clutter.BindCoordinate get_coordinate ();
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_coordinate (Clutter.BindCoordinate coordinate);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.BindCoordinate coordinate { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
++	[Version (since = "1.0")]
++	public class BindingPool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public BindingPool (string name);
++		public bool activate (uint key_val, Clutter.ModifierType modifiers, GLib.Object gobject);
++		public void block_action (string action_name);
++		public static unowned Clutter.BindingPool find (string name);
++		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
++		public static unowned Clutter.BindingPool get_for_class (void* klass);
++		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
++		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
++		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void remove_action (uint key_val, Clutter.ModifierType modifiers);
++		public void unblock_action (string action_name);
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blit_node_get_type ()")]
++	public class BlitNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlitNode (Cogl.Framebuffer src);
++		public void add_blit_rectangle (int src_x, int src_y, int dst_x, int dst_y, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class BlurEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BlurEffect ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_node_get_type ()")]
++	public class BlurNode : Clutter.LayerNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlurNode (uint width, uint height, float sigma);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BoxLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BoxLayout ();
++		[Version (since = "1.4")]
++		public bool get_homogeneous ();
++		[Version (since = "1.12")]
++		public Clutter.Orientation get_orientation ();
++		public bool get_pack_start ();
++		public uint get_spacing ();
++		[Version (since = "1.4")]
++		public void set_homogeneous (bool homogeneous);
++		[Version (since = "1.12")]
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_pack_start (bool pack_start);
++		public void set_spacing (uint spacing);
++		[Version (since = "1.4")]
++		public bool homogeneous { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.Orientation orientation { get; set; }
++		public bool pack_start { get; set; }
++		public uint spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_brightness_contrast_effect_get_type ()")]
++	[Version (since = "1.10")]
++	public class BrightnessContrastEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BrightnessContrastEffect ();
++		public void get_brightness (out float red, out float green, out float blue);
++		public void get_contrast (out float red, out float green, out float blue);
++		public void set_brightness (float brightness);
++		public void set_brightness_full (float red, float green, float blue);
++		public void set_contrast (float contrast);
++		public void set_contrast_full (float red, float green, float blue);
++		[NoAccessorMethod]
++		public Clutter.Color brightness { owned get; set; }
++		[NoAccessorMethod]
++		public Clutter.Color contrast { owned get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ButtonEvent : Clutter.Event {
++		public double axes;
++		public uint32 button;
++		public uint click_count;
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")]
++	[Version (since = "1.10")]
++	public class Canvas : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Canvas ();
++		public float get_scale_factor ();
++		public void set_scale_factor (float scale);
++		public bool set_size (int width, int height);
++		[NoAccessorMethod]
++		public int height { get; set; }
++		public float scale_factor { get; set; }
++		[NoAccessorMethod]
++		public int width { get; set; }
++		public virtual signal bool draw (Cairo.Context cr, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
++	[Version (since = "0.8")]
++	public abstract class ChildMeta : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected ChildMeta ();
++		public unowned Clutter.Actor get_actor ();
++		public unowned Clutter.Container get_container ();
++		public Clutter.Actor actor { get; construct; }
++		public Clutter.Container container { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_action_get_type ()")]
++	public class ClickAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.4")]
++		public ClickAction ();
++		[Version (since = "1.4")]
++		public uint get_button ();
++		[Version (since = "1.8")]
++		public void get_coords (out float press_x, out float press_y);
++		[Version (since = "1.6")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.4")]
++		public void release ();
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool held { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_threshold { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool pressed { get; }
++		[Version (since = "1.4")]
++		public virtual signal void clicked (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool long_press (Clutter.Actor actor, Clutter.LongPressState state);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clip_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ClipNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ClipNode ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")]
++	[Version (since = "1.0")]
++	public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Clone (Clutter.Actor source);
++		public unowned Clutter.Actor get_source ();
++		public void set_source (Clutter.Actor? source);
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_color_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ColorNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ColorNode (Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ColorizeEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public ColorizeEffect (Clutter.Color tint);
++		public Clutter.Color get_tint ();
++		public void set_tint (Clutter.Color tint);
++		public Clutter.Color tint { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Constraint : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Constraint ();
++		[NoWrapper]
++		public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
++		public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, ref float minimum_size, ref float natural_size);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class CrossingEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor related;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class DeformEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false)]
++		protected DeformEffect ();
++		[NoWrapper]
++		public virtual void deform_vertex (float width, float height, Cogl.TextureVertex vertex);
++		public unowned Cogl.Handle get_back_material ();
++		public void get_n_tiles (out uint x_tiles, out uint y_tiles);
++		public void invalidate ();
++		public void set_back_material (Cogl.Handle? material);
++		public void set_n_tiles (uint x_tiles, uint y_tiles);
++		[NoAccessorMethod]
++		public uint x_tiles { get; set; }
++		[NoAccessorMethod]
++		public uint y_tiles { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_desaturate_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class DesaturateEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public DesaturateEffect (double factor);
++		public double get_factor ();
++		public void set_factor (double factor);
++		public double factor { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Effect : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Effect ();
++		[NoWrapper]
++		public virtual bool modify_paint_volume (Clutter.PaintVolume volume);
++		[NoWrapper]
++		public virtual void paint (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void pick (Clutter.PickContext pick_context);
++		[NoWrapper]
++		public virtual void post_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual bool pre_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.8")]
++		public void queue_repaint ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")]
++	[Compact]
++	[Version (since = "0.2")]
++	public class Event {
++		public Clutter.EventType type;
++		[CCode (has_construct_function = false)]
++		public Event (Clutter.EventType type);
++		[Version (since = "1.18")]
++		public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
++		public Clutter.Event copy ();
++		public void free ();
++		[Version (since = "0.4")]
++		public static Clutter.Event @get ();
++		[Version (since = "1.12")]
++		public double get_angle (Clutter.Event target);
++		[Version (since = "1.6")]
++		public double get_axes (out uint n_axes);
++		[Version (since = "1.0")]
++		public uint32 get_button ();
++		[Version (since = "1.0")]
++		public uint get_click_count ();
++		[Version (since = "0.4")]
++		public void get_coords (out float x, out float y);
++		[Version (since = "1.0")]
++		public unowned Clutter.InputDevice get_device ();
++		[Version (since = "1.28")]
++		public unowned Clutter.InputDeviceTool get_device_tool ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.12")]
++		public float get_distance (Clutter.Event target);
++		public uint32 get_event_code ();
++		[Version (since = "1.10")]
++		public unowned Clutter.EventSequence get_event_sequence ();
++		[Version (since = "1.0")]
++		public Clutter.EventFlags get_flags ();
++		[Version (since = "1.24")]
++		public void get_gesture_motion_delta (out double dx, out double dy);
++		public Clutter.TouchpadGesturePhase get_gesture_phase ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_angle_delta ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_scale ();
++		[Version (since = "1.0")]
++		public uint16 get_key_code ();
++		[Version (since = "1.0")]
++		public uint get_key_symbol ();
++		public unichar get_key_unicode ();
++		public uint get_mode_group ();
++		public bool get_pad_event_details (out uint number, out uint mode, out double value);
++		[Version (since = "1.12")]
++		public Graphene.Point get_position ();
++		[Version (since = "1.0")]
++		public unowned Clutter.Actor get_related ();
++		public bool get_relative_motion (double dx, double dy, double dx_unaccel, double dy_unaccel);
++		[Version (since = "1.10")]
++		public void get_scroll_delta (out double dx, out double dy);
++		[Version (since = "1.0")]
++		public Clutter.ScrollDirection get_scroll_direction ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollFinishFlags get_scroll_finish_flags ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollSource get_scroll_source ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_source ();
++		[Version (since = "1.6")]
++		public unowned Clutter.InputDevice get_source_device ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "0.4")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.16")]
++		public void get_state_full (out Clutter.ModifierType button_state, out Clutter.ModifierType base_state, out Clutter.ModifierType latched_state, out Clutter.ModifierType locked_state, out Clutter.ModifierType effective_state);
++		[Version (since = "0.4")]
++		public uint32 get_time ();
++		public int64 get_time_us ();
++		[Version (since = "1.24")]
++		public uint get_touchpad_gesture_finger_count ();
++		[CCode (cname = "clutter_event_type")]
++		public Clutter.EventType get_type ();
++		[Version (since = "1.12")]
++		public bool has_control_modifier ();
++		[Version (since = "1.12")]
++		public bool has_shift_modifier ();
++		[Version (since = "1.12")]
++		public bool is_pointer_emulated ();
++		[Version (since = "0.6")]
++		public void put ();
++		[Version (since = "1.18")]
++		public static void remove_filter (uint id);
++		[Version (since = "1.8")]
++		public void set_button (uint32 button);
++		[Version (since = "1.8")]
++		public void set_coords (float x, float y);
++		[Version (since = "1.6")]
++		public void set_device (Clutter.InputDevice? device);
++		[Version (since = "1.28")]
++		public void set_device_tool (Clutter.InputDeviceTool? tool);
++		[Version (since = "1.8")]
++		public void set_flags (Clutter.EventFlags flags);
++		[Version (since = "1.8")]
++		public void set_key_code (uint16 key_code);
++		[Version (since = "1.8")]
++		public void set_key_symbol (uint key_sym);
++		[Version (since = "1.8")]
++		public void set_key_unicode (unichar key_unicode);
++		[Version (since = "1.8")]
++		public void set_related (Clutter.Actor? actor);
++		[Version (since = "1.10")]
++		public void set_scroll_delta (double dx, double dy);
++		[Version (since = "1.8")]
++		public void set_scroll_direction (Clutter.ScrollDirection direction);
++		[Version (since = "1.8")]
++		public void set_source (Clutter.Actor? actor);
++		[Version (since = "1.8")]
++		public void set_source_device (Clutter.InputDevice? device);
++		[Version (since = "1.8")]
++		public void set_stage (Clutter.Stage? stage);
++		[Version (since = "1.8")]
++		public void set_state (Clutter.ModifierType state);
++		[Version (since = "1.8")]
++		public void set_time (uint32 time_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_sequence_get_type ()")]
++	[Compact]
++	[Version (since = "1.12")]
++	public class EventSequence {
++		public int32 get_slot ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fixed_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FixedLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FixedLayout ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FlowLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FlowLayout (Clutter.FlowOrientation orientation);
++		public float get_column_spacing ();
++		public void get_column_width (out float min_width, out float max_width);
++		public bool get_homogeneous ();
++		public Clutter.FlowOrientation get_orientation ();
++		public void get_row_height (out float min_height, out float max_height);
++		public float get_row_spacing ();
++		[Version (since = "1.16")]
++		public bool get_snap_to_grid ();
++		public void set_column_spacing (float spacing);
++		public void set_column_width (float min_width, float max_width);
++		public void set_homogeneous (bool homogeneous);
++		public void set_orientation (Clutter.FlowOrientation orientation);
++		public void set_row_height (float min_height, float max_height);
++		public void set_row_spacing (float spacing);
++		[Version (since = "1.16")]
++		public void set_snap_to_grid (bool snap_to_grid);
++		public float column_spacing { get; set; }
++		public bool homogeneous { get; set; }
++		[NoAccessorMethod]
++		public float max_column_width { get; set; }
++		[NoAccessorMethod]
++		public float max_row_height { get; set; }
++		[NoAccessorMethod]
++		public float min_column_width { get; set; }
++		[NoAccessorMethod]
++		public float min_row_height { get; set; }
++		public Clutter.FlowOrientation orientation { get; set construct; }
++		public float row_spacing { get; set; }
++		[Version (since = "1.16")]
++		public bool snap_to_grid { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++		public bool has_result ();
++		public void set_result (Clutter.FrameResult result);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
++	public class FrameClock : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameClock ();
++		public void add_timeline (Clutter.Timeline timeline);
++		public float get_refresh_rate ();
++		public void inhibit ();
++		public void notify_ready ();
++		public void remove_timeline (Clutter.Timeline timeline);
++		public void schedule_update ();
++		public void schedule_update_now ();
++		public void uninhibit ();
++		[HasEmitter]
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_gesture_action_get_type ()")]
++	public class GestureAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.8")]
++		public GestureAction ();
++		[Version (since = "1.12")]
++		public void cancel ();
++		[NoWrapper]
++		public virtual bool gesture_prepare (Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public unowned Clutter.InputDevice get_device (uint point);
++		[Version (since = "1.14")]
++		public unowned Clutter.Event get_last_event (uint point);
++		[Version (since = "1.8")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.12")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		[Version (since = "1.12")]
++		public uint get_n_current_points ();
++		[Version (since = "1.12")]
++		public int get_n_touch_points ();
++		[Version (since = "1.8")]
++		public void get_press_coords (uint point, out float press_x, out float press_y);
++		[Version (since = "1.8")]
++		public void get_release_coords (uint point, out float release_x, out float release_y);
++		[Version (since = "1.12")]
++		public unowned Clutter.EventSequence get_sequence (uint point);
++		[Version (since = "1.18")]
++		public void get_threshold_trigger_distance (out float x, out float y);
++		[Version (since = "1.20")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_edge ();
++		[Version (deprecated = true, deprecated_since = "1.20", since = "1.18")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_egde ();
++		[Version (since = "1.12")]
++		public float get_velocity (uint point, out float velocity_x, out float velocity_y);
++		[Version (since = "1.12")]
++		public void set_n_touch_points (int nb_points);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_distance (float x, float y);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_edge (Clutter.GestureTriggerEdge edge);
++		[Version (since = "1.16")]
++		public int n_touch_points { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_x { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_y { get; construct; }
++		[Version (since = "1.18")]
++		public Clutter.GestureTriggerEdge threshold_trigger_edge { get; construct; }
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_begin (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_cancel (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_end (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_progress (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")]
++	[Version (since = "1.12")]
++	public class GridLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public GridLayout ();
++		public void attach (Clutter.Actor child, int left, int top, int width, int height);
++		public void attach_next_to (Clutter.Actor child, Clutter.Actor? sibling, Clutter.GridPosition side, int width, int height);
++		public unowned Clutter.Actor get_child_at (int left, int top);
++		public bool get_column_homogeneous ();
++		public uint get_column_spacing ();
++		public Clutter.Orientation get_orientation ();
++		public bool get_row_homogeneous ();
++		public uint get_row_spacing ();
++		public void insert_column (int position);
++		public void insert_next_to (Clutter.Actor sibling, Clutter.GridPosition side);
++		public void insert_row (int position);
++		public void set_column_homogeneous (bool homogeneous);
++		public void set_column_spacing (uint spacing);
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_row_homogeneous (bool homogeneous);
++		public void set_row_spacing (uint spacing);
++		public bool column_homogeneous { get; set; }
++		public uint column_spacing { get; set; }
++		public Clutter.Orientation orientation { get; set; }
++		public bool row_homogeneous { get; set; }
++		public uint row_spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
++	[Version (since = "1.10")]
++	public class Image : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Image ();
++		public unowned Cogl.Texture get_texture ();
++		public bool set_area ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, Cairo.RectangleInt rect, uint row_stride) throws GLib.Error;
++		[Version (since = "1.12")]
++		public bool set_bytes (GLib.Bytes data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++		public bool set_data ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")]
++	public class InputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDevice ();
++		public Clutter.InputAxis get_axis (uint index_);
++		public bool get_axis_value (double axes, Clutter.InputAxis axis, double value);
++		[Version (since = "1.6")]
++		public Clutter.InputMode get_device_mode ();
++		[Version (since = "1.2")]
++		public unowned string get_device_name ();
++		public unowned string get_device_node ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_grabbed_actor ();
++		public virtual int get_group_n_modes (int group);
++		[Version (since = "1.6")]
++		public bool get_has_cursor ();
++		public int get_mode_switch_button_group (uint button);
++		public uint get_n_axes ();
++		public int get_n_buttons ();
++		public int get_n_mode_groups ();
++		public int get_n_rings ();
++		public int get_n_strips ();
++		public virtual int get_pad_feature_group (Clutter.InputDevicePadFeature feature, int n_feature);
++		[Version (since = "1.22")]
++		public unowned string get_product_id ();
++		public unowned Clutter.Seat get_seat ();
++		[Version (since = "1.22")]
++		public unowned string get_vendor_id ();
++		[Version (since = "1.10")]
++		public void grab (Clutter.Actor actor);
++		public virtual bool is_grouped (Clutter.InputDevice other_device);
++		public virtual bool is_mode_switch_button (uint group, uint button);
++		[Version (since = "1.12")]
++		public unowned Clutter.Actor sequence_get_grabbed_actor (Clutter.EventSequence sequence);
++		[Version (since = "1.12")]
++		public void sequence_grab (Clutter.EventSequence sequence, Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public void sequence_ungrab (Clutter.EventSequence sequence);
++		[Version (since = "1.10")]
++		public void ungrab ();
++		[NoAccessorMethod]
++		[Version (since = "1.6")]
++		public Clutter.Backend backend { owned get; construct; }
++		public Clutter.InputMode device_mode { get; construct; }
++		public string device_node { get; construct; }
++		[Version (since = "1.2")]
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[Version (since = "1.6")]
++		public bool has_cursor { get; construct; }
++		public int n_buttons { get; construct; }
++		public int n_mode_groups { get; construct; }
++		public int n_rings { get; construct; }
++		public int n_strips { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public string name { owned get; construct; }
++		[Version (since = "1.22")]
++		public string product_id { get; construct; }
++		public Clutter.Seat seat { get; construct; }
++		[Version (since = "1.22")]
++		public string vendor_id { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_tool_get_type ()")]
++	public abstract class InputDeviceTool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDeviceTool ();
++		public Clutter.InputAxisFlags get_axes ();
++		public uint64 get_id ();
++		[Version (since = "1.28")]
++		public uint64 get_serial ();
++		[Version (since = "1.28")]
++		public Clutter.InputDeviceToolType get_tool_type ();
++		public Clutter.InputAxisFlags axes { get; construct; }
++		public uint64 id { get; construct; }
++		public uint64 serial { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.InputDeviceToolType type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_focus_get_type ()")]
++	public abstract class InputFocus : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputFocus ();
++		[NoWrapper]
++		public virtual void commit_text (string text);
++		[NoWrapper]
++		public virtual void delete_surrounding (int offset, uint len);
++		public bool filter_event (Clutter.Event event);
++		[NoWrapper]
++		public virtual void focus_in (Clutter.InputMethod input_method);
++		[NoWrapper]
++		public virtual void focus_out ();
++		public bool is_focused ();
++		[NoWrapper]
++		public virtual void request_surrounding ();
++		public void reset ();
++		public void set_can_show_preedit (bool can_show_preedit);
++		public void set_content_hints (Clutter.InputContentHintFlags hint);
++		public void set_content_purpose (Clutter.InputContentPurpose purpose);
++		public void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		[NoWrapper]
++		public virtual void set_preedit_text (string preedit, uint cursor);
++		public void set_surrounding (string text, uint cursor, uint anchor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_method_get_type ()")]
++	public abstract class InputMethod : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputMethod ();
++		[NoWrapper]
++		public virtual bool filter_key_event (Clutter.Event key);
++		public virtual void focus_in (Clutter.InputFocus actor);
++		public virtual void focus_out ();
++		public void forward_key (uint32 keyval, uint32 keycode, uint32 state, uint64 time_, bool press);
++		public void notify_key_event (Clutter.Event event, bool filtered);
++		[NoWrapper]
++		public virtual void reset ();
++		[NoWrapper]
++		public virtual void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		public void set_preedit_text (string? preedit, uint cursor);
++		[NoWrapper]
++		public virtual void set_surrounding (string text, uint cursor, uint anchor);
++		[NoWrapper]
++		public virtual void update_content_hints (Clutter.InputContentHintFlags hint);
++		[NoWrapper]
++		public virtual void update_content_purpose (Clutter.InputContentPurpose purpose);
++		[NoAccessorMethod]
++		public bool can_show_preedit { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentHintFlags content_hints { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentPurpose content_purpose { get; set; }
++		[HasEmitter]
++		public signal void commit (string text);
++		public signal void cursor_location_changed (Graphene.Rect object);
++		[HasEmitter]
++		public signal void delete_surrounding (int offset, uint len);
++		public signal void input_panel_state (Clutter.InputPanelState object);
++		[HasEmitter]
++		public signal void request_surrounding ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")]
++	[Version (since = "1.0")]
++	public class Interval : GLib.InitiallyUnowned, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		public Interval (GLib.Type gtype, ...);
++		public Clutter.Interval clone ();
++		[Version (since = "1.4")]
++		public unowned GLib.Value? compute (double factor);
++		public virtual bool compute_value (double factor, out GLib.Value value);
++		public GLib.Value get_final_value ();
++		public GLib.Value get_initial_value ();
++		public void get_interval (...);
++		public GLib.Type get_value_type ();
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public unowned GLib.Value? peek_final_value ();
++		public unowned GLib.Value? peek_initial_value ();
++		public static void register_progress_func (GLib.Type value_type, Clutter.ProgressFunc func);
++		[Version (since = "1.10")]
++		public void set_final (...);
++		public void set_final_value (GLib.Value value);
++		[Version (since = "1.10")]
++		public void set_initial (...);
++		public void set_initial_value (GLib.Value value);
++		public void set_interval (...);
++		public virtual bool validate (GLib.ParamSpec pspec);
++		[CCode (has_construct_function = false)]
++		public Interval.with_values (GLib.Type gtype, GLib.Value? initial, GLib.Value? final);
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value final { owned get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value initial { owned get; set; }
++		public GLib.Type value_type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class KeyEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public uint16 hardware_keycode;
++		public uint keyval;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public unichar unicode_value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keyframe_transition_get_type ()")]
++	[Version (since = "1.12")]
++	public class KeyframeTransition : Clutter.PropertyTransition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public KeyframeTransition (string property_name);
++		public void clear ();
++		public void get_key_frame (uint index_, out double key, out Clutter.AnimationMode mode, out GLib.Value value);
++		public uint get_n_key_frames ();
++		public void set_key_frame (uint index_, double key, Clutter.AnimationMode mode, GLib.Value value);
++		public void set_key_frames ([CCode (array_length_cname = "n_key_frames", array_length_pos = 0.5, array_length_type = "guint")] double[] key_frames);
++		public void set_modes ([CCode (array_length_cname = "n_modes", array_length_pos = 0.5, array_length_type = "guint")] Clutter.AnimationMode[] modes);
++		public void set_values ([CCode (array_length_cname = "n_values", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keymap_get_type ()")]
++	public abstract class Keymap : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Keymap ();
++		public virtual bool get_caps_lock_state ();
++		public virtual Pango.Direction get_direction ();
++		public virtual bool get_num_lock_state ();
++		public signal void state_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layer_node_get_type ()")]
++	public class LayerNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode (Graphene.Matrix projection, Cairo.Rectangle viewport, float width, float height, uint8 opacity);
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode.to_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_manager_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutManager : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected LayoutManager ();
++		public virtual void allocate (Clutter.Container container, Clutter.ActorBox allocation);
++		public void child_get (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_get_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		public void child_set (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_set_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		[NoWrapper]
++		public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Container container, Clutter.Actor actor);
++		public unowned GLib.ParamSpec find_child_property (string name);
++		[Version (since = "1.0")]
++		public unowned Clutter.LayoutMeta get_child_meta (Clutter.Container container, Clutter.Actor actor);
++		[NoWrapper]
++		public virtual GLib.Type get_child_meta_type ();
++		public virtual void get_preferred_height (Clutter.Container container, float for_width, out float min_height_p, out float nat_height_p);
++		public virtual void get_preferred_width (Clutter.Container container, float for_height, out float min_width_p, out float nat_width_p);
++		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
++		public GLib.ParamSpec[] list_child_properties ();
++		public virtual void set_container (Clutter.Container? container);
++		[HasEmitter]
++		public virtual signal void layout_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutMeta : Clutter.ChildMeta {
++		[CCode (has_construct_function = false)]
++		protected LayoutMeta ();
++		public unowned Clutter.LayoutManager get_manager ();
++		public Clutter.LayoutManager manager { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class MotionEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public double dx;
++		public double dx_unaccel;
++		public double dy;
++		public double dy_unaccel;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public int64 time_us;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_offscreen_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class OffscreenEffect : Clutter.Effect {
++		[CCode (has_construct_function = false)]
++		protected OffscreenEffect ();
++		public virtual Cogl.Handle create_texture (float width, float height);
++		public unowned Cogl.Pipeline? get_pipeline ();
++		[Version (since = "1.8")]
++		public bool get_target_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Cogl.Handle get_texture ();
++		public virtual void paint_target (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class PageTurnEffect : Clutter.DeformEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public PageTurnEffect (double period, double angle, float radius);
++		public double get_angle ();
++		public double get_period ();
++		public float get_radius ();
++		public void set_angle (double angle);
++		public void set_period (double period);
++		public void set_radius (float radius);
++		public double angle { get; set; }
++		public double period { get; set; }
++		public float radius { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_paint_context_ref", type_id = "clutter_paint_context_get_type ()", unref_function = "clutter_paint_context_unref")]
++	[Compact]
++	public class PaintContext {
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public unowned Cairo.Region get_redraw_clip ();
++		public void pop_framebuffer ();
++		public void push_framebuffer (Cogl.Framebuffer framebuffer);
++		public unowned Clutter.PaintContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_paint_node_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class PaintNode {
++		[CCode (has_construct_function = false)]
++		protected PaintNode ();
++		public void add_child (Clutter.PaintNode child);
++		public void add_multitexture_rectangle (Clutter.ActorBox rect, float text_coords, uint text_coords_len);
++		public void add_rectangle (Clutter.ActorBox rect);
++		public void add_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public void add_texture_rectangle (Clutter.ActorBox rect, float x_1, float y_1, float x_2, float y_2);
++		public void add_texture_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void paint (Clutter.PaintContext paint_context);
++		public unowned Clutter.PaintNode @ref ();
++		public void set_name (string name);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class PanAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public PanAction ();
++		public double get_acceleration_factor ();
++		[Version (since = "1.24")]
++		public float get_constrained_motion_delta (uint point, out float delta_x, out float delta_y);
++		public double get_deceleration ();
++		public bool get_interpolate ();
++		public void get_interpolated_coords (out float interpolated_x, out float interpolated_y);
++		public float get_interpolated_delta (out float delta_x, out float delta_y);
++		[Version (since = "1.14")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.14")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		public Clutter.PanAxis get_pan_axis ();
++		public void set_acceleration_factor (double factor);
++		public void set_deceleration (double rate);
++		public void set_interpolate (bool should_interpolate);
++		public void set_pan_axis (Clutter.PanAxis axis);
++		public double acceleration_factor { get; set; }
++		public double deceleration { get; set; }
++		public bool interpolate { get; set; }
++		public Clutter.PanAxis pan_axis { get; set; }
++		public virtual signal bool pan (Clutter.Actor actor, bool is_interpolated);
++		public virtual signal void pan_stopped (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", lower_case_csuffix = "param_units", type_id = "clutter_param_units_get_type ()")]
++	public class ParamSpecUnit : GLib.ParamSpec {
++		[CCode (has_construct_function = false)]
++		protected ParamSpecUnit ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")]
++	[Version (since = "1.0")]
++	public class Path : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		public Path ();
++		public void add_cairo_path (Cairo.Path cpath);
++		public void add_close ();
++		public void add_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_line_to (int x, int y);
++		public void add_move_to (int x, int y);
++		public void add_node (Clutter.PathNode node);
++		public void add_rel_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_rel_line_to (int x, int y);
++		public void add_rel_move_to (int x, int y);
++		public bool add_string (string str);
++		public void clear ();
++		public void @foreach (Clutter.PathCallback callback);
++		public string get_description ();
++		public uint get_length ();
++		public uint get_n_nodes ();
++		public Clutter.PathNode get_node (uint index_);
++		public GLib.SList<weak Clutter.PathNode?> get_nodes ();
++		public uint get_position (double progress, out Clutter.Knot position);
++		public void insert_node (int index_, Clutter.PathNode node);
++		public void remove_node (uint index_);
++		public void replace_node (uint index_, Clutter.PathNode node);
++		public bool set_description (string str);
++		public void to_cairo_path (Cairo.Context cr);
++		[CCode (has_construct_function = false)]
++		public Path.with_description (string desc);
++		public string description { owned get; set; }
++		public uint length { get; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class PathConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public PathConstraint (Clutter.Path? path, float offset);
++		public float get_offset ();
++		public unowned Clutter.Path get_path ();
++		public void set_offset (float offset);
++		public void set_path (Clutter.Path? path);
++		public float offset { get; set; }
++		public Clutter.Path path { get; set; }
++		public signal void node_reached (Clutter.Actor actor, uint index);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_pick_context_ref", type_id = "clutter_pick_context_get_type ()", unref_function = "clutter_pick_context_unref")]
++	[Compact]
++	public class PickContext {
++		public void destroy ();
++		public Graphene.Matrix get_transform ();
++		public void log_pick (Clutter.ActorBox box, Clutter.Actor actor);
++		public void pop_clip ();
++		public void pop_transform ();
++		public void push_clip (Clutter.ActorBox box);
++		public void push_transform (Graphene.Matrix transform);
++		public unowned Clutter.PickContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pipeline_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class PipelineNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public PipelineNode (Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public class PropertyTransition : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition (string? property_name);
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition.for_actor (Clutter.Actor actor, string? property_name);
++		public unowned string get_property_name ();
++		public void set_property_name (string? property_name);
++		public string property_name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
++	public class RootNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public RootNode (Cogl.Framebuffer framebuffer, Clutter.Color clear_color, Cogl.BufferBit clear_flags);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rotate_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class RotateAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public RotateAction ();
++		public virtual signal bool rotate (Clutter.Actor actor, double angle);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")]
++	[Version (since = "0.6")]
++	public class Script : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Script ();
++		[Version (since = "0.8")]
++		public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize")] string[] paths);
++		public void connect_signals (void* user_data);
++		public void connect_signals_full (Clutter.ScriptConnectFunc func);
++		public void ensure_objects ();
++		public unowned GLib.Object get_object (string name);
++		public int get_objects (...);
++		[Version (since = "1.10")]
++		public unowned string get_translation_domain ();
++		public virtual GLib.Type get_type_from_name (string type_name);
++		[Version (since = "0.8")]
++		public GLib.List<weak GLib.Object> list_objects ();
++		public uint load_from_data (string data, ssize_t length) throws GLib.Error;
++		public uint load_from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public uint load_from_resource (string resource_path) throws GLib.Error;
++		[Version (since = "0.8")]
++		public string lookup_filename (string filename);
++		[Version (since = "1.10")]
++		public void set_translation_domain (string? domain);
++		public void unmerge_objects (uint merge_id);
++		[NoAccessorMethod]
++		public string filename { owned get; }
++		[NoAccessorMethod]
++		public bool filename_set { get; }
++		[Version (since = "1.10")]
++		public string translation_domain { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scroll_actor_get_type ()")]
++	[Version (since = "1.12")]
++	public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public ScrollActor ();
++		public Clutter.ScrollMode get_scroll_mode ();
++		public void scroll_to_point (Graphene.Point point);
++		public void scroll_to_rect (Graphene.Rect rect);
++		public void set_scroll_mode (Clutter.ScrollMode mode);
++		public Clutter.ScrollMode scroll_mode { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ScrollEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.ScrollDirection direction;
++		public Clutter.ScrollFinishFlags finish_flags;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public Clutter.ScrollSource scroll_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_seat_get_type ()")]
++	public abstract class Seat : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Seat ();
++		public virtual void bell_notify ();
++		public virtual Clutter.VirtualInputDevice create_virtual_device (Clutter.InputDeviceType device_type);
++		public void ensure_a11y_state ();
++		public virtual unowned Clutter.InputDevice get_keyboard ();
++		public virtual unowned Clutter.Keymap get_keymap ();
++		public virtual unowned Clutter.InputDevice get_pointer ();
++		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public bool get_touch_mode ();
++		public virtual bool handle_event_post (Clutter.Event event);
++		public void inhibit_unfocus ();
++		public bool is_unfocus_inhibited ();
++		public GLib.List<weak Clutter.InputDevice> list_devices ();
++		public virtual bool query_state (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point coords, Clutter.ModifierType modifiers);
++		public void set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType click_type);
++		public void set_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public void uninhibit_unfocus ();
++		public virtual void warp_pointer (int x, int y);
++		[NoAccessorMethod]
++		public Clutter.Backend backend { owned get; construct; }
++		public bool touch_mode { get; }
++		public signal void device_added (Clutter.InputDevice object);
++		public signal void device_removed (Clutter.InputDevice object);
++		public signal void is_unfocus_inhibited_changed ();
++		public signal void kbd_a11y_flags_changed (uint settings_flags, uint changed_mask);
++		public signal void kbd_a11y_mods_state_changed (uint latched_mask, uint locked_mask);
++		public signal void ptr_a11y_dwell_click_type_changed (Clutter.PointerA11yDwellClickType click_type);
++		public signal void ptr_a11y_timeout_started (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, uint delay);
++		public signal void ptr_a11y_timeout_stopped (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, bool clicked);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
++	[Version (since = "1.4")]
++	public class Settings : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Settings ();
++		public static unowned Clutter.Settings get_default ();
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "1.4")]
++		public Clutter.Backend backend { construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int dnd_drag_threshold { get; set; }
++		[NoAccessorMethod]
++		public int double_click_distance { get; set; }
++		[NoAccessorMethod]
++		public int double_click_time { get; set; }
++		[NoAccessorMethod]
++		public int font_antialias { get; set; }
++		[NoAccessorMethod]
++		public int font_dpi { get; set; }
++		[NoAccessorMethod]
++		public string font_hint_style { owned get; set; }
++		[NoAccessorMethod]
++		public int font_hinting { get; set; }
++		[NoAccessorMethod]
++		public string font_name { owned get; set; }
++		[NoAccessorMethod]
++		public string font_subpixel_order { owned get; set; }
++		[NoAccessorMethod]
++		public uint fontconfig_timestamp { set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		public uint password_hint_time { get; set; }
++		[NoAccessorMethod]
++		public int unscaled_font_dpi { set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Shader {
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ShaderEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		[Version (since = "1.8")]
++		public ShaderEffect (Clutter.ShaderType shader_type);
++		public unowned Cogl.Handle get_program ();
++		public unowned Cogl.Handle get_shader ();
++		[NoWrapper]
++		public virtual string get_static_shader_source ();
++		public bool set_shader_source (string source);
++		public void set_uniform_value (string name, GLib.Value value);
++		[NoAccessorMethod]
++		public Clutter.ShaderType shader_type { construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_float_get_type ()")]
++	public class ShaderFloat {
++		[CCode (has_construct_function = false)]
++		protected ShaderFloat ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_int_get_type ()")]
++	public class ShaderInt {
++		[CCode (has_construct_function = false)]
++		protected ShaderInt ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_matrix_get_type ()")]
++	public class ShaderMatrix {
++		[CCode (has_construct_function = false)]
++		protected ShaderMatrix ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class SnapConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
++		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_edges (Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		[NoAccessorMethod]
++		public Clutter.SnapEdge from_edge { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.SnapEdge to_edge { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")]
++	[Version (since = "0.2")]
++	public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public void capture_into (Cairo.RectangleInt rect, uint8 data);
++		public void clear_stage_views ();
++		[CCode (cname = "clutter_stage_event")]
++		public bool emit_event (Clutter.Event event);
++		[Version (since = "1.0")]
++		public void ensure_viewport ();
++		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int out_width, out int out_height, out float out_scale);
++		public unowned Clutter.Actor get_device_actor (Clutter.InputDevice device, Clutter.EventSequence? sequence);
++		public int64 get_frame_counter ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_key_focus ();
++		[Version (since = "1.2")]
++		public void get_minimum_size (out uint width, out uint height);
++		[Version (since = "1.8")]
++		public bool get_motion_events_enabled ();
++		public Clutter.Perspective get_perspective ();
++		[Version (since = "1.0")]
++		public bool get_throttle_motion_events ();
++		[Version (since = "0.4")]
++		public unowned string get_title ();
++		public bool get_use_alpha ();
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
++		[CCode (array_length = false)]
++		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
++		public void repick_device (Clutter.InputDevice device);
++		public void schedule_update ();
++		[Version (since = "0.6")]
++		public void set_key_focus (Clutter.Actor? actor);
++		[Version (since = "1.2")]
++		public void set_minimum_size (uint width, uint height);
++		[Version (since = "1.8")]
++		public void set_motion_events_enabled (bool enabled);
++		[Version (since = "1.0")]
++		public void set_throttle_motion_events (bool throttle);
++		[Version (since = "0.4")]
++		public void set_title (string title);
++		public void set_use_alpha (bool use_alpha);
++		public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point point, uint32 time, Clutter.Actor new_actor, bool emit_crossing);
++		[Version (since = "1.2")]
++		public Clutter.Actor key_focus { get; set; }
++		[Version (since = "0.8")]
++		public Clutter.Perspective perspective { get; }
++		[Version (since = "0.4")]
++		public string title { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal void activate ();
++		[Version (since = "1.20")]
++		public signal void after_paint (Clutter.StageView view);
++		public signal void after_update (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
++		public signal void before_update (Clutter.StageView view);
++		[Version (since = "0.6")]
++		public virtual signal void deactivate ();
++		public virtual signal void paint_view (Clutter.StageView view, Cairo.Region redraw_clip);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")]
++	[Version (since = "1.0")]
++	public class StageManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageManager ();
++		[Version (since = "0.8")]
++		public static unowned Clutter.StageManager get_default ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_default_stage ();
++		[Version (since = "0.8")]
++		public GLib.SList<weak Clutter.Stage> list_stages ();
++		public unowned GLib.SList<Clutter.Stage> peek_stages ();
++		[Version (since = "0.8")]
++		public Clutter.Stage default_stage { get; }
++		[Version (since = "0.8")]
++		public virtual signal void stage_added (Clutter.Stage stage);
++		[Version (since = "0.8")]
++		public virtual signal void stage_removed (Clutter.Stage stage);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_view_get_type ()")]
++	public class StageView : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageView ();
++		public void assign_next_scanout (Cogl.Scanout scanout);
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void get_layout (Cairo.RectangleInt rect);
++		public virtual void get_offscreen_transformation_matrix (Graphene.Matrix matrix);
++		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
++		public float get_scale ();
++		public void invalidate_offscreen_blit_pipeline ();
++		[NoWrapper]
++		public virtual void setup_offscreen_blit_pipeline (Cogl.Pipeline pipeline);
++		[NoWrapper]
++		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
++		[NoAccessorMethod]
++		public Cogl.Framebuffer framebuffer { owned get; set construct; }
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++		[NoAccessorMethod]
++		public Cogl.Offscreen offscreen { owned get; construct; }
++		[NoAccessorMethod]
++		public float refresh_rate { get; set construct; }
++		[NoAccessorMethod]
++		public float scale { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.Stage stage { owned get; construct; }
++		[NoAccessorMethod]
++		public bool use_shadowfb { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_swipe_action_get_type ()")]
++	[Version (since = "1.8")]
++	public class SwipeAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public SwipeAction ();
++		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
++		public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction);
++		[Version (since = "1.14")]
++		public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_tap_action_get_type ()")]
++	[Version (since = "1.14")]
++	public class TapAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public TapAction ();
++		public virtual signal void tap (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")]
++	[Version (since = "1.0")]
++	public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text ();
++		[Version (since = "1.10")]
++		public int coords_to_position (float x, float y);
++		public void delete_chars (uint n_chars);
++		public bool delete_selection ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.full (string font_name, string text, Clutter.Color color);
++		public bool get_activatable ();
++		public unowned Pango.AttrList get_attributes ();
++		[Version (since = "1.10")]
++		public unowned Clutter.TextBuffer get_buffer ();
++		public string get_chars (ssize_t start_pos, ssize_t end_pos);
++		public Clutter.Color get_color ();
++		public Clutter.Color get_cursor_color ();
++		public int get_cursor_position ();
++		[Version (since = "1.16")]
++		public Graphene.Rect get_cursor_rect ();
++		public uint get_cursor_size ();
++		public bool get_cursor_visible ();
++		public bool get_editable ();
++		public Pango.EllipsizeMode get_ellipsize ();
++		[Version (since = "1.2")]
++		public Pango.FontDescription get_font_description ();
++		public unowned string get_font_name ();
++		public Clutter.InputContentHintFlags get_input_hints ();
++		public Clutter.InputContentPurpose get_input_purpose ();
++		[Version (since = "0.6")]
++		public bool get_justify ();
++		public unowned Pango.Layout get_layout ();
++		[Version (since = "1.8")]
++		public void get_layout_offsets (out int x, out int y);
++		public Pango.Alignment get_line_alignment ();
++		public bool get_line_wrap ();
++		public Pango.WrapMode get_line_wrap_mode ();
++		public int get_max_length ();
++		public unichar get_password_char ();
++		public bool get_selectable ();
++		[Version (since = "1.8")]
++		public Clutter.Color get_selected_text_color ();
++		public string get_selection ();
++		public int get_selection_bound ();
++		public Clutter.Color get_selection_color ();
++		public bool get_single_line_mode ();
++		public unowned string get_text ();
++		public bool get_use_markup ();
++		public bool has_preedit ();
++		public void insert_text (string text, ssize_t position);
++		public void insert_unichar (unichar wc);
++		public bool position_to_coords (int position, out float x, out float y, out float line_height = null);
++		public void set_activatable (bool activatable);
++		public void set_attributes (Pango.AttrList? attrs);
++		[Version (since = "1.10")]
++		public void set_buffer (Clutter.TextBuffer buffer);
++		public void set_color (Clutter.Color color);
++		public void set_cursor_color (Clutter.Color? color);
++		public void set_cursor_position (int position);
++		public void set_cursor_size (int size);
++		public void set_cursor_visible (bool cursor_visible);
++		public void set_editable (bool editable);
++		public void set_ellipsize (Pango.EllipsizeMode mode);
++		[Version (since = "1.2")]
++		public void set_font_description (Pango.FontDescription font_desc);
++		public void set_font_name (string? font_name);
++		public void set_input_hints (Clutter.InputContentHintFlags hints);
++		public void set_input_purpose (Clutter.InputContentPurpose purpose);
++		public void set_justify (bool justify);
++		public void set_line_alignment (Pango.Alignment alignment);
++		public void set_line_wrap (bool line_wrap);
++		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
++		public void set_markup (string? markup);
++		public void set_max_length (int max);
++		public void set_password_char (unichar wc);
++		[Version (since = "1.2")]
++		public void set_preedit_string (string? preedit_str, Pango.AttrList? preedit_attrs, uint cursor_pos);
++		public void set_selectable (bool selectable);
++		[Version (since = "1.8")]
++		public void set_selected_text_color (Clutter.Color? color);
++		public void set_selection (ssize_t start_pos, ssize_t end_pos);
++		public void set_selection_bound (int selection_bound);
++		public void set_selection_color (Clutter.Color? color);
++		public void set_single_line_mode (bool single_line);
++		public void set_text (string? text);
++		public void set_use_markup (bool setting);
++		[CCode (cname = "clutter_text_activate")]
++		public bool try_activate ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		[Version (since = "1.10")]
++		public Text.with_buffer (Clutter.TextBuffer buffer);
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.with_text (string? font_name, string text);
++		public bool activatable { get; set; }
++		public Pango.AttrList attributes { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.TextBuffer buffer { get; set; }
++		public Clutter.Color color { get; set; }
++		public Clutter.Color cursor_color { get; set; }
++		[NoAccessorMethod]
++		public bool cursor_color_set { get; }
++		[Version (since = "1.12")]
++		public int cursor_position { get; set; }
++		public int cursor_size { get; set; }
++		public bool cursor_visible { get; set; }
++		public bool editable { get; set; }
++		public Pango.EllipsizeMode ellipsize { get; set; }
++		[Version (since = "1.2")]
++		public Pango.FontDescription font_description { owned get; set; }
++		public string font_name { get; set; }
++		public Clutter.InputContentHintFlags input_hints { get; set; }
++		public Clutter.InputContentPurpose input_purpose { get; set; }
++		public bool justify { get; set; }
++		public Pango.Alignment line_alignment { get; set; }
++		public bool line_wrap { get; set; }
++		public Pango.WrapMode line_wrap_mode { get; set; }
++		public int max_length { get; set; }
++		public uint password_char { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.0")]
++		public int position { get; set; }
++		public bool selectable { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.Color selected_text_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public bool selected_text_color_set { get; }
++		public int selection_bound { get; set; }
++		public Clutter.Color selection_color { get; set; }
++		[NoAccessorMethod]
++		public bool selection_color_set { get; }
++		public bool single_line_mode { get; set; }
++		public string text { get; set; }
++		public bool use_markup { get; set; }
++		public virtual signal void activate ();
++		[Version (since = "1.16")]
++		public virtual signal void cursor_changed ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public virtual signal void cursor_event (Graphene.Rect rect);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public signal void delete_text (int start_pos, int end_pos);
++		public virtual signal void text_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_buffer_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextBuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public TextBuffer ();
++		public virtual uint delete_text (uint position, uint n_chars);
++		public void emit_deleted_text (uint position, uint n_chars);
++		public void emit_inserted_text (uint position, string chars, uint n_chars);
++		public size_t get_bytes ();
++		public virtual uint get_length ();
++		public int get_max_length ();
++		public unowned string get_text ();
++		[CCode (vfunc_name = "get_text")]
++		[NoWrapper]
++		public virtual unowned string get_text_with_length (size_t n_bytes);
++		public virtual uint insert_text (uint position, string chars, uint n_chars);
++		public void set_max_length (int max_length);
++		public void set_text (string chars, int n_chars);
++		[CCode (has_construct_function = false)]
++		public TextBuffer.with_text (string? text, ssize_t text_len);
++		public uint length { get; }
++		public int max_length { get; set; }
++		public string text { get; }
++		public virtual signal void deleted_text (uint position, uint n_chars);
++		public virtual signal void inserted_text (uint position, string chars, uint n_chars);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextNode (Pango.Layout? layout, Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextureNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextureNode (Cogl.Texture texture, Clutter.Color? color, Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")]
++	[Version (since = "0.2")]
++	public class Timeline : GLib.Object, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		[Version (since = "0.6")]
++		public Timeline (uint duration_ms);
++		[Version (since = "1.14")]
++		public void add_marker (string marker_name, double progress);
++		[Version (since = "0.8")]
++		public void add_marker_at_time (string marker_name, uint msecs);
++		public void advance (uint msecs);
++		[Version (since = "0.8")]
++		public void advance_to_marker (string marker_name);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_actor (Clutter.Actor actor, uint duration_ms);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_frame_clock (Clutter.FrameClock frame_clock, uint duration_ms);
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.6")]
++		public bool get_auto_reverse ();
++		[Version (since = "1.12")]
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
++		[Version (since = "1.10")]
++		public int get_current_repeat ();
++		[Version (since = "0.4")]
++		public uint get_delay ();
++		[Version (since = "0.6")]
++		public uint get_delta ();
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection get_direction ();
++		[Version (since = "0.6")]
++		public uint get_duration ();
++		[Version (since = "1.10")]
++		public int64 get_duration_hint ();
++		public uint get_elapsed_time ();
++		[Version (since = "0.6")]
++		public double get_progress ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_progress_mode ();
++		[Version (since = "1.10")]
++		public int get_repeat_count ();
++		[Version (since = "1.12")]
++		public bool get_step_progress (out int n_steps, out Clutter.StepMode step_mode);
++		[Version (since = "0.8")]
++		public bool has_marker (string marker_name);
++		public bool is_playing ();
++		[CCode (array_length = true, array_length_pos = 1.1, array_length_type = "gsize", array_null_terminated = true)]
++		[Version (since = "0.8")]
++		public string[] list_markers (int msecs);
++		public void pause ();
++		[Version (since = "0.8")]
++		public void remove_marker (string marker_name);
++		public void rewind ();
++		public void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.6")]
++		public void set_auto_reverse (bool reverse);
++		[Version (since = "1.12")]
++		public void set_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		[Version (since = "0.4")]
++		public void set_delay (uint msecs);
++		[Version (since = "0.6")]
++		public void set_direction (Clutter.TimelineDirection direction);
++		[Version (since = "0.6")]
++		public void set_duration (uint msecs);
++		public void set_frame_clock (Clutter.FrameClock frame_clock);
++		[Version (since = "1.10")]
++		public void set_progress_func (owned Clutter.TimelineProgressFunc? func);
++		[Version (since = "1.10")]
++		public void set_progress_mode (Clutter.AnimationMode mode);
++		[Version (since = "1.10")]
++		public void set_repeat_count (int count);
++		[Version (since = "1.12")]
++		public void set_step_progress (int n_steps, Clutter.StepMode step_mode);
++		public void skip (uint msecs);
++		public void start ();
++		public void stop ();
++		public Clutter.Actor actor { get; set construct; }
++		[Version (since = "1.6")]
++		public bool auto_reverse { get; set; }
++		[Version (since = "0.4")]
++		public uint delay { get; set; }
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection direction { get; set; }
++		[Version (since = "0.6")]
++		public uint duration { get; set; }
++		[NoAccessorMethod]
++		public Clutter.FrameClock frame_clock { owned get; set construct; }
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode progress_mode { get; set; }
++		[Version (since = "1.10")]
++		public int repeat_count { get; set; }
++		public virtual signal void completed ();
++		[Version (since = "0.8")]
++		public virtual signal void marker_reached (string marker_name, int msecs);
++		public virtual signal void new_frame (int msecs);
++		public virtual signal void paused ();
++		public virtual signal void started ();
++		[Version (since = "1.12")]
++		public virtual signal void stopped (bool is_finished);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.10")]
++	public class TouchEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadPinchEvent : Clutter.Event {
++		public float angle_delta;
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public float scale;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadSwipeEvent : Clutter.Event {
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transform_node_get_type ()")]
++	public class TransformNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TransformNode (Graphene.Matrix projection);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class Transition : Clutter.Timeline, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Transition ();
++		[NoWrapper]
++		public virtual void attached (Clutter.Animatable animatable);
++		[NoWrapper]
++		public virtual void compute_value (Clutter.Animatable animatable, Clutter.Interval interval, double progress);
++		[NoWrapper]
++		public virtual void detached (Clutter.Animatable animatable);
++		public unowned Clutter.Animatable get_animatable ();
++		public unowned Clutter.Interval get_interval ();
++		public bool get_remove_on_complete ();
++		public void set_animatable (Clutter.Animatable? animatable);
++		[Version (since = "1.12")]
++		public void set_from_value (GLib.Value value);
++		public void set_interval (Clutter.Interval? interval);
++		public void set_remove_on_complete (bool remove_complete);
++		[Version (since = "1.12")]
++		public void set_to_value (GLib.Value value);
++		public Clutter.Animatable animatable { get; set; }
++		public Clutter.Interval interval { get; set; }
++		public bool remove_on_complete { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")]
++	[Version (since = "1.12")]
++	public class TransitionGroup : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public TransitionGroup ();
++		public void add_transition (Clutter.Transition transition);
++		public void remove_all ();
++		public void remove_transition (Clutter.Transition transition);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_virtual_input_device_get_type ()")]
++	public class VirtualInputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected VirtualInputDevice ();
++		public int get_device_type ();
++		public virtual void notify_absolute_motion (uint64 time_us, double x, double y);
++		public virtual void notify_button (uint64 time_us, uint32 button, Clutter.ButtonState button_state);
++		public virtual void notify_discrete_scroll (uint64 time_us, Clutter.ScrollDirection direction, Clutter.ScrollSource scroll_source);
++		public virtual void notify_key (uint64 time_us, uint32 key, Clutter.KeyState key_state);
++		public virtual void notify_keyval (uint64 time_us, uint32 keyval, Clutter.KeyState key_state);
++		public virtual void notify_relative_motion (uint64 time_us, double dx, double dy);
++		public virtual void notify_scroll_continuous (uint64 time_us, double dx, double dy, Clutter.ScrollSource scroll_source, Clutter.ScrollFinishFlags finish_flags);
++		public virtual void notify_touch_down (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_motion (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_up (uint64 time_us, int slot);
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.Seat seat { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_zoom_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class ZoomAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public ZoomAction ();
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
++		public Clutter.ZoomAxis get_zoom_axis ();
++		public void set_zoom_axis (Clutter.ZoomAxis axis);
++		public Clutter.ZoomAxis zoom_axis { get; set; }
++		public virtual signal bool zoom (Clutter.Actor actor, Graphene.Point focal_point, double factor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterAnimatableInterface", type_id = "clutter_animatable_get_type ()")]
++	public interface Animatable : GLib.Object {
++		[Version (since = "1.4")]
++		public abstract unowned GLib.ParamSpec find_property (string property_name);
++		public abstract unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public abstract void get_initial_state (string property_name, GLib.Value value);
++		[Version (since = "1.8")]
++		public abstract bool interpolate_value (string property_name, Clutter.Interval interval, double progress, out GLib.Value value);
++		[Version (since = "1.4")]
++		public abstract void set_final_state (string property_name, GLib.Value value);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
++	[Version (since = "0.4")]
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (vfunc_name = "add")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void add_actor (Clutter.Actor actor);
++		[Version (since = "0.8")]
++		public void child_get (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_get_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "0.8")]
++		public void child_set (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "1.2")]
++		public virtual void create_child_meta (Clutter.Actor actor);
++		[Version (since = "1.2")]
++		public virtual void destroy_child_meta (Clutter.Actor actor);
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[Version (since = "0.8")]
++		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++		[CCode (vfunc_name = "lower")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[CCode (vfunc_name = "raise")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void raise_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public void remove (...);
++		[CCode (vfunc_name = "remove")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void remove_actor (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public abstract void sort_depth_order ();
++		public virtual signal void actor_added (Clutter.Actor actor);
++		public virtual signal void actor_removed (Clutter.Actor actor);
++		[HasEmitter]
++		[Version (since = "0.8")]
++		public virtual signal void child_notify (Clutter.Actor child, GLib.ParamSpec pspec);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterContentInterface", type_id = "clutter_content_get_type ()")]
++	public interface Content : GLib.Object {
++		[Version (since = "1.10")]
++		public abstract bool get_preferred_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public abstract void invalidate ();
++		public abstract void invalidate_size ();
++		[NoWrapper]
++		public abstract void paint_content (Clutter.Actor actor, Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.10")]
++		public virtual signal void attached (Clutter.Actor actor);
++		[Version (since = "1.10")]
++		public virtual signal void detached (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scriptable_get_type ()")]
++	[Version (since = "0.6")]
++	public interface Scriptable : GLib.Object {
++		public abstract unowned string get_id ();
++		public abstract bool parse_custom_node (Clutter.Script script, GLib.Value value, string name, Json.Node node);
++		public abstract void set_custom_property (Clutter.Script script, string name, GLib.Value value);
++		public abstract void set_id (string id_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_actor_box_get_type ()")]
++	public struct ActorBox {
++		public float x1;
++		public float y1;
++		public float x2;
++		public float y2;
++		[Version (since = "1.12")]
++		public static Clutter.ActorBox? alloc ();
++		[Version (since = "1.2")]
++		public static void clamp_to_pixel (ref Clutter.ActorBox box);
++		[Version (since = "1.0")]
++		public bool contains (float x, float y);
++		[Version (since = "1.0")]
++		public Clutter.ActorBox? copy ();
++		[Version (since = "1.0")]
++		public bool equal (Clutter.ActorBox box_b);
++		[Version (since = "1.0")]
++		public void free ();
++		[Version (since = "1.0")]
++		public float get_area ();
++		[Version (since = "1.0")]
++		public float get_height ();
++		[Version (since = "1.0")]
++		public void get_origin (out float x, out float y);
++		[Version (since = "1.0")]
++		public void get_size (out float width, out float height);
++		[Version (since = "1.0")]
++		public float get_width ();
++		[Version (since = "1.0")]
++		public float get_x ();
++		[Version (since = "1.0")]
++		public float get_y ();
++		[Version (since = "1.10")]
++		public unowned Clutter.ActorBox? init (float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void init_rect (float x, float y, float width, float height);
++		[Version (since = "1.2")]
++		public Clutter.ActorBox interpolate (Clutter.ActorBox final, double progress);
++		public bool is_initialized ();
++		[Version (since = "1.6")]
++		public void scale (float scale);
++		[Version (since = "1.6")]
++		public void set_origin (float x, float y);
++		[Version (since = "1.6")]
++		public void set_size (float width, float height);
++		[Version (since = "1.4")]
++		public Clutter.ActorBox union (Clutter.ActorBox b);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Version (since = "1.10")]
++	public struct ActorIter {
++		public void destroy ();
++		public void init (Clutter.Actor root);
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public bool next (out unowned Clutter.Actor child);
++		public bool prev (out unowned Clutter.Actor child);
++		public void remove ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++		public Cairo.ImageSurface image;
++		public Cairo.RectangleInt rect;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
++	public struct Color {
++		public uint8 red;
++		public uint8 green;
++		public uint8 blue;
++		public uint8 alpha;
++		public Clutter.Color add (Clutter.Color b);
++		[Version (since = "1.12")]
++		public static Clutter.Color? alloc ();
++		[Version (since = "0.2")]
++		public Clutter.Color? copy ();
++		public Clutter.Color darken ();
++		[Version (since = "0.2")]
++		public bool equal (Clutter.Color v2);
++		[Version (since = "0.2")]
++		public void free ();
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++		[Version (since = "1.0")]
++		public uint hash ();
++		[Version (since = "1.12")]
++		public unowned Clutter.Color? init (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "1.6")]
++		public Clutter.Color interpolate (Clutter.Color final, double progress);
++		public Clutter.Color lighten ();
++		public bool parse_string (string str);
++		public Clutter.Color shade (double factor);
++		public Clutter.Color subtract (Clutter.Color b);
++		public void to_hls (out float hue, out float luminance, out float saturation);
++		public uint32 to_pixel ();
++		[Version (since = "0.2")]
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_knot_get_type ()")]
++	[Version (since = "0.2")]
++	public struct Knot {
++		public int x;
++		public int y;
++		public Clutter.Knot? copy ();
++		public bool equal (Clutter.Knot knot_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
++	[Version (since = "1.0")]
++	public struct PathNode {
++		public Clutter.PathNodeType type;
++		[CCode (array_length = false)]
++		public weak Clutter.Knot points[3];
++		public Clutter.PathNode? copy ();
++		public bool equal (Clutter.PathNode node_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_perspective_get_type ()")]
++	[Version (since = "0.4")]
++	public struct Perspective {
++		public float fovy;
++		public float aspect;
++		public float z_near;
++		public float z_far;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	public struct PointerA11ySettings {
++		public Clutter.PointerA11yFlags controls;
++		public Clutter.PointerA11yDwellClickType dwell_click_type;
++		public Clutter.PointerA11yDwellMode dwell_mode;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_single;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_double;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_drag;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_secondary;
++		public int secondary_click_delay;
++		public int dwell_delay;
++		public int dwell_threshold;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
++	[Version (since = "1.0")]
++	public struct Units {
++		public Clutter.Units? copy ();
++		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++		public Clutter.UnitType get_unit_type ();
++		public float get_unit_value ();
++		public float to_pixels ();
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ActorAlign {
++		FILL,
++		START,
++		CENTER,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_", type_id = "clutter_actor_flags_get_type ()")]
++	[Flags]
++	public enum ActorFlags {
++		MAPPED,
++		REALIZED,
++		REACTIVE,
++		VISIBLE,
++		NO_LAYOUT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_", type_id = "clutter_align_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum AlignAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_animation_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum AnimationMode {
++		CUSTOM_MODE,
++		LINEAR,
++		EASE_IN_QUAD,
++		EASE_OUT_QUAD,
++		EASE_IN_OUT_QUAD,
++		EASE_IN_CUBIC,
++		EASE_OUT_CUBIC,
++		EASE_IN_OUT_CUBIC,
++		EASE_IN_QUART,
++		EASE_OUT_QUART,
++		EASE_IN_OUT_QUART,
++		EASE_IN_QUINT,
++		EASE_OUT_QUINT,
++		EASE_IN_OUT_QUINT,
++		EASE_IN_SINE,
++		EASE_OUT_SINE,
++		EASE_IN_OUT_SINE,
++		EASE_IN_EXPO,
++		EASE_OUT_EXPO,
++		EASE_IN_OUT_EXPO,
++		EASE_IN_CIRC,
++		EASE_OUT_CIRC,
++		EASE_IN_OUT_CIRC,
++		EASE_IN_ELASTIC,
++		EASE_OUT_ELASTIC,
++		EASE_IN_OUT_ELASTIC,
++		EASE_IN_BACK,
++		EASE_OUT_BACK,
++		EASE_IN_OUT_BACK,
++		EASE_IN_BOUNCE,
++		EASE_OUT_BOUNCE,
++		EASE_IN_OUT_BOUNCE,
++		STEPS,
++		STEP_START,
++		STEP_END,
++		CUBIC_BEZIER,
++		EASE,
++		EASE_IN,
++		EASE_OUT,
++		EASE_IN_OUT,
++		ANIMATION_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BinAlignment {
++		[Version (deprecated = true)]
++		FIXED,
++		[Version (deprecated = true)]
++		FILL,
++		START,
++		[Version (deprecated = true)]
++		END,
++		[Version (deprecated = true)]
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")]
++	[Version (since = "1.4")]
++	public enum BindCoordinate {
++		X,
++		Y,
++		WIDTH,
++		HEIGHT,
++		POSITION,
++		SIZE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BoxAlignment {
++		START,
++		END,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BUTTON_STATE_", type_id = "clutter_button_state_get_type ()")]
++	public enum ButtonState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ContentGravity {
++		TOP_LEFT,
++		TOP,
++		TOP_RIGHT,
++		LEFT,
++		CENTER,
++		RIGHT,
++		BOTTOM_LEFT,
++		BOTTOM,
++		BOTTOM_RIGHT,
++		RESIZE_FILL,
++		RESIZE_ASPECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_", type_id = "clutter_content_repeat_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ContentRepeat {
++		NONE,
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_debug_flag_get_type ()")]
++	[Flags]
++	public enum DebugFlag {
++		MISC,
++		ACTOR,
++		TEXTURE,
++		EVENT,
++		PAINT,
++		PANGO,
++		BACKEND,
++		SCHEDULER,
++		SCRIPT,
++		SHADER,
++		MULTISTAGE,
++		ANIMATION,
++		LAYOUT,
++		PICK,
++		EVENTLOOP,
++		CLIPPING,
++		OOB_TRANSFORMS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum DragAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_draw_debug_flag_get_type ()")]
++	[Flags]
++	public enum DrawDebugFlag {
++		DISABLE_SWAP_EVENTS,
++		DISABLE_CLIPPED_REDRAWS,
++		REDRAWS,
++		PAINT_VOLUMES,
++		DISABLE_CULLING,
++		DISABLE_OFFSCREEN_REDIRECT,
++		CONTINUOUS_REDRAW,
++		PAINT_DEFORM_TILES,
++		PAINT_DAMAGE_REGION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_", type_id = "clutter_effect_paint_flags_get_type ()")]
++	[Flags]
++	public enum EffectPaintFlags {
++		ACTOR_DIRTY,
++		BYPASS_EFFECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_", type_id = "clutter_event_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.6")]
++	public enum EventFlags {
++		NONE,
++		FLAG_SYNTHETIC,
++		FLAG_INPUT_METHOD,
++		FLAG_REPEATED,
++		FLAG_RELATIVE_MOTION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_event_type_get_type ()")]
++	[Version (since = "0.4")]
++	public enum EventType {
++		NOTHING,
++		KEY_PRESS,
++		KEY_RELEASE,
++		MOTION,
++		ENTER,
++		LEAVE,
++		BUTTON_PRESS,
++		BUTTON_RELEASE,
++		SCROLL,
++		TOUCH_BEGIN,
++		TOUCH_UPDATE,
++		TOUCH_END,
++		TOUCH_CANCEL,
++		TOUCHPAD_PINCH,
++		TOUCHPAD_SWIPE,
++		PROXIMITY_IN,
++		PROXIMITY_OUT,
++		PAD_BUTTON_PRESS,
++		PAD_BUTTON_RELEASE,
++		PAD_STRIP,
++		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
++		EVENT_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum FeatureFlags {
++		STAGE_STATIC,
++		STAGE_CURSOR,
++		SHADERS_GLSL,
++		OFFSCREEN,
++		STAGE_MULTIPLE,
++		SWAP_EVENTS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
++	[Version (since = "1.2")]
++	public enum FlowOrientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_RESULT_", type_id = "clutter_frame_result_get_type ()")]
++	public enum FrameResult {
++		PENDING_PRESENTED,
++		IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GESTURE_TRIGGER_EDGE_", type_id = "clutter_gesture_trigger_edge_get_type ()")]
++	[Version (since = "1.18")]
++	public enum GestureTriggerEdge {
++		NONE,
++		AFTER,
++		BEFORE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_", type_id = "clutter_gravity_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.2")]
++	public enum Gravity {
++		NONE,
++		NORTH,
++		NORTH_EAST,
++		EAST,
++		SOUTH_EAST,
++		SOUTH,
++		SOUTH_WEST,
++		WEST,
++		NORTH_WEST,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_", type_id = "clutter_grid_position_get_type ()")]
++	[Version (since = "1.12")]
++	public enum GridPosition {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_", type_id = "clutter_init_error_get_type ()")]
++	[Version (since = "0.2")]
++	public enum InitError {
++		SUCCESS,
++		ERROR_UNKNOWN,
++		ERROR_THREADS,
++		ERROR_BACKEND,
++		ERROR_INTERNAL;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_", type_id = "clutter_input_axis_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputAxis {
++		IGNORE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER,
++		LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_FLAG_", type_id = "clutter_input_axis_flags_get_type ()")]
++	[Flags]
++	public enum InputAxisFlags {
++		NONE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_HINT_", type_id = "clutter_input_content_hint_flags_get_type ()")]
++	[Flags]
++	public enum InputContentHintFlags {
++		COMPLETION,
++		SPELLCHECK,
++		AUTO_CAPITALIZATION,
++		LOWERCASE,
++		UPPERCASE,
++		TITLECASE,
++		HIDDEN_TEXT,
++		SENSITIVE_DATA,
++		LATIN,
++		MULTILINE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_PURPOSE_", type_id = "clutter_input_content_purpose_get_type ()")]
++	public enum InputContentPurpose {
++		NORMAL,
++		ALPHA,
++		DIGITS,
++		NUMBER,
++		PHONE,
++		URL,
++		EMAIL,
++		NAME,
++		PASSWORD,
++		DATE,
++		TIME,
++		DATETIME,
++		TERMINAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAD_FEATURE_", type_id = "clutter_input_device_pad_feature_get_type ()")]
++	public enum InputDevicePadFeature {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_PAD_SOURCE_", type_id = "clutter_input_device_pad_source_get_type ()")]
++	public enum InputDevicePadSource {
++		UNKNOWN,
++		FINGER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_TOOL_", type_id = "clutter_input_device_tool_type_get_type ()")]
++	[Version (since = "1.28")]
++	public enum InputDeviceToolType {
++		NONE,
++		PEN,
++		ERASER,
++		BRUSH,
++		PENCIL,
++		AIRBRUSH,
++		MOUSE,
++		LENS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_input_device_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum InputDeviceType {
++		POINTER_DEVICE,
++		KEYBOARD_DEVICE,
++		EXTENSION_DEVICE,
++		JOYSTICK_DEVICE,
++		TABLET_DEVICE,
++		TOUCHPAD_DEVICE,
++		TOUCHSCREEN_DEVICE,
++		PEN_DEVICE,
++		ERASER_DEVICE,
++		CURSOR_DEVICE,
++		PAD_DEVICE,
++		N_DEVICE_TYPES
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputMode {
++		LOGICAL,
++		PHYSICAL,
++		FLOATING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
++	public enum InputPanelState {
++		OFF,
++		ON,
++		TOGGLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_", type_id = "clutter_interpolation_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "1.2")]
++	public enum Interpolation {
++		LINEAR,
++		CUBIC
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_KEY_STATE_", type_id = "clutter_key_state_get_type ()")]
++	public enum KeyState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_", type_id = "clutter_long_press_state_get_type ()")]
++	[Version (since = "1.8")]
++	public enum LongPressState {
++		QUERY,
++		ACTIVATE,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_modifier_type_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum ModifierType {
++		SHIFT_MASK,
++		LOCK_MASK,
++		CONTROL_MASK,
++		MOD1_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK,
++		BUTTON1_MASK,
++		BUTTON2_MASK,
++		BUTTON3_MASK,
++		BUTTON4_MASK,
++		BUTTON5_MASK,
++		MODIFIER_RESERVED_13_MASK,
++		MODIFIER_RESERVED_14_MASK,
++		MODIFIER_RESERVED_15_MASK,
++		MODIFIER_RESERVED_16_MASK,
++		MODIFIER_RESERVED_17_MASK,
++		MODIFIER_RESERVED_18_MASK,
++		MODIFIER_RESERVED_19_MASK,
++		MODIFIER_RESERVED_20_MASK,
++		MODIFIER_RESERVED_21_MASK,
++		MODIFIER_RESERVED_22_MASK,
++		MODIFIER_RESERVED_23_MASK,
++		MODIFIER_RESERVED_24_MASK,
++		MODIFIER_RESERVED_25_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		META_MASK,
++		MODIFIER_RESERVED_29_MASK,
++		RELEASE_MASK,
++		MODIFIER_MASK
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_", type_id = "clutter_offscreen_redirect_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum OffscreenRedirect {
++		AUTOMATIC_FOR_OPACITY,
++		ALWAYS,
++		ON_IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_", type_id = "clutter_orientation_get_type ()")]
++	[Version (since = "1.12")]
++	public enum Orientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAINT_FLAG_", type_id = "clutter_paint_flag_get_type ()")]
++	[Flags]
++	public enum PaintFlag {
++		NONE,
++		NO_CURSORS,
++		FORCE_CURSORS,
++		CLEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum PanAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS,
++		AXIS_AUTO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PathNodeType {
++		MOVE_TO,
++		LINE_TO,
++		CURVE_TO,
++		CLOSE,
++		REL_MOVE_TO,
++		REL_LINE_TO,
++		REL_CURVE_TO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_NOP_", type_id = "clutter_pick_debug_flag_get_type ()")]
++	[Flags]
++	public enum PickDebugFlag {
++		PICKING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_", type_id = "clutter_pick_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PickMode {
++		NONE,
++		REACTIVE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_CLICK_TYPE_", type_id = "clutter_pointer_a11y_dwell_click_type_get_type ()")]
++	public enum PointerA11yDwellClickType {
++		NONE,
++		PRIMARY,
++		SECONDARY,
++		MIDDLE,
++		DOUBLE,
++		DRAG
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_DIRECTION_", type_id = "clutter_pointer_a11y_dwell_direction_get_type ()")]
++	public enum PointerA11yDwellDirection {
++		NONE,
++		LEFT,
++		RIGHT,
++		UP,
++		DOWN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_MODE_", type_id = "clutter_pointer_a11y_dwell_mode_get_type ()")]
++	public enum PointerA11yDwellMode {
++		WINDOW,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_", type_id = "clutter_pointer_a11y_flags_get_type ()")]
++	[Flags]
++	public enum PointerA11yFlags {
++		SECONDARY_CLICK_ENABLED,
++		DWELL_ENABLED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_TIMEOUT_TYPE_", type_id = "clutter_pointer_a11y_timeout_type_get_type ()")]
++	public enum PointerA11yTimeoutType {
++		SECONDARY_CLICK,
++		DWELL,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_", type_id = "clutter_repaint_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.10")]
++	public enum RepaintFlags {
++		PRE_PAINT,
++		POST_PAINT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = "clutter_request_mode_get_type ()")]
++	[Version (since = "0.8")]
++	public enum RequestMode {
++		HEIGHT_FOR_WIDTH,
++		WIDTH_FOR_HEIGHT,
++		CONTENT_SIZE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_rotate_axis_get_type ()")]
++	[Version (since = "0.4")]
++	public enum RotateAxis {
++		X_AXIS,
++		Y_AXIS,
++		Z_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_", type_id = "clutter_rotate_direction_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum RotateDirection {
++		CW,
++		CCW
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_", type_id = "clutter_scaling_filter_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ScalingFilter {
++		LINEAR,
++		NEAREST,
++		TRILINEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_direction_get_type ()")]
++	[Version (since = "0.4")]
++	public enum ScrollDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		SMOOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_FINISHED_", type_id = "clutter_scroll_finish_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.26")]
++	public enum ScrollFinishFlags {
++		NONE,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_mode_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ScrollMode {
++		NONE,
++		HORIZONTALLY,
++		VERTICALLY,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_SOURCE_", type_id = "clutter_scroll_source_get_type ()")]
++	[Version (since = "1.26")]
++	public enum ScrollSource {
++		UNKNOWN,
++		WHEEL,
++		FINGER,
++		CONTINUOUS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_shader_type_get_type ()")]
++	[Version (since = "1.4")]
++	public enum ShaderType {
++		VERTEX_SHADER,
++		FRAGMENT_SHADER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_", type_id = "clutter_snap_edge_get_type ()")]
++	[Version (since = "1.6")]
++	public enum SnapEdge {
++		TOP,
++		RIGHT,
++		BOTTOM,
++		LEFT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
++	[Version (since = "1.6")]
++	public enum StaticColor {
++		WHITE,
++		BLACK,
++		RED,
++		DARK_RED,
++		GREEN,
++		DARK_GREEN,
++		BLUE,
++		DARK_BLUE,
++		CYAN,
++		DARK_CYAN,
++		MAGENTA,
++		DARK_MAGENTA,
++		YELLOW,
++		DARK_YELLOW,
++		GRAY,
++		DARK_GRAY,
++		LIGHT_GRAY,
++		BUTTER,
++		BUTTER_LIGHT,
++		BUTTER_DARK,
++		ORANGE,
++		ORANGE_LIGHT,
++		ORANGE_DARK,
++		CHOCOLATE,
++		CHOCOLATE_LIGHT,
++		CHOCOLATE_DARK,
++		CHAMELEON,
++		CHAMELEON_LIGHT,
++		CHAMELEON_DARK,
++		SKY_BLUE,
++		SKY_BLUE_LIGHT,
++		SKY_BLUE_DARK,
++		PLUM,
++		PLUM_LIGHT,
++		PLUM_DARK,
++		SCARLET_RED,
++		SCARLET_RED_LIGHT,
++		SCARLET_RED_DARK,
++		ALUMINIUM_1,
++		ALUMINIUM_2,
++		ALUMINIUM_3,
++		ALUMINIUM_4,
++		ALUMINIUM_5,
++		ALUMINIUM_6,
++		TRANSPARENT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
++	[Version (since = "1.12")]
++	public enum StepMode {
++		START,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_", type_id = "clutter_swipe_direction_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum SwipeDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_", type_id = "clutter_text_direction_get_type ()")]
++	[Version (since = "1.2")]
++	public enum TextDirection {
++		DEFAULT,
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_", type_id = "clutter_texture_flags_get_type ()")]
++	[Flags]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum TextureFlags {
++		NONE,
++		RGB_FLAG_BGR,
++		RGB_FLAG_PREMULT,
++		YUV_FLAG_YUV2
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_", type_id = "clutter_texture_quality_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.8")]
++	public enum TextureQuality {
++		LOW,
++		MEDIUM,
++		HIGH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_", type_id = "clutter_timeline_direction_get_type ()")]
++	[Version (since = "0.6")]
++	public enum TimelineDirection {
++		FORWARD,
++		BACKWARD
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TOUCHPAD_GESTURE_PHASE_", type_id = "clutter_touchpad_gesture_phase_get_type ()")]
++	[Version (since = "1.24")]
++	public enum TouchpadGesturePhase {
++		BEGIN,
++		UPDATE,
++		END,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum UnitType {
++		PIXEL,
++		EM,
++		MM,
++		POINT,
++		CM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_VIRTUAL_DEVICE_TYPE_", type_id = "clutter_virtual_device_type_get_type ()")]
++	[Flags]
++	public enum VirtualDeviceType {
++		NONE,
++		KEYBOARD,
++		POINTER,
++		TOUCHSCREEN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ZOOM_", type_id = "clutter_zoom_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum ZoomAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_")]
++	[Version (since = "1.10")]
++	public errordomain ImageError {
++		DATA;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")]
++	[Version (since = "0.6")]
++	public errordomain ScriptError {
++		TYPE_FUNCTION,
++		PROPERTY,
++		VALUE;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.24")]
++	public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)]
++	[Version (since = "1.0")]
++	public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	public delegate void Callback (Clutter.Actor actor);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.18")]
++	public delegate bool EventFilterFunc (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.0")]
++	public delegate void PathCallback (Clutter.PathNode node);
++	[CCode (cheader_filename = "clutter/clutter.h", has_target = false)]
++	[Version (since = "1.0")]
++	public delegate bool ProgressFunc (GLib.Value a, GLib.Value b, double progress, GLib.Value retval);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 6.9)]
++	[Version (since = "0.6")]
++	public delegate void ScriptConnectFunc (Clutter.Script script, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 3.9)]
++	[Version (since = "1.10")]
++	public delegate double TimelineProgressFunc (Clutter.Timeline timeline, double elapsed, double total);
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_COGL")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string COGL;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_CURRENT_TIME")]
++	[Version (since = "0.4")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_FLAVOUR")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string FLAVOUR;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PATH_RELATIVE")]
++	public const int PATH_RELATIVE;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PRIORITY_REDRAW")]
++	[Version (since = "0.8")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void base_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.12")]
++	public static void cairo_clear (Cairo.Context cr);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.14")]
++	public static void disable_accessibility ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static void do_event (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static bool events_pending ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.4")]
++	public static bool get_accessibility_enabled ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static unowned Clutter.Event get_current_event ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static uint32 get_current_event_time ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static unowned Clutter.Backend get_default_backend ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static uint get_default_frame_rate ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static Clutter.TextDirection get_default_text_direction ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static unowned Pango.FontMap get_font_map ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.8")]
++	public static GLib.OptionGroup get_option_group_without_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static unowned string get_script_id (GLib.Object gobject);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static uint32 keysym_to_unicode (uint keyval);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void set_custom_backend_func (void* func);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.10")]
++	public static uint unicode_to_keysym (uint32 wc);
++}
+diff --git vapi/mutter-cogl-7.vapi vapi/mutter-cogl-7.vapi
+index 620c2317..1aae97d5 100644
+--- vapi/mutter-cogl-7.vapi
++++ vapi/mutter-cogl-7.vapi
+@@ -32,7 +32,9 @@ namespace Cogl {
+ 	public class Context : Cogl.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
+ 		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
+ 	}
+ 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
+ 	[Compact]
+@@ -270,6 +272,10 @@ namespace Cogl {
+ 		[Version (since = "2.0")]
+ 		public void set_user_program (Cogl.Handle program);
+ 	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
+ 	[CCode (cheader_filename = "cogl/cogl.h")]
+ 	[Compact]
+ 	public class PixelBuffer : Cogl.Handle {
+diff --git vapi/mutter-cogl-8-custom.vala vapi/mutter-cogl-8-custom.vala
+new file mode 100644
+index 00000000..c4d4b93a
+--- /dev/null
++++ vapi/mutter-cogl-8-custom.vala
+@@ -0,0 +1,119 @@
++namespace Cogl {
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class Buffer: Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++
++	[CCode (has_type_id = false)]
++	public struct Color {
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++	}
++
++	[Compact]
++	[CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++
++	[Compact]
++	public class PixelBuffer: Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	public class Program: Handle {
++		[CCode (cname = "cogl_create_program", type = "CoglHandle*", has_construct_function = false)]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	public class Shader: Handle {
++		[CCode (cname = "cogl_create_shader", type = "CoglHandle*", has_construct_function = false)]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	public class VertexBuffer: Handle {
++		[CCode (type = "CoglHandle*", has_construct_function = false)]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class VertexBufferIndices: Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++
++	[CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")]
++	public struct Matrix {
++		[CCode (cname = "cogl_matrix_init_from_array", array_length = false, array_null_terminated = false)]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++
++	[SimpleType]
++	[GIR (name = "Bool")]
++	[BooleanType]
++	public struct Bool : bool {
++	}
++
++	public static GLib.Callback get_proc_address(string s);
++}
+diff --git vapi/mutter-cogl-8.deps vapi/mutter-cogl-8.deps
+new file mode 100644
+index 00000000..98ccac5b
+--- /dev/null
++++ vapi/mutter-cogl-8.deps
+@@ -0,0 +1 @@
++pango
+diff --git vapi/mutter-cogl-8.vapi vapi/mutter-cogl-8.vapi
+new file mode 100644
+index 00000000..c17c124e
+--- /dev/null
++++ vapi/mutter-cogl-8.vapi
+@@ -0,0 +1,1091 @@
++/* mutter-cogl-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "8", lower_case_cprefix = "cogl_")]
++namespace Cogl {
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_bitmap_get_gtype ()")]
++	public class Bitmap : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Bitmap ();
++		public static uint32 error_quark ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.0")]
++		public Bitmap.from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public Cogl.PixelFormat get_format ();
++		[Version (since = "1.10")]
++		public int get_height ();
++		[Version (since = "1.10")]
++		public int get_rowstride ();
++		[Version (since = "1.0")]
++		public static bool get_size_from_file (string filename, out int width, out int height);
++		[Version (since = "1.10")]
++		public int get_width ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class Buffer : Cogl.Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_context_get_gtype ()")]
++	public class Context : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
++		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.14")]
++	public class FrameClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_frame_info_get_gtype ()")]
++	public class FrameInfo : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameInfo ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		public bool get_is_symbolic ();
++		[Version (since = "1.14")]
++		public int64 get_presentation_time ();
++		[Version (since = "1.14")]
++		public float get_refresh_rate ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_framebuffer_get_type ()")]
++	public abstract class Framebuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Framebuffer ();
++		[Version (since = "1.8")]
++		public virtual bool allocate () throws GLib.Error;
++		[Version (since = "1.8")]
++		public void clear (ulong buffers, Cogl.Color color);
++		[Version (since = "1.8")]
++		public void clear4f (ulong buffers, float red, float green, float blue, float alpha);
++		[Version (since = "1.8")]
++		public void discard_buffers (ulong buffers);
++		[Version (since = "1.10")]
++		public void draw_multitextured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, [CCode (array_length = false)] float[] tex_coords, int tex_coords_len);
++		[Version (since = "1.10")]
++		public void draw_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void draw_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, float s_1, float t_1, float s_2, float t_2);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		public static uint32 error_quark ();
++		[Version (since = "1.10")]
++		public void finish ();
++		public void flush ();
++		[Version (since = "1.10")]
++		public void frustum (float left, float right, float bottom, float top, float z_near, float z_far);
++		[Version (since = "1.8")]
++		public int get_alpha_bits ();
++		[Version (since = "1.8")]
++		public int get_blue_bits ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_context ();
++		[Version (since = "2.0")]
++		public int get_depth_bits ();
++		[Version (since = "1.18")]
++		public bool get_depth_write_enabled ();
++		[Version (since = "1.8")]
++		public bool get_dither_enabled ();
++		[Version (since = "1.8")]
++		public int get_green_bits ();
++		[Version (since = "1.8")]
++		public int get_height ();
++		public bool get_is_stereo ();
++		[Version (since = "1.10")]
++		public void get_modelview_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void get_projection_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public int get_red_bits ();
++		[Version (since = "1.10")]
++		public int get_samples_per_pixel ();
++		[Version (since = "1.20")]
++		public Cogl.StereoMode get_stereo_mode ();
++		[Version (since = "1.8")]
++		public void get_viewport4fv ([CCode (array_length = false)] out unowned float viewport[4]);
++		[Version (since = "1.8")]
++		public float get_viewport_height ();
++		[Version (since = "1.8")]
++		public float get_viewport_width ();
++		[Version (since = "1.8")]
++		public float get_viewport_x ();
++		[Version (since = "1.8")]
++		public float get_viewport_y ();
++		[Version (since = "1.8")]
++		public int get_width ();
++		[Version (since = "1.10")]
++		public void identity_matrix ();
++		[NoWrapper]
++		public virtual bool is_y_flipped ();
++		[Version (since = "1.10")]
++		public void orthographic (float x_1, float y_1, float x_2, float y_2, float near, float far);
++		[Version (since = "1.10")]
++		public void perspective (float fov_y, float aspect, float z_near, float z_far);
++		[Version (since = "1.10")]
++		public void pop_clip ();
++		[Version (since = "1.10")]
++		public void pop_matrix ();
++		[Version (since = "1.10")]
++		public void push_matrix ();
++		[Version (since = "1.10")]
++		public void push_rectangle_clip (float x_1, float y_1, float x_2, float y_2);
++		public void push_region_clip (Cairo.Region region);
++		[Version (since = "1.10")]
++		public void push_scissor_clip (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public bool read_pixels (int x, int y, int width, int height, Cogl.PixelFormat format, uint8 pixels);
++		[Version (since = "1.10")]
++		public bool read_pixels_into_bitmap (int x, int y, Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
++		[Version (since = "1.8")]
++		public void resolve_samples ();
++		[Version (since = "1.8")]
++		public void resolve_samples_region (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public void rotate (float angle, float x, float y, float z);
++		[Version (since = "2.0")]
++		public void rotate_euler (Graphene.Euler euler);
++		[Version (since = "1.10")]
++		public void scale (float x, float y, float z);
++		[Version (since = "1.18")]
++		public void set_depth_write_enabled (bool depth_write_enabled);
++		[Version (since = "1.8")]
++		public void set_dither_enabled (bool dither_enabled);
++		[Version (since = "1.10")]
++		public void set_modelview_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void set_projection_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public void set_samples_per_pixel (int samples_per_pixel);
++		[Version (since = "1.20")]
++		public void set_stereo_mode (Cogl.StereoMode stereo_mode);
++		[Version (since = "1.8")]
++		public void set_viewport (float x, float y, float width, float height);
++		[Version (since = "1.10")]
++		public void transform (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void translate (float x, float y, float z);
++		[NoAccessorMethod]
++		public void* driver_config { get; construct; }
++		[NoAccessorMethod]
++		public int height { get; set construct; }
++		[NoAccessorMethod]
++		public int width { get; set construct; }
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class FramebufferDriverConfig {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	[Compact]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_material_get_type ()")]
++	[Compact]
++	public class Material {
++		[CCode (has_construct_function = false)]
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public Material ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_alpha_test_function (Cogl.MaterialAlphaFunc alpha_func, float alpha_reference);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color (Cogl.Color color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer (int layer_index, Cogl.Handle texture);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_filters (int layer_index, Cogl.MaterialFilter min_filter, Cogl.MaterialFilter mag_filter);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_point_size (float point_size);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class MaterialLayer {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_object_get_gtype ()")]
++	public abstract class Object {
++		[CCode (has_construct_function = false)]
++		protected Object ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_type ()")]
++	public class Offscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Offscreen ();
++		[CCode (has_construct_function = false)]
++		public Offscreen.with_texture (Cogl.Texture texture);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_onscreen_get_type ()")]
++	public class Onscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Onscreen ();
++		[Version (since = "1.16")]
++		public Cogl.OnscreenDirtyClosure add_dirty_callback ([CCode (delegate_target_pos = 1.5)] Cogl.OnscreenDirtyCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[Version (since = "1.14")]
++		public Cogl.FrameClosure add_frame_callback ([CCode (delegate_target_pos = 1.5)] Cogl.FrameCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[NoWrapper]
++		public virtual void bind ();
++		[Version (since = "1.14")]
++		public virtual int get_buffer_age ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		[Version (since = "2.0")]
++		public void hide ();
++		[Version (since = "1.16")]
++		public void remove_dirty_callback (Cogl.OnscreenDirtyClosure closure);
++		[Version (since = "1.14")]
++		public void remove_frame_callback (Cogl.FrameClosure closure);
++		[Version (since = "2.0")]
++		public void show ();
++		[Version (since = "1.10")]
++		public void swap_buffers (Cogl.FrameInfo frame_info, void* user_data);
++		[Version (since = "1.16")]
++		public virtual void swap_buffers_with_damage (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++		[Version (since = "1.10")]
++		public virtual void swap_region (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_onscreen_dirty_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.16")]
++	public class OnscreenDirtyClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_pipeline_get_gtype ()")]
++	public class Pipeline : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Pipeline (Cogl.Context context);
++		[Version (since = "2.0")]
++		public Cogl.Pipeline copy ();
++		[Version (since = "2.0")]
++		public void foreach_layer (Cogl.PipelineLayerCallback callback);
++		[Version (since = "2.0")]
++		public Cogl.PipelineAlphaFunc get_alpha_test_function ();
++		[Version (since = "2.0")]
++		public float get_alpha_test_reference ();
++		[Version (since = "2.0")]
++		public Cogl.Color get_color ();
++		[Version (since = "2.0")]
++		public Cogl.PipelineCullFaceMode get_cull_face_mode ();
++		[Version (since = "2.0")]
++		public Cogl.Winding get_front_face_winding ();
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_mag_filter (int layer_index);
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_min_filter (int layer_index);
++		[Version (since = "2.0")]
++		public bool get_layer_point_sprite_coords_enabled (int layer_index);
++		[Version (since = "1.10")]
++		public unowned Cogl.Texture get_layer_texture (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_s (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_t (int layer_index);
++		[Version (since = "2.0")]
++		public int get_n_layers ();
++		[Version (since = "2.0")]
++		public bool get_per_vertex_point_size ();
++		[Version (since = "2.0")]
++		public float get_point_size ();
++		[Version (since = "2.0")]
++		public int get_uniform_location (string uniform_name);
++		[Version (since = "2.0")]
++		public unowned Cogl.Handle get_user_program ();
++		[Version (since = "1.10")]
++		public void remove_layer (int layer_index);
++		[Version (since = "2.0")]
++		public void set_alpha_test_function (Cogl.PipelineAlphaFunc alpha_func, float alpha_reference);
++		[Version (since = "2.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (since = "2.0")]
++		public void set_color (Cogl.Color color);
++		[Version (since = "2.0")]
++		public void set_color4f (float red, float green, float blue, float alpha);
++		[Version (since = "2.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "2.0")]
++		public void set_cull_face_mode (Cogl.PipelineCullFaceMode cull_face_mode);
++		[Version (since = "2.0")]
++		public void set_front_face_winding (Cogl.Winding front_winding);
++		[Version (since = "2.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (since = "1.10")]
++		public void set_layer_filters (int layer_index, Cogl.PipelineFilter min_filter, Cogl.PipelineFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		public void set_layer_max_mipmap_level (int layer, int max_level);
++		[Version (since = "1.10")]
++		public void set_layer_null_texture (int layer_index);
++		[Version (since = "2.0")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		public void set_layer_texture (int layer_index, Cogl.Texture texture);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_s (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_t (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public bool set_per_vertex_point_size (bool enable) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_point_size (float point_size);
++		[Version (since = "2.0")]
++		public void set_uniform_1f (int uniform_location, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_1i (int uniform_location, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_float (int uniform_location, int n_components, int count, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_int (int uniform_location, int n_components, int count, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_matrix (int uniform_location, int dimensions, int count, bool transpose, float value);
++		[Version (since = "2.0")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Compact]
++	public class PixelBuffer : Cogl.Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	[Compact]
++	public class Program : Cogl.Handle {
++		[CCode (cname = "cogl_create_program", has_construct_function = false, type = "CoglHandle*")]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class Scanout {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	[Compact]
++	public class Shader : Cogl.Handle {
++		[CCode (cname = "cogl_create_shader", has_construct_function = false, type = "CoglHandle*")]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d", type_id = "cogl_texture_2d_get_gtype ()")]
++	public class Texture2D : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2D ();
++		public void egl_image_external_alloc_finish (void* user_data, GLib.DestroyNotify destroy);
++		public void egl_image_external_bind ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Texture2D.from_bitmap (Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d_sliced", type_id = "cogl_texture_2d_sliced_get_gtype ()")]
++	public class Texture2DSliced : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2DSliced ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.16")]
++		public Texture2DSliced.from_bitmap (Cogl.Bitmap bmp, int max_waste);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	[Compact]
++	public class VertexBuffer : Cogl.Handle {
++		[CCode (has_construct_function = false, type = "CoglHandle*")]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void @delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, Cogl.VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class VertexBufferIndices : Cogl.Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_texture_get_gtype ()")]
++	public interface Texture : Cogl.Object {
++		public bool allocate () throws GLib.Error;
++		public static uint32 error_quark ();
++		[Version (since = "1.18")]
++		public Cogl.TextureComponents get_components ();
++		public int get_data (Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[]? data);
++		public bool get_gl_texture (out uint out_gl_handle, out uint out_gl_target);
++		public uint get_height ();
++		public int get_max_waste ();
++		[Version (since = "1.18")]
++		public bool get_premultiplied ();
++		public uint get_width ();
++		public bool is_sliced ();
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++		public static Cogl.Texture new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.2")]
++		public Cogl.Texture new_from_sub_texture (int sub_x, int sub_y, int sub_width, int sub_height);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (since = "1.18")]
++		public void set_components (Cogl.TextureComponents components);
++		public bool set_data (Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uint8[] data, int level) throws GLib.Error;
++		[Version (since = "1.18")]
++		public void set_premultiplied (bool premultiplied);
++		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (since = "1.8")]
++		public bool set_region_from_bitmap (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[SimpleType]
++	public struct Angle : int32 {
++	}
++	[BooleanType]
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[GIR (name = "Bool")]
++	[SimpleType]
++	public struct Bool : bool {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.0")]
++	public struct Color {
++		[CCode (has_construct_function = false, type = "CoglColor*")]
++		public Color ();
++		public Cogl.Color? copy ();
++		public void free ();
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public float get_alpha ();
++		public uint8 get_alpha_byte ();
++		public float get_alpha_float ();
++		public float get_blue ();
++		public uint8 get_blue_byte ();
++		public float get_blue_float ();
++		public float get_green ();
++		public uint8 get_green_byte ();
++		public float get_green_float ();
++		public float get_red ();
++		public uint8 get_red_byte ();
++		public float get_red_float ();
++		[Version (since = "1.4")]
++		public void init_from_4f (float red, float green, float blue, float alpha);
++		[Version (since = "1.4")]
++		public void init_from_4fv (float color_array);
++		[Version (since = "1.4")]
++		public void init_from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public void premultiply ();
++		[Version (since = "1.4")]
++		public void set_alpha (float alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_byte (uint8 alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_float (float alpha);
++		[Version (since = "1.4")]
++		public void set_blue (float blue);
++		[Version (since = "1.4")]
++		public void set_blue_byte (uint8 blue);
++		[Version (since = "1.4")]
++		public void set_blue_float (float blue);
++		[Version (since = "1.4")]
++		public void set_green (float green);
++		[Version (since = "1.4")]
++		public void set_green_byte (uint8 green);
++		[Version (since = "1.4")]
++		public void set_green_float (float green);
++		[Version (since = "1.4")]
++		public void set_red (float red);
++		[Version (since = "1.4")]
++		public void set_red_byte (uint8 red);
++		[Version (since = "1.4")]
++		public void set_red_float (float red);
++		[Version (since = "1.16")]
++		public void to_hsl (out float hue, out float saturation, out float luminance);
++		[Version (since = "1.4")]
++		public void unpremultiply ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.8")]
++	public struct DebugObjectTypeInfo {
++		public weak string name;
++		public ulong instance_count;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_MATRIX")]
++	public struct Matrix {
++		[CCode (array_length = false, array_null_terminated = false, cname = "cogl_matrix_init_from_array")]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.16")]
++	public struct OnscreenDirtyInfo {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	public struct TextureVertex {
++		public float x;
++		public float y;
++		public float z;
++		public float tx;
++		public float ty;
++		public Cogl.Color color;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.4")]
++	public struct UserDataKey {
++		public int unused;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglColorSizeCheck", has_type_id = false)]
++	public struct _ColorSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglColor_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglTextureVertexSizeCheck", has_type_id = false)]
++	public struct _TextureVertexSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglTextureVertex_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum AttributeType {
++		BYTE,
++		UNSIGNED_BYTE,
++		SHORT,
++		UNSIGNED_SHORT,
++		FLOAT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BITMAP_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum BitmapError {
++		FAILED,
++		UNKNOWN_TYPE,
++		CORRUPT_IMAGE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BLEND_STRING_ERROR_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum BlendStringError {
++		PARSE_ERROR,
++		ARGUMENT_PARSE_ERROR,
++		INVALID_ERROR,
++		GPU_UNSUPPORTED_ERROR;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_BIT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum BufferBit {
++		COLOR,
++		DEPTH,
++		STENCIL
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum BufferTarget {
++		WINDOW_BUFFER,
++		OFFSCREEN_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false)]
++	public enum DepthTestFunction {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_EGL_IMAGE_FLAG_", has_type_id = false)]
++	[Flags]
++	public enum EglImageFlags {
++		NONE,
++		NO_GET_DATA
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FEATURE_ID_", has_type_id = false)]
++	[Version (since = "1.10")]
++	public enum FeatureID {
++		[CCode (cname = "COGL_FEATURE_ID_UNSIGNED_INT_INDICES")]
++		OGL_FEATURE_ID_UNSIGNED_INT_INDICES,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_READ")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
++		[CCode (cname = "COGL_FEATURE_ID_FENCE")]
++		OGL_FEATURE_ID_FENCE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_RG")]
++		OGL_FEATURE_ID_TEXTURE_RG,
++		[CCode (cname = "COGL_FEATURE_ID_BUFFER_AGE")]
++		OGL_FEATURE_ID_BUFFER_AGE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL")]
++		OGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
++		[CCode (cname = "COGL_FEATURE_ID_BLIT_FRAMEBUFFER")]
++		OGL_FEATURE_ID_BLIT_FRAMEBUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FILTER_", has_type_id = false)]
++	public enum FilterReturn {
++		CONTINUE,
++		REMOVE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAME_EVENT_", has_type_id = false)]
++	[Version (since = "1.14")]
++	public enum FrameEvent {
++		SYNC,
++		COMPLETE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAMEBUFFER_ERROR_", has_type_id = false)]
++	public enum FramebufferError {
++		[CCode (cname = "COGL_FRAMEBUFFER_ERROR_ALLOCATE")]
++		FRAMEBUFFER_ERROR_ALLOCATE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_GRAPHICS_RESET_STATUS_", has_type_id = false)]
++	public enum GraphicsResetStatus {
++		NO_ERROR,
++		GUILTY_CONTEXT_RESET,
++		INNOCENT_CONTEXT_RESET,
++		UNKNOWN_CONTEXT_RESET,
++		PURGED_CONTEXT_RESET
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false)]
++	public enum IndicesType {
++		BYTE,
++		SHORT,
++		INT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false)]
++	public enum MaterialAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false)]
++	public enum MaterialFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum MaterialWrapMode {
++		REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_ALPHA_FUNC_", has_type_id = false)]
++	public enum PipelineAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_CULL_FACE_MODE_", has_type_id = false)]
++	public enum PipelineCullFaceMode {
++		NONE,
++		FRONT,
++		BACK,
++		BOTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_FILTER_", has_type_id = false)]
++	public enum PipelineFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "2.0")]
++	public enum PipelineWrapMode {
++		REPEAT,
++		MIRRORED_REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum PixelFormat {
++		ANY,
++		A_8,
++		RGB_565,
++		RGBA_4444,
++		RGBA_5551,
++		YUV,
++		G_8,
++		RG_88,
++		RGB_888,
++		BGR_888,
++		RGBA_8888,
++		BGRA_8888,
++		ARGB_8888,
++		ABGR_8888,
++		RGBA_1010102,
++		BGRA_1010102,
++		ARGB_2101010,
++		ABGR_2101010,
++		RGBA_FP_16161616,
++		BGRA_FP_16161616,
++		ARGB_FP_16161616,
++		ABGR_FP_16161616,
++		RGBA_8888_PRE,
++		BGRA_8888_PRE,
++		ARGB_8888_PRE,
++		ABGR_8888_PRE,
++		RGBA_4444_PRE,
++		RGBA_5551_PRE,
++		RGBA_1010102_PRE,
++		BGRA_1010102_PRE,
++		ARGB_2101010_PRE,
++		ABGR_2101010_PRE,
++		RGBA_FP_16161616_PRE,
++		BGRA_FP_16161616_PRE,
++		ARGB_FP_16161616_PRE,
++		ABGR_FP_16161616_PRE,
++		DEPTH_16,
++		DEPTH_32,
++		DEPTH_24_STENCIL_8;
++		public int get_bytes_per_pixel (int plane);
++		public int get_n_planes ();
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum ReadPixelsFlags {
++		[CCode (cname = "COGL_READ_PIXELS_COLOR_BUFFER")]
++		READ_PIXELS_COLOR_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_RENDERER_ERROR_", has_type_id = false)]
++	public enum RendererError {
++		XLIB_DISPLAY_OPEN,
++		BAD_CONSTRAINT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SHADER_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum ShaderType {
++		VERTEX,
++		FRAGMENT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_STEREO_", has_type_id = false)]
++	public enum StereoMode {
++		BOTH,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SYSTEM_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum SystemError {
++		UNSUPPORTED,
++		NO_MEMORY
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_COMPONENTS_", has_type_id = false)]
++	[Version (since = "1.18")]
++	public enum TextureComponents {
++		A,
++		RG,
++		RGB,
++		RGBA,
++		DEPTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_ERROR_", has_type_id = false)]
++	[Version (since = "1.8")]
++	public enum TextureError {
++		SIZE,
++		FORMAT,
++		BAD_PARAMETER,
++		TYPE;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum TextureFlags {
++		NONE,
++		NO_AUTO_MIPMAP,
++		NO_SLICING,
++		NO_ATLAS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_VERTICES_MODE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum VerticesMode {
++		POINTS,
++		LINES,
++		LINE_LOOP,
++		LINE_STRIP,
++		TRIANGLES,
++		TRIANGLE_STRIP,
++		TRIANGLE_FAN
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINDING_", has_type_id = false)]
++	public enum Winding {
++		CLOCKWISE,
++		COUNTER_CLOCKWISE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINSYS_FEATURE_", has_type_id = false)]
++	public enum WinsysFeature {
++		MULTIPLE_ONSCREEN,
++		VBLANK_COUNTER,
++		VBLANK_WAIT,
++		TEXTURE_FROM_PIXMAP,
++		SWAP_BUFFERS_EVENT,
++		SWAP_REGION,
++		SWAP_REGION_THROTTLE,
++		SWAP_REGION_SYNCHRONIZED,
++		BUFFER_AGE,
++		SYNC_AND_COMPLETE_EVENT,
++		N_FEATURES
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SCANOUT_ERROR_")]
++	public errordomain ScanoutError {
++		[CCode (cname = "COGL_SCANOUT_ERROR_INHIBITED")]
++		SCANOUT_ERROR_INHIBITED;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "1.8")]
++	public delegate void DebugObjectForeachTypeCallback (Cogl.DebugObjectTypeInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "0.10")]
++	public delegate void FeatureCallback (Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 3.9)]
++	[Version (since = "1.14")]
++	public delegate void FrameCallback (Cogl.Onscreen onscreen, Cogl.FrameEvent event, Cogl.FrameInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "1.16")]
++	public delegate void OnscreenDirtyCallback (Cogl.Onscreen onscreen, Cogl.OnscreenDirtyInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "2.0")]
++	public delegate bool PipelineLayerCallback (Cogl.Pipeline pipeline, int layer_index);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	public delegate bool Texture2DEGLImageExternalAlloc (Cogl.Texture2D tex_2d) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h", has_target = false)]
++	public delegate void UserDataDestroyCallback (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_AFIRST_BIT")]
++	public const int AFIRST_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_A_BIT")]
++	public const int A_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_BGR_BIT")]
++	public const int BGR_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_DEPTH_BIT")]
++	public const int DEPTH_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PIXEL_FORMAT_MAX_PLANES")]
++	public const int PIXEL_FORMAT_MAX_PLANES;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PREMULT_BIT")]
++	public const int PREMULT_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_STENCIL_BIT")]
++	public const int STENCIL_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_TEXTURE_MAX_WASTE")]
++	public const int TEXTURE_MAX_WASTE;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool blit_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Framebuffer dst, int src_x, int src_y, int dst_x, int dst_y, int width, int height) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool clutter_winsys_has_feature_CLUTTER (Cogl.WinsysFeature feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool color_equal (void* v1, void* v2);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.16")]
++	public static void color_init_from_hsl (out Cogl.Color color, float hue, float saturation, float luminance);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_program ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_shader (Cogl.ShaderType shader_type);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_foreach_type (Cogl.DebugObjectForeachTypeCallback func);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_print_instances ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static void flush ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static void foreach_feature (Cogl.Context context, Cogl.FeatureCallback callback);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_backface_culling_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.14")]
++	public static int64 get_clock_time (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_depth_test_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static Cogl.GraphicsResetStatus get_graphics_reset_status (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static GLib.Callback get_proc_address (string s);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool has_feature (Cogl.Context context, Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool is_bitmap (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_context (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_frame_info (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_framebuffer (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_pipeline (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_program (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_shader (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture_2d (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_texture_2d_sliced (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_attach_shader (Cogl.Handle program_handle, Cogl.Handle shader_handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static int program_get_uniform_location (Cogl.Handle handle, string uniform_name);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_link (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1f (Cogl.Handle program, int uniform_location, float value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1i (Cogl.Handle program, int uniform_location, int value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_float (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_int (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] int[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_matrix (Cogl.Handle program, int uniform_location, int dimensions, bool transpose, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_backface_culling_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_depth_test_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_disabled_on_thread (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread (void* data, string group, string filename);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread_with_fd (void* data, string group, int fd);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static Cogl.ShaderType shader_get_type (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void shader_source (Cogl.Handle shader, string source);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++	public static Cogl.Texture texture_new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++}
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 5f9833ca9cbf..e989feaea31e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.5.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

From e0e039465742403b4f29372e3b6626076ceb9df6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 9 Apr 2021 22:46:46 +0200
Subject: [PATCH 143/404] linux*: don't use front LED as hdd LED on apple/ppc32
 + refresh

Closes https://github.com/void-ppc/void-packages/pull/48
---
 srcpkgs/linux4.14/files/ppc-dotconfig |  4 ++--
 srcpkgs/linux4.19/files/ppc-dotconfig |  7 +++----
 srcpkgs/linux4.4/files/ppc-dotconfig  |  3 ++-
 srcpkgs/linux4.9/files/ppc-dotconfig  |  2 +-
 srcpkgs/linux5.10/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.11/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.4/files/ppc-dotconfig  | 13 +++----------
 7 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 9e68df353c07..69ea5d411540 100644
--- a/srcpkgs/linux4.14/files/ppc-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.217 Kernel Configuration
+# Linux/powerpc 4.14.225 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -2082,7 +2082,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index a84d0bbe95c0..489d1fbb5b32 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.169 Kernel Configuration
+# Linux/powerpc 4.19.185 Kernel Configuration
 #
 
 #
@@ -540,9 +540,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -2099,7 +2098,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index 396b70bc042b..28549f49431f 100644
--- a/srcpkgs/linux4.4/files/ppc-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.253 Kernel Configuration
+# Linux/powerpc 4.4.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -441,6 +441,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9039011c89a2..7a95057509e2 100644
--- a/srcpkgs/linux4.9/files/ppc-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.253 Kernel Configuration
+# Linux/powerpc 4.9.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 49cfd6e6f5d1..32cef8a304dc 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.10 Kernel Configuration
+# Linux/powerpc 5.10.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -532,7 +531,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1654,7 +1652,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2255,7 +2252,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3858,7 +3855,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5937,7 +5933,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7009,7 +7004,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
diff --git a/srcpkgs/linux5.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
index a15dc18fb3f6..9d3e11bd0511 100644
--- a/srcpkgs/linux5.11/files/ppc-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.11.2 Kernel Configuration
+# Linux/powerpc 5.11.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -1656,7 +1655,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2260,7 +2258,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3861,7 +3859,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5950,7 +5947,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7034,7 +7030,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
@@ -7857,7 +7852,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 857125d15a5d..f16d80306325 100644
--- a/srcpkgs/linux5.4/files/ppc-dotconfig
+++ b/srcpkgs/linux5.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.108 Kernel Configuration
+# Linux/powerpc 5.4.110 Kernel Configuration
 #
 
 #
@@ -522,12 +522,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -2214,7 +2210,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -6959,9 +6955,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

From 4594bc2640161845e042b8617e52d6bc1d645bf9 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:07:01 +0200
Subject: [PATCH 144/404] libguestfs: update to 1.44.1.

---
 srcpkgs/libguestfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8fd4f17921af..b3df393d76e0 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,6 +1,6 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.44.0
+version=1.44.1
 revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license=" GPL-2.0-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
+checksum=72b7dcdd32da1c17c932cf5a0a70b3bd68bc93e94828ad66a539f2e616adb025
 
 conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.conf

From 666a2f1ba7def702ea9c2abcc2d031c68517da60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:15:23 +0200
Subject: [PATCH 145/404] vagrant: update to 2.2.15.

---
 srcpkgs/vagrant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 77b3ae8889ac..c7f3cdcd2de9 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.10
+version=2.2.15
 revision=1
 archs="i686 x86_64*"
 hostmakedepends="ruby"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=722db22b431c68030e046c7c6c90629763d86a2473caa0fe8834d5742a91941f
+checksum=98c9c726d5cb7e46793b4505f3d907b2a0673e0f6e43997c218a0be5330cc83f
 nocross=yes
 
 post_extract() {

From 077f89d2fd15ebe68f6d6d250a31d2b9582edc56 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:11 +0200
Subject: [PATCH 146/404] pinktrace: update to 0.9.6.

---
 srcpkgs/pinktrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 0759732f55aa..235d2f97454a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -1,6 +1,6 @@
 # Template file for 'pinktrace'
 pkgname=pinktrace
-version=0.9.3
+version=0.9.6
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/pinktrace/"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=260fba87c3c1d8a296295bab9ddaf9ff393f5c961ee7567f86fb5751d9f7a125
+checksum=5d2670607f70da397c6da06fbb1844020b44b63c8aea8a725771aac02235b27a
 
 pre_configure() {
 	./autogen.sh

From 1e8c8c1c9637784caaf28fc86b6b6f055e6838cf Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:33 +0200
Subject: [PATCH 147/404] sydbox: update to 1.1.0.

---
 srcpkgs/sydbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index e9f043c0678f..ffaabf73d2de 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,6 +1,6 @@
 # Template file for 'sydbox'
 pkgname=sydbox
-version=1.0.8
+version=1.1.0
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=237dd9765ba869698e8d2c3a170857081a0569a042e3f0f581c28f0abd0f4b2b
+checksum=765fd5ce4b3a48270c7ea7b8b3d0dbf43f103ce0214c1ae7126579310f571bd2
 python_version=2 #unverified
 
 # seccomp only implemented on x86

From 3f4caaf90ac38fa91e70d0da7b589170fa52fc44 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 19:27:46 +0300
Subject: [PATCH 148/404] libmatroska: update to 1.6.3, - project uses github
 for the official git repos, changing distfiles to github to take advantage, -
 change homepage, - adjust wrksrc.

---
 srcpkgs/libmatroska/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index b569bbd4dd01..5385183627d2 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -1,16 +1,17 @@
 # Template file for 'libmatroska'
 pkgname=libmatroska
-version=1.6.2
+version=1.6.3
 revision=1
+wrksrc="${pkgname}-release-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://dl.matroska.org/downloads/libmatroska/"
-distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
-checksum=bc4479aa8422ab07643df6a1fa5a19e4bed4badfd41ca77e081628620d1e1990
+homepage="https://www.matroska.org/downloads/libraries.html"
+distfiles="https://github.com/Matroska-Org/libmatroska/archive/refs/tags/release-${version}.tar.gz"
+checksum=0c8c875ae26ac69a722f7fd0f4a4fecb4fdff681f2a165f09c06a40cbf1d0de6
 
 libmatroska-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From bb398afb19477aee803cbddc5c2c8ff4a78d210c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:22:10 +0300
Subject: [PATCH 149/404] mk-configure: update to 0.37.0.

---
 srcpkgs/mk-configure/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index dad5f0e0e21f..b7c019b828d3 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,6 +1,6 @@
 # Template file for 'mk-configure'
 pkgname=mk-configure
-version=0.36.0
+version=0.37.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -10,20 +10,28 @@ make_install_args="${make_build_args} MANDIR=/usr/share/man"
 make_check_target="test"
 hostmakedepends="bmake bmkdep tar texinfo"
 depends="bmake bmkdep"
-checkdepends="automake glib-devel groff pkg-config bison flex"
+checkdepends="automake glib-devel groff pkg-config bison flex libbsd-devel"
 short_desc="Lightweight replacement for GNU autotools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/cheusov/mk-configure/"
 distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=48188e9305b7b1e2f81d3a70e0af1112affa8a7871b01335b86829ffed746177
+checksum=7aff2a94b66c5b0d622665af561d3474e321d7c42f8c1e4a274e290b43da26ea
 disable_parallel_build=yes
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		checkdepends+=" musl-fts-devel"
+esac
+
+
 post_extract() {
 	rm -r tests/pkg_config_2  # different wording
 	rm -r tests/*lua*
 	rm -r examples/*lua*
 	rm -r examples/*lex*
+	rm -r tests/test_subprj_dash
+	rm -r tests/test_mkc_vs_*
 	vsed -i -e 's/-Wabi//g' mk/mkc_imp.platform.sys.mk
 }
 pre_build() {
@@ -31,10 +39,6 @@ pre_build() {
 }
 pre_check() {
 	unset CC CFLAGS CXXFLAGS
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i 's|Cannot allocate|Out of|g' examples/hello_errwarn/expect.out ;;
-	esac
 }
 post_install() {
 	vlicense doc/LICENSE

From 8d61ed2476b04983fcef40f7d6218dccbd3adf15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 23:58:28 -0300
Subject: [PATCH 150/404] pinktrace: restrict arch list to supported platforms.

This has the side effect of disabling the build for aarch64, which was
previously not restricted in the template but wasn't available in repos
anyway (builder scheduling issues led to it not being noticed).
---
 srcpkgs/pinktrace/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 235d2f97454a..3fbb5a48a58a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -2,6 +2,8 @@
 pkgname=pinktrace
 version=0.9.6
 revision=1
+# arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
+archs="x86_64* i686* ppc* arm*"
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
 configure_args="--enable-python"

From bbc3f0cf18361353b459233873a0c0d816ef4cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 00:09:29 -0300
Subject: [PATCH 151/404] libguestfs: mark broken on musl.

Our musl-legacy-compat package should provide static inline versions of
error(3), but it's erroring out during linking:

/usr/bin/ld: ../lib/.libs/libguestfs.so: undefined reference to `error'
collect2: error: ld returned 1 exit status
---
 srcpkgs/libguestfs/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index b3df393d76e0..81afe313d203 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -30,6 +30,9 @@ conf_files="etc/libguestfs-tools.conf
 
 nocross=yes
 archs="i686* x86_64* ppc64le*"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/35666/steps/shell_3/logs/stdio"
+fi
 
 build_options="ruby python go php lua fuse"
 build_options_default="ruby fuse"

From 3db3f998e3608aa9f98f91bc26ce5fd6c49ac252 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 08:19:44 +0200
Subject: [PATCH 152/404] evolution: provide libevolution-mail-formatter.so

---
 srcpkgs/evolution/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index f3b3656921bb..4ccbb8149d14 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.40.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
@@ -21,7 +21,7 @@ changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
- libevolution-mail.so libevolution-shell.so"
+ libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel

From fb77406cad9ef2232bdf65ec9833dc9bda913df1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:38:48 +0200
Subject: [PATCH 153/404] gwenhywfar: update to 5.6.0.

---
 srcpkgs/gwenhywfar/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index 89adfe051249..c6e01f4bea86 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,9 +1,9 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
-version=5.4.0
-revision=2
+version=5.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-visibility --disable-binreloc
+configure_args="--disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"
 hostmakedepends="automake pkg-config libgcrypt-devel libtool which"
 makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/aqbanking/gwenhywfar"
 distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz"
-checksum=e46c3450d610b36f51b46ab97640ae340e8b68850f03b23b98c4ab682a5027c0
+checksum=9f2876770824a283d02fd730bb1f7a98970fa6f20121f4af433d6698831c3a84
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 1fca76dcc3012607b803837bec415e9932264100 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:51:18 +0200
Subject: [PATCH 154/404] aqbanking: update to 6.2.10.

---
 srcpkgs/aqbanking/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index 3d2289d73684..cf453189601c 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,6 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-version=6.2.5
+version=6.2.10
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar tar"
@@ -9,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="https://www.aquamaniac.de/rdm/attachments/download/342/${pkgname}-${version}.tar.gz"
-checksum=cf5b060e3ec7e3fc925687caf044d4df3dbf9595f23c4fe8ffad78f44af0d6df
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/368/${pkgname}-${version}.tar.gz"
+checksum=78435ff3211353e24791e2f96943c82949c48aef3704f5b57d09f08a4abcab8d
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then

From b64869e60104a14730ad2ddfad70af251a10192c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 10:59:30 +0200
Subject: [PATCH 155/404] wesnoth: update to 1.14.16.

---
 srcpkgs/wesnoth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 7b9b5bd64a0b..e79d37bf6b34 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.14.13
-revision=3
+version=1.14.16
+revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
@@ -14,7 +14,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=3824a6c2828a866ede7caab81287382d5e95969e240d9e22364500a83291b8de
+checksum=0f52d427e2fb58f4d1961847be4e3564a3c4ad78190042b6d04f83cedac030b5
 replaces="wesnoth-data>=0"
 
 post_install() {

From 4d2b9e43d96d9bfcfc0bc1939de6ce6804d5291a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 14:58:48 +0200
Subject: [PATCH 156/404] linux5.10: update to 5.10.29.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e283aa86771c..1159ae5b9639 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.28
+version=5.10.29
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=4dfc3aea719556e63e90b8692e9d4b779ad1cb2a9a4823bf721e30004e7ac354
+checksum=158c6746c11a90645b4d40bdb5c049d9fac7e4c9ed381c9b7aa94db1a8e7e9ec
 python_version=3
 patch_args="-Np1"
 

From 0a3f1deb4dcfa1e5e8a24f4ede2d989eaafd61af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 15:40:30 +0200
Subject: [PATCH 157/404] New package: vala-language-server-0.48.1

---
 srcpkgs/vala-language-server/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/vala-language-server/template

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
new file mode 100644
index 000000000000..870fe215fb92
--- /dev/null
+++ b/srcpkgs/vala-language-server/template
@@ -0,0 +1,13 @@
+# Template file for 'vala-language-server'
+pkgname=vala-language-server
+version=0.48.1
+revision=1
+build_style=meson
+hostmakedepends="gettext pkg-config vala"
+makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"
+short_desc="Code Intelligence for Vala & Genie"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-3.0-only"
+homepage="https://github.com/benwaffle/vala-language-server"
+distfiles="https://github.com/benwaffle/$pkgname/archive/refs/tags/$version.tar.gz"
+checksum=d752f7aa9fad94d1d34e99038be312528c5808e6c0132bc91df2a8ce670cff45

From d455796ed5b012b1b2e58eea776918a2e817aaa6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 11:32:03 +0200
Subject: [PATCH 158/404] =?UTF-8?q?srcpkgs:=20remove=20pullmoll=20from=20m?=
 =?UTF-8?q?aintainers=20field.=20=F0=9F=98=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set them to Orphaned for now.

If you'd like to pick up a package, feel free.
---
 srcpkgs/CoinMP/template                      | 2 +-
 srcpkgs/Maelstrom/template                   | 2 +-
 srcpkgs/MonkeysAudio/template                | 2 +-
 srcpkgs/SDL2_net/template                    | 2 +-
 srcpkgs/SMC/template                         | 2 +-
 srcpkgs/TSC/template                         | 2 +-
 srcpkgs/WiringPi/template                    | 2 +-
 srcpkgs/Z80Explorer/template                 | 2 +-
 srcpkgs/actiona/template                     | 2 +-
 srcpkgs/aisleriot/template                   | 2 +-
 srcpkgs/apulse/template                      | 2 +-
 srcpkgs/assimp/template                      | 2 +-
 srcpkgs/assimp_qt_viewer/template            | 2 +-
 srcpkgs/astromenace/template                 | 2 +-
 srcpkgs/atomix/template                      | 2 +-
 srcpkgs/avidemux/template                    | 2 +-
 srcpkgs/axel/template                        | 2 +-
 srcpkgs/bcal/template                        | 2 +-
 srcpkgs/bcunit/template                      | 2 +-
 srcpkgs/boinc/template                       | 2 +-
 srcpkgs/botan/template                       | 2 +-
 srcpkgs/broadcom-bt-firmware/template        | 2 +-
 srcpkgs/cbang/template                       | 2 +-
 srcpkgs/cegui/template                       | 2 +-
 srcpkgs/cegui07/template                     | 2 +-
 srcpkgs/choqok/template                      | 2 +-
 srcpkgs/ckmame/template                      | 2 +-
 srcpkgs/clamav/template                      | 2 +-
 srcpkgs/cld2/template                        | 2 +-
 srcpkgs/codeblocks/template                  | 2 +-
 srcpkgs/cpp-hocon/template                   | 2 +-
 srcpkgs/cross-i686-linux-musl/template       | 2 +-
 srcpkgs/cross-i686-pc-linux-gnu/template     | 2 +-
 srcpkgs/cross-powerpc64-linux-gnu/template   | 2 +-
 srcpkgs/cubietruck-base/template             | 2 +-
 srcpkgs/devil/template                       | 2 +-
 srcpkgs/dialogbox/template                   | 2 +-
 srcpkgs/dm-zoned-tools/template              | 2 +-
 srcpkgs/enigma/template                      | 2 +-
 srcpkgs/ent/template                         | 2 +-
 srcpkgs/fah/template                         | 2 +-
 srcpkgs/fbida/template                       | 2 +-
 srcpkgs/ffmpegthumbnailer/template           | 2 +-
 srcpkgs/firebird3/template                   | 2 +-
 srcpkgs/firefox-esr-i18n/template            | 2 +-
 srcpkgs/firefox-esr/template                 | 2 +-
 srcpkgs/five-or-more/template                | 2 +-
 srcpkgs/flexprop/template                    | 2 +-
 srcpkgs/flightgear/template                  | 2 +-
 srcpkgs/four-in-a-row/template               | 2 +-
 srcpkgs/freedroidRPG/template                | 2 +-
 srcpkgs/freeimage/template                   | 2 +-
 srcpkgs/freerouting/template                 | 2 +-
 srcpkgs/gconfmm/template                     | 2 +-
 srcpkgs/gdash/template                       | 2 +-
 srcpkgs/geda/template                        | 2 +-
 srcpkgs/gifsicle/template                    | 2 +-
 srcpkgs/glyphy/template                      | 2 +-
 srcpkgs/gnome-chess/template                 | 2 +-
 srcpkgs/gnome-icon-theme-xfce/template       | 2 +-
 srcpkgs/gnome-klotski/template               | 2 +-
 srcpkgs/gnome-mahjongg/template              | 2 +-
 srcpkgs/gnome-mines/template                 | 2 +-
 srcpkgs/gnome-nibbles/template               | 2 +-
 srcpkgs/gnome-robots/template                | 2 +-
 srcpkgs/gnome-sudoku/template                | 2 +-
 srcpkgs/gnome-tetravex/template              | 2 +-
 srcpkgs/gnurobbo/template                    | 2 +-
 srcpkgs/grub-customizer/template             | 2 +-
 srcpkgs/grub-terminus/template               | 2 +-
 srcpkgs/hitori/template                      | 2 +-
 srcpkgs/iagno/template                       | 2 +-
 srcpkgs/icu4lua/template                     | 2 +-
 srcpkgs/iniparser/template                   | 2 +-
 srcpkgs/injeqt/template                      | 2 +-
 srcpkgs/iselect/template                     | 2 +-
 srcpkgs/javahelp2/template                   | 2 +-
 srcpkgs/json-c++/template                    | 2 +-
 srcpkgs/kea/template                         | 2 +-
 srcpkgs/kobodeluxe/template                  | 2 +-
 srcpkgs/leatherman/template                  | 2 +-
 srcpkgs/leptonica/template                   | 2 +-
 srcpkgs/libclc/template                      | 2 +-
 srcpkgs/libe-book/template                   | 2 +-
 srcpkgs/libepubgen/template                  | 2 +-
 srcpkgs/libfreehand/template                 | 2 +-
 srcpkgs/libgadu/template                     | 2 +-
 srcpkgs/libgdal/template                     | 2 +-
 srcpkgs/libgnome-games-support/template      | 2 +-
 srcpkgs/libgta/template                      | 2 +-
 srcpkgs/libixion/template                    | 2 +-
 srcpkgs/libnumbertext/template               | 2 +-
 srcpkgs/libomxil-bellagio/template           | 2 +-
 srcpkgs/libopenraw/template                  | 2 +-
 srcpkgs/liborcus/template                    | 2 +-
 srcpkgs/libqxp/template                      | 2 +-
 srcpkgs/libreoffice/template                 | 2 +-
 srcpkgs/libsidplayfp/template                | 2 +-
 srcpkgs/libsoxr/template                     | 2 +-
 srcpkgs/libtorrent-rasterbar-python/template | 2 +-
 srcpkgs/libtorrent-rasterbar/template        | 2 +-
 srcpkgs/libucontext/template                 | 2 +-
 srcpkgs/lightsoff/template                   | 2 +-
 srcpkgs/lightzone/template                   | 2 +-
 srcpkgs/linux-firmware-dvb/template          | 2 +-
 srcpkgs/loadp2/template                      | 2 +-
 srcpkgs/log4cplus/template                   | 2 +-
 srcpkgs/lollypop/template                    | 2 +-
 srcpkgs/lzf/template                         | 2 +-
 srcpkgs/mame/template                        | 2 +-
 srcpkgs/mmv/template                         | 2 +-
 srcpkgs/mog/template                         | 2 +-
 srcpkgs/mruby/template                       | 2 +-
 srcpkgs/musl-fts/template                    | 2 +-
 srcpkgs/musl-obstack/template                | 2 +-
 srcpkgs/musl-rpmatch/template                | 2 +-
 srcpkgs/mxml/template                        | 2 +-
 srcpkgs/nasm-doc/template                    | 2 +-
 srcpkgs/nasm/template                        | 2 +-
 srcpkgs/netbsd-rumpkernel/template           | 2 +-
 srcpkgs/notepadqq/template                   | 2 +-
 srcpkgs/nrg2iso/template                     | 2 +-
 srcpkgs/nyx/template                         | 2 +-
 srcpkgs/ois/template                         | 2 +-
 srcpkgs/opencollada/template                 | 2 +-
 srcpkgs/openlierox/template                  | 2 +-
 srcpkgs/openttd/template                     | 2 +-
 srcpkgs/opentyrian/template                  | 2 +-
 srcpkgs/osg/template                         | 2 +-
 srcpkgs/osmid/template                       | 2 +-
 srcpkgs/paprefs/template                     | 2 +-
 srcpkgs/parole/template                      | 2 +-
 srcpkgs/pcb/template                         | 2 +-
 srcpkgs/pcsc-ccid/template                   | 2 +-
 srcpkgs/pdmenu/template                      | 2 +-
 srcpkgs/perl-File-Rename/template            | 2 +-
 srcpkgs/pilot-link/template                  | 2 +-
 srcpkgs/pipenightdreams/template             | 2 +-
 srcpkgs/python3-pylast/template              | 2 +-
 srcpkgs/qbittorrent/template                 | 2 +-
 srcpkgs/qmmp/template                        | 2 +-
 srcpkgs/qoauth-qt5/template                  | 2 +-
 srcpkgs/qqwing/template                      | 2 +-
 srcpkgs/qrcodegen/template                   | 2 +-
 srcpkgs/qt5-styleplugins/template            | 2 +-
 srcpkgs/quadrapassel/template                | 2 +-
 srcpkgs/quake4/template                      | 2 +-
 srcpkgs/qupzilla/template                    | 2 +-
 srcpkgs/qxmpp/template                       | 2 +-
 srcpkgs/rocksndiamonds/template              | 2 +-
 srcpkgs/seabios/template                     | 2 +-
 srcpkgs/silly/template                       | 2 +-
 srcpkgs/simgear/template                     | 2 +-
 srcpkgs/spin2cpp/template                    | 2 +-
 srcpkgs/stk/template                         | 2 +-
 srcpkgs/swell-foop/template                  | 2 +-
 srcpkgs/tali/template                        | 2 +-
 srcpkgs/tesseract-ocr/template               | 2 +-
 srcpkgs/tinyclipboard/template               | 2 +-
 srcpkgs/toluapp/template                     | 2 +-
 srcpkgs/tracebox/template                    | 2 +-
 srcpkgs/tslib/template                       | 2 +-
 srcpkgs/ttyqr/template                       | 2 +-
 srcpkgs/twaindsm/template                    | 2 +-
 srcpkgs/ucpp/template                        | 2 +-
 srcpkgs/ufoai/template                       | 2 +-
 srcpkgs/vgmplay/template                     | 2 +-
 srcpkgs/vino/template                        | 2 +-
 srcpkgs/virtuoso/template                    | 2 +-
 srcpkgs/widelands-maps/template              | 2 +-
 srcpkgs/widelands/template                   | 2 +-
 srcpkgs/wildmidi/template                    | 2 +-
 srcpkgs/xerces-c/template                    | 2 +-
 srcpkgs/xf86-video-mga/template              | 2 +-
 srcpkgs/xfce4-plugins/template               | 2 +-
 srcpkgs/xnec2c/template                      | 2 +-
 srcpkgs/xsane/template                       | 2 +-
 srcpkgs/ytnef/template                       | 2 +-
 srcpkgs/zbar/template                        | 2 +-
 srcpkgs/zynaddsubfx/template                 | 2 +-
 180 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/srcpkgs/CoinMP/template b/srcpkgs/CoinMP/template
index 43d8cb3fa3b5..995353eee428 100644
--- a/srcpkgs/CoinMP/template
+++ b/srcpkgs/CoinMP/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="doxygen graphviz pkg-config"
 short_desc="Library that supports most of Coin CLP, CBC and CGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CPL-1.0"
 homepage="https://projects.coin-or.org/CoinMP"
 distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz"
diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 4cb1f301b4ec..7c4be8c13b2a 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool SDL2_net-devel"
 makedepends="SDL2_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/MonkeysAudio/template b/srcpkgs/MonkeysAudio/template
index 44bcf5ceaa7c..6b9f47eda5e6 100644
--- a/srcpkgs/MonkeysAudio/template
+++ b/srcpkgs/MonkeysAudio/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style="gnu-makefile"
 depends="libMAC>=${version}_${revision}"
 short_desc="Fast and powerful lossless audio (de)compressor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://monkeysaudio.com/"
 distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip
diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template
index 206372e2bb66..71d1b17af693 100644
--- a/srcpkgs/SDL2_net/template
+++ b/srcpkgs/SDL2_net/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel"
 short_desc="SDL2 networking module"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.libsdl.org/projects/SDL_net/"
 distfiles="https://www.libsdl.org/projects/SDL_net/release/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
index 6484c332d53f..d67469fc18a8 100644
--- a/srcpkgs/SMC/template
+++ b/srcpkgs/SMC/template
@@ -8,7 +8,7 @@ hostmakedepends="automake libtool gettext-devel pkg-config unzip"
 makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel
  SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Two-dimensional platform game similar to Super Mario"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.secretmaryo.org/"
 distfiles="
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index d4d636dabd56..71534315cf7c 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -13,7 +13,7 @@ makedepends="SFML-devel boost-devel cegui-devel devil-devel gettext-devel
  mruby"
 depends="mruby>=0"
 short_desc="OSS 2D platform game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.secretchronicles.org/"
 distfiles="https://ftp.secretchronicles.org/releases/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/WiringPi/template b/srcpkgs/WiringPi/template
index 243956c2bca0..be844c979a43 100644
--- a/srcpkgs/WiringPi/template
+++ b/srcpkgs/WiringPi/template
@@ -12,7 +12,7 @@ depends="libwiringPi-${version}_${revision}
  WiringPi-gpio-${version}_${revision}
  WiringPi-examples-${version}_${revision}"
 short_desc="GPIO Interface library for the Raspberry Pi"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://wiringpi.com/"
 distfiles="https://github.com/WiringPi/WiringPi/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index f11a0e970695..7e5be704ade7 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -7,7 +7,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools p7zip"
 makedepends="qt5-devel qt5-script-devel"
 short_desc="Visual Zilog Z-80 netlist-level simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gdevic/Z80Explorer"
 distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index e520d1eac996..6ce3ccdc6b41 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -9,7 +9,7 @@ makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel"
 depends="qt5-plugin-mysql"
 short_desc="Cross platform automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index a26d8c2f0cf0..e31845d7fe61 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/apulse/template b/srcpkgs/apulse/template
index 154ec778969e..160bd9aebaa2 100644
--- a/srcpkgs/apulse/template
+++ b/srcpkgs/apulse/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel glib-devel"
 short_desc="PulseAudio emulation for ALSA"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/i-rinat/apulse"
 distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index f521d3922e05..7d45161ede5d 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
 depends="libassimp>=${version}_${revision}"
 short_desc="Import library for various well-known 3D model formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template
index 11838e028ae0..6caa2b4c7f0e 100644
--- a/srcpkgs/assimp_qt_viewer/template
+++ b/srcpkgs/assimp_qt_viewer/template
@@ -9,7 +9,7 @@ build_wrksrc="${pkgname}"
 hostmakedepends="qt5-host-tools qt5-devel"
 makedepends="qt5-devel libassimp-devel"
 short_desc="Qt-Widget-based viewer for assimp"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/assimp/assimp_qt_viewer"
 distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index 5008426e40b2..b3217129293c 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
  fontconfig-devel freetype-devel libXinerama-devel"
 short_desc="Hardcore 3D space shooter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
 homepage="http://www.viewizard.com/"
 distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 392b68f995e6..a59e134ebd91 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 25747b767a8a..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -13,7 +13,7 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
  liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
 depends="python"
 short_desc="Video editing and processing application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 9fbfb8237b69..c8469ee809cc 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -7,7 +7,7 @@ conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
 makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template
index 3fbf97ccaf61..c2c34e650984 100644
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 makedepends="readline-devel"
 depends="bc"
 short_desc="Byte CALculator for storage conversions and calculations"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
diff --git a/srcpkgs/bcunit/template b/srcpkgs/bcunit/template
index 29a8171ae65d..445ae1a092a6 100644
--- a/srcpkgs/bcunit/template
+++ b/srcpkgs/bcunit/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-DENABLE_DOC=ON"
 short_desc="Lightweight unit tests in C"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/BelledonneCommunications/bcunit"
 distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index d3fde8b73b6b..1eba13495c2a 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -12,7 +12,7 @@ makedepends="glu-devel libfreeglut-devel libcurl-devel
 depends="curl ca-certificates"
 conf_files="/etc/default/boinc-client"
 short_desc="Berkely Infrastructure for Network Computing"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index ee196bbe4eec..d2e6ffb9ccda 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -8,7 +8,7 @@ pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
 makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 93314460c88b..fe83eb64d3c5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -6,7 +6,7 @@ _patch=_p1
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Broadcom"
 homepage="https://github.com/winterheart/broadcom-bt-firmware"
 distfiles="https://github.com/winterheart/broadcom-bt-firmware/archive/v${version}${_patch}.tar.gz"
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index c4b45f44f2e6..63388b2aa828 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
 openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/CauldronDevelopmentLLC/cbang"
 distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index e2a4be0f9a49..070fa66aff81 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -17,7 +17,7 @@ makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-deve
  $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
 short_desc="Crazy Eddie's Graphical User Interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index 24b148e75070..3fa7f80a2ea7 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -15,7 +15,7 @@ makedepends="boost-devel devil-devel freeimage-devel freetype-devel
  $(vopt_if python 'python-devel')"
 depends="cegui07-data"
 short_desc="Crazy Eddie's Graphical User Interface (0.7.x)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
diff --git a/srcpkgs/choqok/template b/srcpkgs/choqok/template
index 080e1d589e2d..75a2c16f63e0 100644
--- a/srcpkgs/choqok/template
+++ b/srcpkgs/choqok/template
@@ -7,7 +7,7 @@ hostmakedepends="extra-cmake-modules gettext pkg-config"
 makedepends="kcmutils-devel kdewebkit-devel kemoticons-devel knotifyconfig-devel
  kparts-devel qca-qt5-devel qt5-networkauth-devel qt5-devel purpose-devel telepathy-qt5-devel"
 short_desc="Twitter, Pump.io, GNU social client for KDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://choqok.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version%.*}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ckmame/template b/srcpkgs/ckmame/template
index 7140737d051e..1b88f6a965cb 100644
--- a/srcpkgs/ckmame/template
+++ b/srcpkgs/ckmame/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="libxml2-devel libzip-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Program to check ROM sets for MAME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-clause"
 homepage="https://nih.at/ckmame/"
 distfiles="https://github.com/nih-at/ckmame/archive/rel-${version//./-}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e65ed2c9ed8e..2dcc86015d9f 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -15,7 +15,7 @@ hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
  ncurses-devel pcre-devel tcl-devel"
 short_desc="Clam Anti-Virus scanner"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cld2/template b/srcpkgs/cld2/template
index 5c7b638f29fe..85999552be41 100644
--- a/srcpkgs/cld2/template
+++ b/srcpkgs/cld2/template
@@ -5,7 +5,7 @@ revision=1
 _gitrev=b56fa78a2fe44ac2851bae5bf4f4693a0644da7b
 wrksrc="${pkgname}-${_gitrev}"
 short_desc="Compact Language Detector 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/CLD2Owners/cld2"
 distfiles="https://github.com/CLD2Owners/cld2/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 43c9e4127a56..33b9b9a77853 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool pkg-config zip"
 makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
  gamin-devel boost-devel boost-build"
 short_desc="Free C, C++ and Fortran IDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://www.codeblocks.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template
index 181463376996..1e050aeb41aa 100644
--- a/srcpkgs/cpp-hocon/template
+++ b/srcpkgs/cpp-hocon/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel leatherman-devel libcurl-devel"
 depends="leatherman"
 short_desc="C++ port of the Typesafe Config library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/cpp-hocon/"
 distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6864371d1c83..4561bc7ff8b6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,7 +12,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index d63680b65726..263a43f7a7b8 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -11,7 +11,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index c99c7dd1e97a..35cfcaa6f02e 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -13,7 +13,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cubietruck-base/template b/srcpkgs/cubietruck-base/template
index fa80bb39bbc0..93dc21d8db3c 100644
--- a/srcpkgs/cubietruck-base/template
+++ b/srcpkgs/cubietruck-base/template
@@ -5,7 +5,7 @@ revision=2
 build_style=meta
 homepage="http://www.voidlinux.org"
 short_desc="Void Linux Cubietruck (Cubieboard 3) platform package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 
 archs="armv7l"
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 95bc542c6d6e..1dffc7bdd52c 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
  glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
 short_desc="Developer's Image Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="http://openil.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template
index bdf95c2ad451..31d985e61769 100644
--- a/srcpkgs/dialogbox/template
+++ b/srcpkgs/dialogbox/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
 short_desc="Scriptable engine with customizable GUI for shell scripts"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/martynets/dialogbox"
 distfiles="https://github.com/martynets/dialogbox/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dm-zoned-tools/template b/srcpkgs/dm-zoned-tools/template
index 2df918003a4f..d76e4cbe1834 100644
--- a/srcpkgs/dm-zoned-tools/template
+++ b/srcpkgs/dm-zoned-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="device-mapper-devel libblkid-devel libkmod-devel"
 short_desc="Userspace tool for the dm-zoned device mapper"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hgst/dm-zoned-tools/"
 distfiles="https://github.com/hgst/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index b913c6f514c6..d04fa5112492 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config"
 makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Puzzle game inspired by Oxyd on the Atari ST"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/enigma/"
 distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ent/template b/srcpkgs/ent/template
index 0505ecfbfa97..e8c50ee0681c 100644
--- a/srcpkgs/ent/template
+++ b/srcpkgs/ent/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Evaluate pseudo random number generators"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.fourmilab.ch/random/"
 distfiles="${homepage}/random.zip"
diff --git a/srcpkgs/fah/template b/srcpkgs/fah/template
index ad717b51f862..8fb277fef313 100644
--- a/srcpkgs/fah/template
+++ b/srcpkgs/fah/template
@@ -6,7 +6,7 @@ archs="x86_64"
 hostmakedepends="python"
 depends="python desktop-file-utils hicolor-icon-theme"
 short_desc="Folding@home distributed computation power for research"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary, GPL-2.0-only"
 homepage="https://foldingathome.org"
 distfiles="https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${version%.*}/fahclient_${version}_amd64.deb
diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 170baf031b71..347632343733 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -10,7 +10,7 @@ freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-de
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
 short_desc="Display and elementary edit images using fbdev"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e2..039eea7622b3 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
 depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dirkvdb/${pkgname}"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index df02ac1379c7..a84cc7ef9234 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -30,7 +30,7 @@ hostmakedepends="automake libtool pkg-config icu"
 makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 32724397ee39..5d62a9f8a99a 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -4,7 +4,7 @@ version=78.8.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 56c0ae7cb4bc..61f36d2058e8 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -18,7 +18,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
 depends="nss>=3.53 desktop-file-utils hicolor-icon-theme"
 short_desc="Firefox browser - Extended Support Release"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index eadab37b26af..bb137c32d42c 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel librsvg-devel libgee08-devel libgnome-games-support-devel"
 short_desc="GNOME align five or more objects game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/flexprop/template b/srcpkgs/flexprop/template
index 3b8ce55d3c82..4529640916df 100644
--- a/srcpkgs/flexprop/template
+++ b/srcpkgs/flexprop/template
@@ -6,7 +6,7 @@ hostmakedepends="loadp2 which"
 makedepends="tk-devel"
 depends="loadp2 tk xterm"
 short_desc="Simple GUI for creating applications on the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/flexprop/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 5313f97d0c5e..e5528205b9e0 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -12,7 +12,7 @@ makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
  $(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')"
 depends="flightgear-data>=${version}"
 short_desc="Sophisticated flight simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="
diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template
index b39ae1dc1850..cc6f458b44d4 100644
--- a/srcpkgs/four-in-a-row/template
+++ b/srcpkgs/four-in-a-row/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME four in a row game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Four-in-a-row"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template
index e3e7a01fd33c..9ed80a8b1267 100644
--- a/srcpkgs/freedroidRPG/template
+++ b/srcpkgs/freedroidRPG/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python"
 makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel
  libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel"
 short_desc="Role playing game featuring Tux and evil robots"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.freedroid.org/"
 distfiles="http://ftp.osuosl.org/pub/freedroid/${pkgname}-${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freeimage/template b/srcpkgs/freeimage/template
index d06403bfd747..c45052a67b17 100644
--- a/srcpkgs/freeimage/template
+++ b/srcpkgs/freeimage/template
@@ -6,7 +6,7 @@ wrksrc=FreeImage
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Support library for popular graphics image formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, FreeImage"
 homepage="http://freeimage.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 6c7655a9ea72..123cb60b2daf 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gconfmm/template b/srcpkgs/gconfmm/template
index 23995ac0bdaa..4411ea02ccae 100644
--- a/srcpkgs/gconfmm/template
+++ b/srcpkgs/gconfmm/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="GConf-devel glibmm-devel"
 short_desc="C++ bindings for GConf"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gconfmm.sourceforge.net"
 distfiles="${GNOME_SITE}/gconfmm/${version%.*}/gconfmm-${version}.tar.xz"
diff --git a/srcpkgs/gdash/template b/srcpkgs/gdash/template
index ba997f875fd8..04d55d085a66 100644
--- a/srcpkgs/gdash/template
+++ b/srcpkgs/gdash/template
@@ -9,7 +9,7 @@ makedepends="glu-devel gtk+-devel SDL2_image-devel SDL2_mixer-devel"
 configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
 
 short_desc="Boulder Dash clone close to the original"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitbucket.org/czirkoszoltan/gdash"
 distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz"
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index d3ee7d151d6f..6626bc91fd94 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -11,7 +11,7 @@ makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_
 depends="guile"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index 119c18fc4eb0..9844c5783405 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Command-line tool for information about GIF images"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.lcdf.org/gifsicle/"
 distfiles="https://github.com/kohler/gifsicle/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/glyphy/template b/srcpkgs/glyphy/template
index 15079905c59a..e2af47e04429 100644
--- a/srcpkgs/glyphy/template
+++ b/srcpkgs/glyphy/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config which"
 makedepends="freetype-devel"
 short_desc="Signed-distance-field (SDF) text renderer using OpenGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/behdad/glyphy"
 distfiles="https://codeload.github.com/behdad/glyphy/tar.gz/${_gitrev}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 2e3cfa721d4f..4ed9e8bc914e 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel"
 makedepends="gtk+3-devel librsvg-devel"
 depends="gnuchess"
 short_desc="GNOME chess user interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-icon-theme-xfce/template b/srcpkgs/gnome-icon-theme-xfce/template
index f8a78eb2027f..54efb083c544 100644
--- a/srcpkgs/gnome-icon-theme-xfce/template
+++ b/srcpkgs/gnome-icon-theme-xfce/template
@@ -4,7 +4,7 @@ version=0.6
 revision=3
 wrksrc="gnome-icon-theme-xfce"
 short_desc="Theme adding missing icons for Xfce"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/gnome-icon-theme-xfce"
 distfiles="https://launchpad.net/gnome-icon-theme-xfce/trunk/${version}/+download/gnome-icon-theme-xfce-source-${version}.tar.gz"
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index c1ddd4a7d117..f07c1ea0105a 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you move blocks"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 3c8f2e7039e6..9cf1ef18d634 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -7,7 +7,7 @@ configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
 short_desc="GNOME Mahjongg solitaire game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index 31813fef3648..bb3377650691 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME puzzle game where you locate mines in the ocean"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 7a23c7e70ee9..e09a03a81ca2 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel intltool itstool pkg-config vala"
 makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
  libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 1c370caf5fa4..1d85efb012db 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index 2348ba05e49d..86c314e7f147 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -7,7 +7,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index 78f0ef176f39..f9879dcdfcce 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext itstool pkg-config vala glib-devel"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="GNOME puzzle game where you align pieces with numbers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index ea4d14790583..49d4b52577f2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 37a8467653f4..67f3cfb3e7ee 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -9,7 +9,7 @@ depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"
 short_desc="Graphical grub2 settings manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/grub-customizer/"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/grub-terminus/template b/srcpkgs/grub-terminus/template
index 7e4e8c2e2f7e..2275e5a6d224 100644
--- a/srcpkgs/grub-terminus/template
+++ b/srcpkgs/grub-terminus/template
@@ -4,7 +4,7 @@ version=0.3
 revision=1
 hostmakedepends="grub-utils terminus-font"
 short_desc="Terminus bold fonts for GRUB"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1, GPL-2.0-or-later"
 homepage="https://voidlinux.org"
 
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 10b7d2ac4951..061990af5058 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="GNOME eponymous puzzle game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index 6867e5334510..c70fb8250785 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel gdk-pixbuf itstool pkg-config vala"
 makedepends="gsound-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME Reversi (Othello) game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Iagno"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 58a1800279d4..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="icu-devel lua51-devel"
 short_desc="Binary module for providing Unicode support to Lua"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT,X"
 homepage="http://luaforge.net/projects/icu-lua/"
 distfiles="
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index a780d47dbdd8..fb813c7d870d 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-makefile
 hostmakedepends="doxygen chrpath"
 short_desc="Free stand-alone ini file parsing library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://ndevilla.free.fr/iniparser/"
 distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template
index 78eba09a0249..3efad365a492 100644
--- a/srcpkgs/injeqt/template
+++ b/srcpkgs/injeqt/template
@@ -7,7 +7,7 @@ configure_args="-DDISABLE_COVERAGE=ON"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="qt5-devel"
 short_desc="Dependency injection framework for Qt"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/vogel/injeqt/"
 distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 7b0737f37747..37318b036b7e 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/javahelp2/template b/srcpkgs/javahelp2/template
index 5418d08075af..8db0e13810b2 100644
--- a/srcpkgs/javahelp2/template
+++ b/srcpkgs/javahelp2/template
@@ -6,7 +6,7 @@ _gitver=3ca862d8626096770598a3a256886d205246f4a4
 wrksrc=javahelp-${_gitver}
 short_desc="Java based help system"
 hostmakedepends="openjdk8 apache-ant unzip which"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CDDL-1.1, GPL-2.0-only"
 homepage="https://javahelp.java.net/"
 distfiles="https://github.com/javaee/javahelp/archive/${_gitver}.zip>${pkgname}-${version}.zip"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 23c0d56fc8e8..87d68e676c8d 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index aab6022e4957..dc0bcc5de3fc 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -16,7 +16,7 @@ depends="libkea>=0"
 checkdepends="procps-ng" #needs pgrep
 conf_files="/etc/kea/*.conf"
 short_desc="Next generation DHCPv4/v6 server"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 3de0311b8e52..94e3e8329728 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -8,7 +8,7 @@ configure_args="--sharedstatedir=/var/games"
 hostmakedepends="pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Space shooter in 2D"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index 5f28459fd73c..b61fcd5dc205 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -7,7 +7,7 @@ configure_args="-DLEATHERMAN_SHARED=ON"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel libcurl-devel"
 short_desc="Collection of C++ and CMake utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/leatherman/"
 distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index 9461bb050d39..cc24df74e47d 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
 short_desc="Image processing and analysis library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
 distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index a1ff860eacd2..b73aac741dc0 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="cmake clang llvm python3 libedit-devel libffi-devel
  ncurses-devel zlib-devel"
 short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://libclc.llvm.org"
 distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 0ea778589437..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -7,7 +7,7 @@ configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
 makedepends="boost-devel icu-devel libcppunit-devel libxml2-devel librevenge-devel liblangtag-devel"
 short_desc="Import reflowable e-book formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="http://sourceforge.net/projects/libebook/"
 distfiles="${SOURCEFORGE_SITE}/project/libebook/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libepubgen/template b/srcpkgs/libepubgen/template
index 1c46ef658e6f..9990fa39449e 100644
--- a/srcpkgs/libepubgen/template
+++ b/srcpkgs/libepubgen/template
@@ -7,7 +7,7 @@ hostmakedepends="doxygen pkg-config"
 makedepends="boost-devel libxml2-devel librevenge-devel"
 checkdepends="libcppunit-devel"
 short_desc="EPUB generator for librevenge"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://sourceforge.net/projects/libepubgen/"
 distfiles="${SOURCEFORGE_SITE}/../project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libfreehand/template b/srcpkgs/libfreehand/template
index 61202d61ca81..10282b4bd0d4 100644
--- a/srcpkgs/libfreehand/template
+++ b/srcpkgs/libfreehand/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="doxygen gperf perl pkg-config"
 makedepends="icu-devel lcms2-devel librevenge-devel"
 short_desc="Parser for Aldus/Macromedia/Adobe FreeHand documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgadu/template b/srcpkgs/libgadu/template
index f075c0cd2bf9..3775a273ca97 100644
--- a/srcpkgs/libgadu/template
+++ b/srcpkgs/libgadu/template
@@ -7,7 +7,7 @@ configure_args="--with-c99-vsnprintf"
 hostmakedepends="automake libtool pkg-config perl protobuf-c"
 makedepends="gnutls-devel libcurl-devel expat-devel libxml2-devel zlib-devel"
 short_desc="Gadu-Gadu instant messaging protocol library"
-maintainer="Jürgen Buchüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.wasilczyk.pl/en/projects/libgadu/"
 distfiles="https://github.com/wojtekka/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc6..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -11,7 +11,7 @@ makedepends="freexl-devel geos-devel jasper-devel json-c-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
  proj-devel sqlite-devel ocl-icd-devel"
 short_desc="Geospatial Data Abstraction Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.gdal.org/"
 distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 69e2cadc6e54..60a1aba20271 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="intltool pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://git.gnome.org/browse/libgnome-games-support/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgta/template b/srcpkgs/libgta/template
index b055b91b2b85..cae699f1b481 100644
--- a/srcpkgs/libgta/template
+++ b/srcpkgs/libgta/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="bzip2-devel liblzma-devel zlib-devel"
 short_desc="Generic Tagged Arrays"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://marlam.de/gta/"
 distfiles="https://marlam.de/gta/releases/libgta-${version}.tar.xz"
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 6ffb939d830b..60a21b07ac94 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
 short_desc="General purpose formula parser and interpreter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/ixion/ixion/"
 distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libnumbertext/template b/srcpkgs/libnumbertext/template
index ad68e52442ed..11611f5c3810 100644
--- a/srcpkgs/libnumbertext/template
+++ b/srcpkgs/libnumbertext/template
@@ -4,7 +4,7 @@ version=1.0.7
 revision=1
 build_style=gnu-configure
 short_desc="Language-neutral NUMBERTEXT and MONEYTEXT for LibreOffice Calc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Numbertext/libnumbertext"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libomxil-bellagio/template b/srcpkgs/libomxil-bellagio/template
index 966de521c471..6b120a2a87c4 100644
--- a/srcpkgs/libomxil-bellagio/template
+++ b/srcpkgs/libomxil-bellagio/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool doxygen"
 short_desc="Opensource implementation of the OpenMAX Integration Layer API"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://omxil.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/omxil/omxil/Bellagio%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b385..5b2f7bbd814f 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -7,7 +7,7 @@ configure_args="--with-boost=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config curl"
 makedepends="glib-devel gdk-pixbuf-devel boost-devel libxml2-devel libjpeg-turbo-devel"
 short_desc="Library for camera RAW files decoding"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
 homepage="https://${pkgname}.freedesktop.org/wiki/"
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 6d083ba48ff2..8c4ca51cf9f3 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
 short_desc="Library for processing spreadsheet documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/orcus/orcus"
 distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index ebe4dc44f914..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
 short_desc="Parser for QuarkXPress file format documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 distfiles="https://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 048355cfb171..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -44,7 +44,7 @@ depends+=" libreoffice-i18n-it>=${version}_${revision}"
 depends+=" libreoffice-i18n-pl>=${version}_${revision}"
 depends+=" libreoffice-i18n-pt>=${version}_${revision}"
 short_desc="Productivity suite"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
 
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index 2c4004c11d3c..945d635780ad 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
 short_desc="Library to play Commodore 64 SID music"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/p/sidplay-residfp/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libsoxr/template b/srcpkgs/libsoxr/template
index cafab40d280c..e74cb5d81dc3 100644
--- a/srcpkgs/libsoxr/template
+++ b/srcpkgs/libsoxr/template
@@ -9,7 +9,7 @@ configure_args="-Wno-dev -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON
  -DWITH_LSR_BINDINGS=ON -DWITH_OPENMP=ON -DWITH_PFFFT=ON"
 makedepends="libgomp-devel"
 short_desc="SoX resampler library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://sourceforge.net/p/soxr/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/soxr/soxr-${version}-Source.tar.xz"
diff --git a/srcpkgs/libtorrent-rasterbar-python/template b/srcpkgs/libtorrent-rasterbar-python/template
index 993c61d13cfb..3698780659e4 100644
--- a/srcpkgs/libtorrent-rasterbar-python/template
+++ b/srcpkgs/libtorrent-rasterbar-python/template
@@ -4,6 +4,6 @@ version=1.2.2
 revision=1
 build_style=meta
 short_desc="Obsolete package: switch to libtorrent-rasterbar-python3"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://voidlinux.org/"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 0588acd81bd8..8cef116f9aff 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -9,7 +9,7 @@ configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
 hostmakedepends="pkg-config intltool libtool python3-devel"
 makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index aa3f130d1e4a..3552b3c741e2 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -5,7 +5,7 @@ revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template
index 90fa9b34bf1d..48a6475a6a67 100644
--- a/srcpkgs/lightsoff/template
+++ b/srcpkgs/lightsoff/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel librsvg-devel"
 short_desc="GNOME puzzlle game where you turn off lights"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lightsoff"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 2fe82302d8e4..13242f01cc77 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -8,7 +8,7 @@ hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
 makedepends="libgomp-devel lcms2-devel libjpeg-turbo-devel tiff-devel libX11-devel lensfun-devel"
 depends="openjdk11 javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index ccbc83c8d262..332ee32405dc 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -4,7 +4,7 @@ version=20170329
 revision=4
 _gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
 short_desc="Linux TV firmware package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Multiple"
 homepage="https://linuxtv.org/"
 distfiles="
diff --git a/srcpkgs/loadp2/template b/srcpkgs/loadp2/template
index 02a982ce0a95..cb30cc2c210d 100644
--- a/srcpkgs/loadp2/template
+++ b/srcpkgs/loadp2/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="spin2cpp"
 depends="spin2cpp"
 short_desc="Loader for the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/loadp2"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/log4cplus/template b/srcpkgs/log4cplus/template
index ce018b8e1368..8babb2a412bb 100644
--- a/srcpkgs/log4cplus/template
+++ b/srcpkgs/log4cplus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-working-locale"
 short_desc="C++ logger very close to Java's log4j"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/log4cplus/log4cplus"
 #changelog="https://raw.githubusercontent.com/log4cplus/log4cplus/master/ChangeLog"
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index becd5dacec19..1c38cb23aea4 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -9,7 +9,7 @@ depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-dbus python3-gobject python3-pylast python3-youtube-dl
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1"
 short_desc="Music player for GNOME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lzf/template b/srcpkgs/lzf/template
index 91aa6bde417f..1d4e437dc1d4 100644
--- a/srcpkgs/lzf/template
+++ b/srcpkgs/lzf/template
@@ -6,7 +6,7 @@ wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
 short_desc="Extremely fast compression algorithm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://software.schmorp.de/pkg/liblzf.html"
 distfiles="http://dist.schmorp.de/liblzf/lib${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index bc498d82863a..b13571dd4cd3 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -9,7 +9,7 @@ makedepends="SDL2_ttf-devel fontconfig-devel glm libgomp-devel libjpeg-turbo-dev
  pugixml-devel rapidjson $(vopt_if qt 'qt5-devel')"
 depends="liberation-fonts-ttf"
 short_desc="Multiple Arcade Machine Emulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f43221fc1a95..f9f3fb3aa00e 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/mog/template b/srcpkgs/mog/template
index 7dae24a66f12..88421ccef317 100644
--- a/srcpkgs/mog/template
+++ b/srcpkgs/mog/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 makedepends="SDL_image-devel SDL_mixer-devel SDL_sound-devel"
 depends="mog-data>=${version}_${revision}"
 short_desc="Remake of classic MSX game The Maze of Galious"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.braingames.getput.com/mog/"
 distfiles="http://urchlay.naptime.net/~urchlay/src/mog.src_${version}-${_build}.tgz"
diff --git a/srcpkgs/mruby/template b/srcpkgs/mruby/template
index 3749ebf1c254..5648a4c9ea78 100644
--- a/srcpkgs/mruby/template
+++ b/srcpkgs/mruby/template
@@ -4,7 +4,7 @@ version=2.1.2
 revision=1
 hostmakedepends="ruby"
 short_desc="Lightweight implementation of the Ruby language (Ruby 1.9)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://mruby.org/"
 distfiles="https://github.com/mruby/mruby/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-fts/template b/srcpkgs/musl-fts/template
index 1f8228ecfd7e..fe6cb20c857f 100644
--- a/srcpkgs/musl-fts/template
+++ b/srcpkgs/musl-fts/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 archs="*-musl"
 short_desc="Implementation of fts(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/void-linux/musl-fts"
 distfiles="https://github.com/void-linux/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 09ba95e86148..7da24d223970 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -6,7 +6,7 @@ archs="*-musl"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Implementation of obstack for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/void-linux/musl-obstack"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-rpmatch/template b/srcpkgs/musl-rpmatch/template
index 40b62aff87d8..754d017afa73 100644
--- a/srcpkgs/musl-rpmatch/template
+++ b/srcpkgs/musl-rpmatch/template
@@ -7,7 +7,7 @@ configure_args="--enable-shared --enable-static"
 hostmakedepends="automake libtool gettext-devel"
 makedepends="gettext-devel"
 short_desc="Implementation of rpmatch(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
 homepage="https://github.com/pullmoll/musl-rpmatch"
 distfiles="https://github.com/pullmoll/musl-rpmatch/archive/v${version}.tar.gz"
diff --git a/srcpkgs/mxml/template b/srcpkgs/mxml/template
index d94622caa7ff..f49a04c6b052 100644
--- a/srcpkgs/mxml/template
+++ b/srcpkgs/mxml/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 make_build_args="libmxml.a all"
 configure_args="--enable-static --enable-shared"
 short_desc="Minimal XML library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="http://www.minixml.org/"
 distfiles="https://github.com/michaelrsweet/mxml/releases/download/v${version}/mxml-${version}.tar.gz"
diff --git a/srcpkgs/nasm-doc/template b/srcpkgs/nasm-doc/template
index 8d82491dc10f..943ff2cd6ac4 100644
--- a/srcpkgs/nasm-doc/template
+++ b/srcpkgs/nasm-doc/template
@@ -9,7 +9,7 @@ make_build_args="doc"
 hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions
  ghostscript source-sans-pro liberation-fonts-ttf"
 short_desc="80x86 assembler designed for portability and modularity - documentation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 88c62ca5da98..6f54506f5a6c 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -6,7 +6,7 @@ revision=1
 build_style=gnu-configure
 make_build_args="all"
 short_desc="80x86 assembler designed for portability and modularity"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 changelog="https://nasm.us/doc/nasmdocc.html"
diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template
index 0920c395d744..630bcf1fb30f 100644
--- a/srcpkgs/netbsd-rumpkernel/template
+++ b/srcpkgs/netbsd-rumpkernel/template
@@ -6,7 +6,7 @@ archs="x86_64* i686*"
 wrksrc="buildrump.sh-${version}"
 hostmakedepends="git tar"
 short_desc="NetBSD rump kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/anttikantee/buildrump.sh"
 distfiles="https://github.com/rumpkernel/buildrump.sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template
index 8a16e31d31e5..194588600db8 100644
--- a/srcpkgs/notepadqq/template
+++ b/srcpkgs/notepadqq/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Text editor for developers"
 homepage="https://notepadqq.com"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nrg2iso/template b/srcpkgs/nrg2iso/template
index b2b553c4ac62..3257be3dbef8 100644
--- a/srcpkgs/nrg2iso/template
+++ b/srcpkgs/nrg2iso/template
@@ -4,7 +4,7 @@ version=0.4
 revision=1
 build_style=gnu-makefile
 short_desc="Simple tool to convert from Nero Burning Rom (NRG) to ISO"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
 distfiles="http://gregory.kokanosky.free.fr/v4/linux/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index 7edee5a30b7a..d961d945e74e 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -7,7 +7,7 @@ pycompile_module="nyx"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-stem tor"
 short_desc="Command-line status monitor for tor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nyx.torproject.org/"
 distfiles="${PYPI_SITE}/n/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ois/template b/srcpkgs/ois/template
index 27e59464fb27..83536adcb588 100644
--- a/srcpkgs/ois/template
+++ b/srcpkgs/ois/template
@@ -7,7 +7,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
 short_desc="Object oriented input system"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="zlib-acknowledgement"
 homepage="https://wgois.github.io/OIS/"
 distfiles="https://github.com/wgois/OIS/archive/v${version}.tar.gz"
diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template
index 6b3ffed1d17b..6041120059b1 100644
--- a/srcpkgs/opencollada/template
+++ b/srcpkgs/opencollada/template
@@ -8,7 +8,7 @@ configure_args="-DUSE_SHARED=TRUE"
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel pcre-devel"
 short_desc="Stream based reader and writer library for COLLADA files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/OpenCOLLADA"
 distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
index b7696b375c30..7ae0e22f2d3d 100644
--- a/srcpkgs/openlierox/template
+++ b/srcpkgs/openlierox/template
@@ -10,7 +10,7 @@ makedepends="SDL_image-devel SDL_mixer-devel freealut-devel
  gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel"
 depends="virtual?libGL python"
 short_desc="Addictive real-time excessive Worms-clone"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openlierox.net/"
 distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index a6c009606422..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -12,7 +12,7 @@ makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma
  libxdg-basedir-devel"
 depends="hicolor-icon-theme"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
 distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index f7dcb7ed5682..a9ae953da179 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,7 +9,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="SDL_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a35ce21a172d..08bf6d4b6591 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
  $(vopt_if vnc libvncserver-devel)"
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OSGPL-2.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template
index 3db52e025389..f89e27caedc4 100644
--- a/srcpkgs/osmid/template
+++ b/srcpkgs/osmid/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libX11-devel"
 short_desc="Tool to convert MIDI to OSC and OSC to MIDI"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, ISC, GPL-3.0-or-later"
 homepage="https://github.com/llloret/osmid/"
 distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/paprefs/template b/srcpkgs/paprefs/template
index 90754e82d92b..277903780bcd 100644
--- a/srcpkgs/paprefs/template
+++ b/srcpkgs/paprefs/template
@@ -9,7 +9,7 @@ makedepends="dbus-glib-devel gtkmm-devel glibmm-devel libsigc++-devel
  pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Editor for pulseaudio settings"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://0pointer.de/lennart/projects/paprefs/"
 distfiles="${FREEDESKTOP_SITE}/pulseaudio/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c902128411c8..854f8492e24c 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -9,7 +9,7 @@ makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-dev
 depends="hicolor-icon-theme gst-libav gst-plugins-good1
  gst-plugins-bad1 gst-plugins-ugly1"
 short_desc="Modern simple media player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/parole/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index d9dbb9a8fe75..f6db34b88e4b 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -11,7 +11,7 @@ makedepends="gd-devel gtkglext-devel tk-devel"
 depends="geda gerbv"
 checkdepends="ImageMagick ghostscript"
 short_desc="Interactive printed circuit board editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcb.geda-project.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index a4009021ec24..0ce97d2628a5 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -8,7 +8,7 @@ configure_args="--enable-udev --enable-twinserial"
 hostmakedepends="pkg-config perl"
 makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel"
 short_desc="PC/SC driver to support CCID compliant readers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://ccid.apdu.fr/"
 changelog="https://salsa.debian.org/rousseau/CCID/-/raw/master/README.md"
diff --git a/srcpkgs/pdmenu/template b/srcpkgs/pdmenu/template
index 492eb767a5bc..68c4de92c568 100644
--- a/srcpkgs/pdmenu/template
+++ b/srcpkgs/pdmenu/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="slang-devel"
 short_desc="Full screen menuing system for Unix"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://joeyh.name/code/pdmenu/"
 distfiles="http://http.debian.net/debian/pool/main/p/pdmenu/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Rename/template b/srcpkgs/perl-File-Rename/template
index 7788bc9fa4a0..4d34a0c67888 100644
--- a/srcpkgs/perl-File-Rename/template
+++ b/srcpkgs/perl-File-Rename/template
@@ -8,7 +8,7 @@ hostmakedepends="perl-Module-Build"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Perl module to rename filenames"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://metacpan.org/release/File-Rename"
 license="Artistic-1.0-Perl"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/pilot-link/template b/srcpkgs/pilot-link/template
index 907ec9ba14d1..5b83232cef8c 100644
--- a/srcpkgs/pilot-link/template
+++ b/srcpkgs/pilot-link/template
@@ -11,7 +11,7 @@ makedepends="libbluetooth-devel libusb-devel libpng-devel popt-devel
  python-devel tcl-devel readline-devel"
 depends="tk"
 short_desc="Suite of tools to connect your Palm or PalmOS® handheld"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.pilot-link.org/"
 # Main site is unreachable (no address record).
diff --git a/srcpkgs/pipenightdreams/template b/srcpkgs/pipenightdreams/template
index cb41b4933ea9..baf9b32f95d1 100644
--- a/srcpkgs/pipenightdreams/template
+++ b/srcpkgs/pipenightdreams/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Just another pipe trip"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/pipenightdreams"
 distfiles="${homepage}/packages/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index bc82ff5514d8..cf5b2fd81cfa 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 85519461d8a3..9ae68a2d60f8 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 8988affd2836..aafd8d860e0e 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -16,7 +16,7 @@ makedepends="enca-devel faad2-devel ffmpeg-devel jack-devel libarchive-devel
 # At least one QSql plugin should be available
 depends="qt5-plugin-sqlite"
 short_desc="Audio player based on the Qt5 libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/qoauth-qt5/template b/srcpkgs/qoauth-qt5/template
index d5f3f388e1e4..ce38576e0e4c 100644
--- a/srcpkgs/qoauth-qt5/template
+++ b/srcpkgs/qoauth-qt5/template
@@ -8,7 +8,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qca-qt5-devel"
 short_desc="Support with OAuth-powered network services"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.1"
 homepage="http://github.com/ayoy/qoauth"
 distfiles="https://github.com/ayoy/qoauth/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qqwing/template b/srcpkgs/qqwing/template
index 4e1c0f18e981..ed31e0276bff 100644
--- a/srcpkgs/qqwing/template
+++ b/srcpkgs/qqwing/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Sudoku generating and solving library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://qqwing.com/"
 distfiles="https://github.com/stephenostermiller/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index d181e9cdb529..0fd2ba01175f 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=3
 wrksrc="QR-Code-generator-${version}"
 short_desc="QR Code generator library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.nayuki.io/page/qr-code-generator-library"
 distfiles="https://github.com/nayuki/QR-Code-generator/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 98991b16fa39..9e6b476ff2ea 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
 depends="qt5-core>=5.15.2<5.15.3"
 short_desc="Additional style plugins for Qt5"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 330a6bcd16e4..02e8a514a1bd 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libglib-devel libcanberra-devel
  clutter-gtk-devel librsvg-devel libmanette-devel"
 short_desc="GNOME classic falling-block game (Tetris)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template
index 5987e41d3a80..b5e7c2b331d2 100644
--- a/srcpkgs/quake4/template
+++ b/srcpkgs/quake4/template
@@ -5,7 +5,7 @@ revision=3
 hostmakedepends="tar"
 depends="SDL libXext virtual?libudev zlib desktop-file-utils"
 short_desc="Quake 4 for Linux"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom: propietary"
 homepage="http://www.quake4game.com/"
 distfiles="http://sources.voidlinux.de/${pkgname}-${version}/quake4-linux-${version}.x86.run"
diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template
index 35eebf0b515d..06bdbfb072d1 100644
--- a/srcpkgs/qupzilla/template
+++ b/srcpkgs/qupzilla/template
@@ -6,6 +6,6 @@ revision=3
 build_style=meta
 depends="falkon>=${version}_${revision}"
 short_desc="Lightweight multiplatform browser (transitional dummy package)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"
 homepage="https://qupzilla.com/"
diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index d640ab5a3f5e..5283f8ea32ee 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_EXAMPLES=false"
 hostmakedepends="pkg-config"
 makedepends="qt5-devel opus-devel speex-devel libtheora-devel libvpx-devel"
 short_desc="Cross-platform C++ XMPP client and server library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 473813e47672..1985dee75923 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_net-devel"
 short_desc="Arcade style game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/seabios/template b/srcpkgs/seabios/template
index 29b373acffbe..bec0dcd92f2d 100644
--- a/srcpkgs/seabios/template
+++ b/srcpkgs/seabios/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="python3"
 archs="i686* x86_64*"
 short_desc="OSS implementation of a 16-bit x86 BIOS"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.seabios.org/"
 distfiles="https://www.seabios.org/downloads/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/silly/template b/srcpkgs/silly/template
index e06b0a84af4a..432cefdabc93 100644
--- a/srcpkgs/silly/template
+++ b/srcpkgs/silly/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="Simple image loading library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://sourceforge.net/projects/crayzedsgui/"
 distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz"
diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template
index eb9e1437efed..4a15e27896ef 100644
--- a/srcpkgs/simgear/template
+++ b/srcpkgs/simgear/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel
  libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel"
 short_desc="Simulation engine for FlightGear - static libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index c73220201a7a..073c70fa750d 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 hostmakedepends="bison"
 short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/spin2cpp/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index b6b6d821b334..42b5918ced65 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
 short_desc="Synthesis ToolKit in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://ccrma.stanford.edu/software/stk/"
 distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template
index 33da8d8365ad..afb8dd466c3e 100644
--- a/srcpkgs/swell-foop/template
+++ b/srcpkgs/swell-foop/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel"
 short_desc="GNOME puzzle game where you remove similar objects"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Swell%20Foop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 8de48032c975..bfd640177d27 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -7,7 +7,7 @@ hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
  desktop-file-utils itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index de0278d7afa0..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -10,7 +10,7 @@ make_build_args="all training"
 hostmakedepends="automake libtool pkg-config leptonica libxslt asciidoc"
 makedepends="cairo-devel pango-devel leptonica-devel $(vopt_if openmp libgomp-devel) icu-devel"
 short_desc="Tesseract Open Source OCR engine"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/tesseract-ocr/tesseract"
 distfiles="
diff --git a/srcpkgs/tinyclipboard/template b/srcpkgs/tinyclipboard/template
index 2dfaf68d94a4..22e90096b3e9 100644
--- a/srcpkgs/tinyclipboard/template
+++ b/srcpkgs/tinyclipboard/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 short_desc="Cross-platform C library for accessing the clipboard"
 makedepends="libXt-devel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://redmine.guelker.eu/projects/tinyclipboard"
 distfiles="https://files.guelker.eu/projects/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/toluapp/template b/srcpkgs/toluapp/template
index fb54ad329fc2..d07536814e9b 100644
--- a/srcpkgs/toluapp/template
+++ b/srcpkgs/toluapp/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua51-devel"
 short_desc="Tool to integrate C and C++ code with Lua5.1"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/LuaDist/toluapp"
 distfiles="https://github.com/LuaDist/toluapp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index f0f42c46c4c7..b76bb0123c88 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -10,7 +10,7 @@ archs="i686 x86_64"
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
 short_desc="A middlebox detection tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 nocross=yes
 homepage="http://www.tracebox.org/"
diff --git a/srcpkgs/tslib/template b/srcpkgs/tslib/template
index 8652a2a46e44..60ab1807d8b3 100644
--- a/srcpkgs/tslib/template
+++ b/srcpkgs/tslib/template
@@ -4,7 +4,7 @@ version=1.22
 revision=1
 build_style=cmake
 short_desc="Touchscreen access library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/kergoth/tslib"
 distfiles="https://github.com/kergoth/tslib/releases/download/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ttyqr/template b/srcpkgs/ttyqr/template
index 1601d553b97b..2840d1fb54e2 100644
--- a/srcpkgs/ttyqr/template
+++ b/srcpkgs/ttyqr/template
@@ -7,7 +7,7 @@ wrksrc=${pkgname}-${_githash}
 build_style=gnu-makefile
 makedepends="qrencode-devel"
 short_desc="Draw QR codes straight into the terminal"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/oskar456/ttyqr/"
 distfiles="https://github.com/oskar456/ttyqr/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/twaindsm/template b/srcpkgs/twaindsm/template
index 300c1694b8f8..5bdf8194d67f 100644
--- a/srcpkgs/twaindsm/template
+++ b/srcpkgs/twaindsm/template
@@ -8,7 +8,7 @@ build_wrksrc="TWAIN_DSM/src"
 build_style=cmake
 hostmakedepends="doxygen unzip"
 short_desc="TWAIN data source manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.twain.org/"
 distfiles="https://github.com/twain/twain-dsm/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ucpp/template b/srcpkgs/ucpp/template
index 582e607c4d3d..247c933ffac5 100644
--- a/srcpkgs/ucpp/template
+++ b/srcpkgs/ucpp/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 build_style=gnu-makefile
 nopie=yes
 short_desc="Embeddable, quck, light C preprocessor compliant to C99"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://code.google.com/archive/p/ucpp/"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-${version}.tar.bz2"
diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template
index 18fd73176198..3b36cf0d6db1 100644
--- a/srcpkgs/ufoai/template
+++ b/srcpkgs/ufoai/template
@@ -11,7 +11,7 @@ makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel
  gtkglext-devel gtksourceview2-devel"
 depends="ca-certificates"
 short_desc="UFO Alien Invasion"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ufoai.org/"
 distfiles="
diff --git a/srcpkgs/vgmplay/template b/srcpkgs/vgmplay/template
index 43a844368c9d..2792e0855a20 100644
--- a/srcpkgs/vgmplay/template
+++ b/srcpkgs/vgmplay/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 build_wrksrc="VGMPlay"
 makedepends="libao-devel zlib-devel"
 short_desc="VGM file player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/vgmrips/vgmplay/"
 distfiles="https://github.com/vgmrips/vgmplay/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index 5930a164616c..bcea8c8b6058 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel gtk+3-devel
  libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel libSM-devel"
 depends="libsoup>=2.46 desktop-file-utils"
 short_desc="VNC server for the GNOME desktop"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.gnome.org/action/show/Projects/Vino"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 77ea433a1073..01de503942c0 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -9,7 +9,7 @@ configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
 makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
 distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
diff --git a/srcpkgs/widelands-maps/template b/srcpkgs/widelands-maps/template
index 47c9c488f5ca..fd6b807ec660 100644
--- a/srcpkgs/widelands-maps/template
+++ b/srcpkgs/widelands-maps/template
@@ -3,7 +3,7 @@ pkgname=widelands-maps
 version=1.1
 revision=4
 short_desc="Additional maps for Widelands v18"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://wl.widelands.org/maps/"
 distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index cfa2c10993e0..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -11,7 +11,7 @@ makedepends="boost-devel icu-devel minizip-devel gettext-devel
  glu-devel glew-devel SDL2-devel SDL2_gfx-devel SDL2_image-devel
  SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Real-time strategy game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.widelands.org/"
 distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index e7f6a9152235..c70f0003e8a3 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 0ead8c752643..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
 depends="lib${pkgname}>=${version}_${revision}"
 short_desc="Validating XML parser written in portable C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://xerces.apache.org/xerces-c/"
 distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 33f0f89ce2cb..39edac52798d 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1"
 short_desc="Xorg Matrox Graphics Adapter video driver"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xfce4-plugins/template b/srcpkgs/xfce4-plugins/template
index e5128eed4607..0ac4ae75ea9d 100644
--- a/srcpkgs/xfce4-plugins/template
+++ b/srcpkgs/xfce4-plugins/template
@@ -26,7 +26,7 @@ depends="
 	xfce4-whiskermenu-plugin
 	xfce4-xkb-plugin"
 short_desc="Plugins for the Xfce4 Desktop Environment"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/"
 replaces="xfce4-kbdleds-plugin>=0
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index df74e185d580..f936c70dff18 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
 makedepends="gtk+3-devel"
 depends="libglvnd"
 short_desc="GTK2 application for Numerical Electromagnetics Code generation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
 distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 65c6fd79288f..863e61dd58c7 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -6,7 +6,7 @@ hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
diff --git a/srcpkgs/ytnef/template b/srcpkgs/ytnef/template
index 7e040d9a5832..512d587fddfe 100644
--- a/srcpkgs/ytnef/template
+++ b/srcpkgs/ytnef/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Yerase's TNEF Stream Reader"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Yeraze/ytnef"
 distfiles="https://github.com/Yeraze/ytnef/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 68549362754c..f0195a7c73ae 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template
index 04e72410af82..844d14016a06 100644
--- a/srcpkgs/zynaddsubfx/template
+++ b/srcpkgs/zynaddsubfx/template
@@ -9,7 +9,7 @@ hostmakedepends="doxygen fltk pkg-config"
 makedepends="fltk-devel fftw-devel liblo-devel libXpm-devel mxml-devel
  jack-devel portaudio-devel"
 short_desc="Open Source software synthesizer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zynaddsubfx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"

From 608ec2df68d9bdcd58ec40abc0bbfefe991844fd Mon Sep 17 00:00:00 2001
From: Enno Boland <g@s01.de>
Date: Wed, 31 Mar 2021 19:31:27 +0200
Subject: [PATCH 159/404] srcpkgs: ericonr takes over packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/aisleriot/template   | 2 +-
 srcpkgs/freerouting/template | 2 +-
 srcpkgs/json-c++/template    | 2 +-
 srcpkgs/qbittorrent/template | 2 +-
 srcpkgs/wildmidi/template    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index e31845d7fe61..5bd4e53483f8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 123cb60b2daf..e8c5b371e436 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 87d68e676c8d..97f0457e88ee 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 9ae68a2d60f8..924225cf4f84 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index c70f0003e8a3..634ad5bc88a5 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"

From 6d9c6fe399e0338a9602a37068fecf8e84964ec7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:54:29 +0200
Subject: [PATCH 160/404] iselect: adopt.

---
 srcpkgs/iselect/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 37318b036b7e..3260d4836612 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -1,13 +1,13 @@
 # Template file for 'iselect'
 pkgname=iselect
 version=1.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=5b75fc5fa5407e85fa77d2a299c4e7628c0213116809f343946e62a8a25c5b1b

From d00566456451da84405a10bf0dd1e9a44bd74bb1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:56:42 +0200
Subject: [PATCH 161/404] mmv: adopt.

---
 srcpkgs/mmv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f9f3fb3aa00e..1afd253685d5 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"

From fcb4326450ed673e4bea015b6a10d82f74f625ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:57:29 +0200
Subject: [PATCH 162/404] zbar: adopt.

---
 srcpkgs/zbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index f0195a7c73ae..f64d87fcfe81 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"

From 75bc6903cee046b0a4408e33cf9a62922111960a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:48 +0200
Subject: [PATCH 163/404] attica: update to 5.81.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index ca0d296e38fc..d6476b39fc7b 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3aa866b01dfcdc1f59012c57f6bd49eabfe5d920560f766116a6633b394ce71
+checksum=19430eca0ebae80902008e0ae65669ee29d06a3cda56bddff222d709fc502f74
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0b6119a52d4fb74f56ac91fbbac79898a3b858cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:51 +0200
Subject: [PATCH 164/404] baloo5: update to 5.81.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index df597bd43719..26d14d8e9e47 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=ecdf0ba93c0cfd85b16aed3817db490c85f70c8c1d13e076b461d41ffa00b571
+checksum=5ed2c781ce7603f1e798fe645427814a3f2116f3793a047a82d707560512d556
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From 88d6fbbc95baccc7245f8a8fc63c4bad57bc80f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:54 +0200
Subject: [PATCH 165/404] bluez-qt5: update to 5.81.0.

---
 srcpkgs/bluez-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index e36590f3861d..371ebfad9eb3 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=96e77f80ffd3d6b7854370f5e45773d74cbc685255612e923d703e00ed33e521
+checksum=e34a03e6daccff1f6ea5cd28e3f61a3b209c25e81aa87bb409c608bcbe1d9e8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From e9baa493338111d7384d900d341b108a0899ea21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:57 +0200
Subject: [PATCH 166/404] breeze-icons: update to 5.81.0.

---
 srcpkgs/breeze-icons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 67cac82b411b..ef78750196c5 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a266908cafc0233e5da6f11747bbbef94b7d9503e2c1f59c68013ae11f1d6584
+checksum=ef88f0e41407900b0570030dab8e6debb97e749c8aa1841d7572821c959784a0
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From acfc9c6390f716339b686d81c8c5d80b9e440d16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:00 +0200
Subject: [PATCH 167/404] extra-cmake-modules: update to 5.81.0.

---
 srcpkgs/extra-cmake-modules/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index c5be5f2dcfe0..ee48dfec369a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2370fd80f685533d0b96efa6fa443ceea68e0ceba4e8a9d7c151d297b1c96f64
+checksum=5f57e4b843069b6098d955051bb2913558d1623fead3f3b95b7017d7e1e35b83
 python_version=3
 
 post_install() {

From 2885d7f70845c79ecf7daa4a18da771b2d9ed262 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:03 +0200
Subject: [PATCH 168/404] frameworkintegration: update to 5.81.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 990d6af065dd..f4f81f4c5e64 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=871d961ccdcc420ac63686bb522febabe9dcdd6199880f9e2e59433239b9696a
+checksum=3b98768f0bbb6f3c427a74504eae7d3045d3af20946d3bc6f5937f6206a88b6d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 52089f7ca252a1bd39b89ed7e3dcb9b5feb32d78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:06 +0200
Subject: [PATCH 169/404] kactivities5-stats: update to 5.81.0.

---
 srcpkgs/kactivities5-stats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index b21320db44da..cc2d624bef76 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=d689b7e9b75debce048fa4cbbc95924a4bfb2dd0c32b5874413b2871d18573f0
+checksum=02e7ee69fe46da03ad1a95dbac4fef9494e2c8a9ce7a94722d190710bc796920
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 72caed9d4bf9c8a25df18eded28e8950c553159d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:08 +0200
Subject: [PATCH 170/404] kactivities5: update to 5.81.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 30dc528f50b9..f77844763271 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1a90e14a16e2efa5ae460843f05e88ca412c7fe078fc077dee8a1cf022303592
+checksum=78ff3d4b6448582bf3578076d05a04ad5f91a664c7fd0d91162c3a8fd875536b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From 8d544b0963bc244712f1b3d67b561a9843bc7f63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:11 +0200
Subject: [PATCH 171/404] kapidox: update to 5.81.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 469a5db977d3..7ba30aca033e 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7f14805350c5f0c1326b3ad2b2923c71f3d41e6782249723013a0f3ef18b1204
+checksum=42ff9da76a192cd9a9c6007ca75cb184703c888c4c141a8ac39655d982bf04f3
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From affe13c5d4e49fbd31d9d2752947454bc38d116c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:13 +0200
Subject: [PATCH 172/404] karchive: update to 5.81.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index a17ab9a49087..308a915506c7 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce08d578c5311c475f43df5c40480ddafbb065c41599c535b5e98d2175c5df5
+checksum=1e263a3e25417eca68fe59bc8b958ab4f5cf4da16d4c47d36a5230fa3cf596ba
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2ee6d32fc8ac116a4c51d25861c1b2a7751e7b35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:16 +0200
Subject: [PATCH 173/404] kauth: update to 5.81.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0d3dc13ef134..7c0ca8ee8956 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26f07de07729abf90500749d7746eee63398fe96ca00d32f845084b4c89896dd
+checksum=7e0062efe1838766890dee709b3ecd6767ced49173f9c149ac2ef492261fc9bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From a9bc183d0ea29dd284cef5e84d33ecfb7120a6c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:18 +0200
Subject: [PATCH 174/404] kbookmarks: update to 5.81.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 8a210ef4882e..630566cbff4f 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5880324922e465b66384acbdd4f6db2f26c533c2e27c1cb121ec0e0e37f53586
+checksum=f5bfcc85d58b35439252f6e3d086a4deb359c4a0649fdfa57a96960cf7a00f2f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 308e8e6762cb908a7b9aaa488b7edd50de61af06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:20 +0200
Subject: [PATCH 175/404] kcalendarcore: update to 5.81.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index f035b281cab5..53f758f35022 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5cdec2ed0b2bee08e5d5395aee1dc13626e2287a235cd9f1506ad5f96d012fd
+checksum=bac828b363a7b406b3ccdc98854fb3ebd4d06b503c298dc676215a4612451529
 replaces="kcalcore>=0"
 
 do_check() {

From 231d80a3ab173f23e7cf8a549aafea1c00cd5349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:23 +0200
Subject: [PATCH 176/404] kcmutils: update to 5.81.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5ce249e9c530..c604ad54cd9e 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c93b1a865bcfe0aa85b8ac59b7b0f214aa5fdc5767ee51657657360a8739e59
+checksum=b25ecd2e52ef1c133cbd3be87375ab4aebc7dcff5aeb2511282f68f4ede60297
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 44f028185216d9783c31c011ff88a99808529392 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:25 +0200
Subject: [PATCH 177/404] kcodecs: update to 5.81.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 7af5b11cc0a4..a0f33bcd16ad 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f56744c9647096b8d403d212081afffa890b4f386eeb33d1be497cee560881a
+checksum=4392afb4a3e1a4c8d6e645e7161d2651f5b83ca8620156cf942bfc95c33ce564
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 8c4f284bed35a7ed635589386d12a0b690da2e8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 178/404] kcompletion: update to 5.81.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 93726f742347..32b42dca9989 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef4251a6196255e8b131c8dd0793b3e79f7de05449cf2d466131d30078686093
+checksum=f7ac17e57203bfee92b252b92cd31174a624620119a461fad04087a7c8337c95
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 34592da03ee67a974650f92869e6daef20027682 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 179/404] plasma-wayland-protocols: update to 1.2.1.

---
 srcpkgs/plasma-wayland-protocols/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 2d9d9300ccc0..594de71c5d31 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,15 +1,16 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.1.1
+version=1.2.1
 revision=1
+wrksrc="$pkgname-v$version"
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
 short_desc="Plasma Specific Protocols for Wayland"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
-distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5493383d115171c3435ea9a21b3966860632a844544ffac8f54890436a51d38
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-v${version}.tar.xz"
+checksum=287b90903f9a7f394c75e75cb187426862eaf64a92f1be7e2ef68e99fd8cbaaa
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 270c6e9d1165096888cb4fb40bf2cd18e271b40b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:29 +0200
Subject: [PATCH 180/404] kconfig: update to 5.81.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 4989a4e27919..10adbf9e4ac9 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2600449e6a6ccf2d9f61ba33abff7ed29c1f975b33bfe6cc7e6d8993dddd19b2
+checksum=1ddf9e384140ce72bbd555eb36a76d0db1a256391429b02b51769c08ebf0ae8f
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From 45a1193ddbeb9f71e9ca1479a211af9d2294456a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:32 +0200
Subject: [PATCH 181/404] kconfigwidgets: update to 5.81.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 903e3a62b90e..507d63b8cea3 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=479eef40642498adf5f1fd2ef5004be105e1d06d7981136d9f560b18121d2c8b
+checksum=e075022ba2db52df92fd21736e92ff73138eddc782fb765938ff84c68cedfdec
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From e1558648376edf666b7362175e8bee000af55d00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:34 +0200
Subject: [PATCH 182/404] kcontacts: update to 5.81.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 15e5ab7025e8..101d4de6ff13 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d387b909e2e52b35efef6201502cb71705a76fdcd4fda8e7e535e5c66cbf7b9c
+checksum=e431fb04a17bf86cca0e5e618b0b7170c10815c3fdb891af80df48dcdfd59397
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4014888f8f3eea2bd9746a4298429689eeb4ee2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:37 +0200
Subject: [PATCH 183/404] kcoreaddons: update to 5.81.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 2ce3d9ad82d6..f95d9bb971f3 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ece39271678b3ff3753116bce8bb6747ebadbad522782d0f8051d8bab66f3ed1
+checksum=ac0ccb1687dd159ad2c6926f766498a2450906266139ec924d7794839a8cfedb
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From bb6c6b538b017df54e0d46aeaaf97f6d2a1e98a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:39 +0200
Subject: [PATCH 184/404] kcrash: update to 5.81.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index fda993f37ff3..821f84871bcb 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=64a3e918fbf41c1bc1b708b526d2c928ac7d4c10579a10416e15788553444bb0
+checksum=0139f2630a5ad8fb8abb0fd504b1ba6d3e6f3b6a352acfaa1156f750e94a3cc7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 9e64cf8550f0522477678d9750c4b5eefeb5b12f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:42 +0200
Subject: [PATCH 185/404] kdav: update to 5.81.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index ebb12d097b7f..e0b0ab47922d 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01044dfe0427eecc4cbe60357b4ef570c9081fa9b45cd846a9d8797cef254bb1
+checksum=0b00fdf902b1aeadfefe9caa11fad52a26f18e4c0e747c1bf8d9a1758b8bb133
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 4b33b72ec08e3ddd9c73e67706d2cae9214dcb9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:44 +0200
Subject: [PATCH 186/404] kdbusaddons: update to 5.81.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index b971fc4ee296..d11b15648e6f 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14924319878951a4fbbf7b93da22428274449bec2bdd93b092e89f11bfbc1bf0
+checksum=49f5234327a8975e19602e4c7cc01f5ffbbd6e14d02fbcaefa2674d4eeab793d
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From b934a047744183fefd95f9cdbf43515fc88ee0a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:47 +0200
Subject: [PATCH 187/404] kdeclarative: update to 5.81.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index e3ce275660f9..cade4690ccda 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf55ba32475f3459e32f38ca49ced27373427b679ab5dd98e03f02e6f1359d3d
+checksum=7dcce4ec31bc41958f0c2ca53134821f921b1d5ebbab75f6d41bf07b0555d368
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From 64c00247302f60e31a987d9ce6a7e328bbd4abd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:50 +0200
Subject: [PATCH 188/404] kded: update to 5.81.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 4e5de9dca164..96238e9cb50d 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4157de65d9acc6620da42f777c6fc56ef4ecb846cd3b80db5e349b35dc1f736a
+checksum=513b1bec662741e25d43c21b64b3213e0fd6f840b9f282e9024536c558960084
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 9a98fe3666175ea78d2b696106fdebb7a0e84791 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:54 +0200
Subject: [PATCH 189/404] kdelibs4support: update to 5.81.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index c2f03082f828..a2eee7c2ea69 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e258cac33f5dc85438034e20dbe29627cddad3b595527fc524681d110a6d05
+checksum=6614d9d8c004e15359ef0f5ac37419d706beb0bcc53fafecc3536a340d8963b2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From d8425084cfd5894624f7a0ff9e1cadff9f864f2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:56 +0200
Subject: [PATCH 190/404] kdesignerplugin: update to 5.81.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index dede1b28e06a..67ca33028162 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e36e8ba3b0c9d84de2359c89ee332f96e6cbf7cfebd4bc81b9d9e3c7c3e9b4
+checksum=4307cd1c3bb681ec1c28cb4399ef952a1966273963f6511eb0b6256d9791f6e5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 6a61eab156c18c6e9d77cb42456c4369094602b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:58 +0200
Subject: [PATCH 191/404] kdesu: update to 5.81.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 880d03c5829f..cd7ba48a09e7 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d45ea674551bb344fc897f9d1c5500291008cd099ce71205a9949cb386a4acf
+checksum=de0b4ab6a0606e0fc00181c4295a533928ab2be9fbe24ca726abdecd6618c59c
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From d36fd20f58b65d104f9525e8e9534ae0c7b79318 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:00 +0200
Subject: [PATCH 192/404] kdewebkit: update to 5.81.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8ee2cda8486c..9a53524aef56 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=917defa04b29407e8b89daedb16e1fe5dfdc1b116811b5b9815faa2a78ea0687
+checksum=e78862349a786e0969cc6934e4b99845a6bd7c66de1d94ef5893978c78bd4d08
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 0e6564e9169c10aa616d1769090d9f22b29e9363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:04 +0200
Subject: [PATCH 193/404] kdnssd: update to 5.81.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 05023a6c8c15..d6db1cfcc5e2 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afa10cdb6cc97413a045e5f152d74e1ef2f0a7bab057460a3d20ab62e098144d
+checksum=316e53ad258a08acff886a11a1f0fac69433a5df90b8c6ad5dea945c0a4f84c2
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 0acb342cf40ddd063dadf2f7d21a16b82ba739ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:06 +0200
Subject: [PATCH 194/404] kdoctools: update to 5.81.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index ae30fe179053..bb4bd7af6da2 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1eae100e641206ef01275d3577c286f73523a516854fe146121ceb302fc0ac83
+checksum=398677ebea07c6db652a735689c5e2fdb4a6fd42757dec850f90c0433af60a87
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From df63f63afeed147ee404b1dcd876ee19bc3b7044 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:09 +0200
Subject: [PATCH 195/404] kemoticons: update to 5.81.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 4891df41eca4..5ffc0924ff5b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b8affb1cd506fcc7a7582b37fac2da68fc45e8f34df32e4f5335fb79af9e549
+checksum=ec8d17115c03c7a3071b4088478819c091cb3bb237a4fa7277e9e1ea9849fb9f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 6f05852913c838e924070279f40e3363c422f5e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:12 +0200
Subject: [PATCH 196/404] kfilemetadata5: update to 5.81.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index e2b164f2598d..4ab6591f3fdf 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=75cd4d04eced8a30eb372157f0d0cfbe5dd89737b5083aceb0b650afa7f7600a
+checksum=318cd48f2b2400b2e453a4c3f373e84dc1296c972c0b0e01c5c39429353d6a31
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1b200f0b79a1168e459a310d276607b97060fe53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:14 +0200
Subject: [PATCH 197/404] kglobalaccel: update to 5.81.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 5c2f9fb11db0..cd5e507fd35e 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36f0abd93064b1b213c87d2e182649bc2f43cdd78ab45a4d686d9fb2c609bd04
+checksum=ff33288695af403eaf3ddd2a142e3ea7d3451c897e6d49a3746b6977aba3b829
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From 882571ae77801570ce661f3ca286e0ccc290a83b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:16 +0200
Subject: [PATCH 198/404] kguiaddons: update to 5.81.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index c0eaa7c4e821..d4f647b38ef8 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e563f232261b3a60c8d6c88ec5b08b6267c3c513d76d368386386192cefd4dc5
+checksum=e3f7ee35ae89f82af13e4da75d3cfa163597062c5a7b3207ed2841a9d7ca3ee1
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From a1fa939541a3c70e829126921cc52a5a6c6558aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:19 +0200
Subject: [PATCH 199/404] kholidays: update to 5.81.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 79c384e36276..6c992b4efeec 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9c0f0b652c9169b39148120d57c26d0c73c82111e8844d51e5c39fc3d7d5ce
+checksum=4ce8cee4f8e02f2f9940ef8036c5ff6a7d1f03928fee4e78bad2505f2fff98dd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 650a7587fb70eeb5f4da4eb60d0acb1f7aaff371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:22 +0200
Subject: [PATCH 200/404] khtml: update to 5.81.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index b0e488536b0f..893a3e756027 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=bd1a267013cdfcb7825d38c1ce3ad47fc52545163e1a201fa69ee2c4b50e12a1
+checksum=f7d920d5c701e38d121e912662e3eded80dcc78f7c776e3b8f303941791fe229
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 3cfcad94409380b21ab5cbd9729bd88baeff4f08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:24 +0200
Subject: [PATCH 201/404] ki18n: update to 5.81.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 7e0212bb5969..9ecaa3135080 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=883a79d7e6c795148c0fe76f44a6f9ffe34282f827e580e70937fe8259967a7a
+checksum=2c4bd5b4882890430369fa7fa47a754015e6db93277bfc8a4f1e20fe7d6ba78a
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From de77e3bab0d685fddc20ce5907e10daf70ba584c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:28 +0200
Subject: [PATCH 202/404] kiconthemes: update to 5.81.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..dee9c22d2ce0 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+checksum=fc47bee6468b91603fee0dcc166ca3dc3cea999eb4719b07fb269d17db3f6a14
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 70d106eb7f03ad11718a11deacdec35a4f7e4aed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:30 +0200
Subject: [PATCH 203/404] kidletime: update to 5.81.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index b76122decfdb..4e6d7dd5a63b 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03b9878dd11d98798a2801af3797be2c7a700bf637c7df1a5947238ae78552fa
+checksum=1be7af2cf8d1fa2a67dbec0ac4733e36f7b2d98250a5c63db3a8c323666af98b
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 80d8e51c6c863302b04689f5ee242f8fc3a30454 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:33 +0200
Subject: [PATCH 204/404] kimageformats: update to 5.81.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 45fefe561fce..d9111329cd7a 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d65641583e44c25de8ac98d7ef5925f08074a9ccf33ef7e7b504dd3a7347160
+checksum=a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e

From a6473b83f451c13453ddf0a506b251c3d0967aca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:35 +0200
Subject: [PATCH 205/404] kinit: update to 5.81.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 65e8f99795e6..267c2ab19397 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df256d1cb082de845a6f8d18b372694130c83e9b800033f0987d1929fcdc3480
+checksum=927c09cb6476143e1091e24f91cf26751ad57bab87b8cf3640d1ab4ab6c768f3
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ad4412a6341bfc3fce409201e9154e1086cbfa51 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:39 +0200
Subject: [PATCH 206/404] kio: update to 5.81.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 1b44de646fb5..b10c5e967ed1 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.80.1
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d971ce61a022f9e4d2d6be9c66917be271d0fb212795a151150e208e64cd5a28
+checksum=c62bae911978d163bbb86648344708d5b963823244941de0904c2a7800ecc07e
 
 CXXFLAGS+=" -fpermissive"
 

From 2279f52ee17b990d7572539baf907b3c8fd5a55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:42 +0200
Subject: [PATCH 207/404] kirigami2: update to 5.81.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 5a5e863bf4e5..9ddac83378a0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=228ef76fa69f1d7f89f8f04be93a0528507352f3c97f6d98b6259207b2679272
+checksum=d6572cfd6effc60429fb780fd0436fa484c42a01b30c9cf0319c68b15c158cad
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From c380e31c1b2594d063ce37fda1b9691ac1495732 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:45 +0200
Subject: [PATCH 208/404] kitemmodels: update to 5.81.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index d2e73871cfb6..63225c0e3e6a 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93948d1b2a29a9d6e8c436af5bc0ac5fc59e0d7a5632a5c611ee31a648856faf
+checksum=8093617c30c99d54562f6facdeb8929a7132841f13c63c4a0ad1a78e002e476f
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 4a9c19924314135353c20a554e7f44c8d2a64576 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:47 +0200
Subject: [PATCH 209/404] kitemviews: update to 5.81.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 5085d0fe2d7e..339df951acc9 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9702a531799c5f99810beaa64efeb0683d5ae8d4c4933de6906d205f192635c9
+checksum=368039bdd5a925565a8731a2cd405a51cf8c2ef19f7397a0c234d6558e61b05a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 7965b261fc3048f8309d90659af87b28dd939209 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:50 +0200
Subject: [PATCH 210/404] kjobwidgets: update to 5.81.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index b01352491e61..a2c8ed477044 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=572a9b6475a5e07ad6b8b7e138533a84d0aaeac72bd86143814d076965b2c5fb
+checksum=eac2a1bf5a7b6f8f549096a0574ded82dc2378059d5c9ea290754954908a88be
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 7473985329e0bedc59eadda02d920305b20ff5eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:52 +0200
Subject: [PATCH 211/404] kjs: update to 5.81.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c30af1f45cc4..f66858ca04e7 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=3286281f3ebbfc78336cff73a012106f836f39b7ef1ed32e6040c4ffb98f72ec
+checksum=b9a71c912448bf24083a6b7fb509ec5fa904b2838e02ae38d49dda702bbd2a11
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 92fed271e852c72a14c663e561cb02e8d6d88ca3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:55 +0200
Subject: [PATCH 212/404] kjsembed: update to 5.81.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 3b801522cdf5..7b1be930ea07 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a7446a5439c5be9ec24715c506d287379398d65ce4836937480afaa367ba6f20
+checksum=090f2e3e25f35566a4afd6a9369a867124c22a590b02d53e9d0fb49a99fb6a7e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 815661b1d75610f740462f6b75e0a0ab6d460541 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:57 +0200
Subject: [PATCH 213/404] kmediaplayer: update to 5.81.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 0b89840cf495..0c602c326d65 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=cb94adfd7fa6b24742cd958dd765fd82957bfb1cf242658cbd451e2ffdcf2628
+checksum=0b1de1e94f1ac3c0eefb976f19ec9b6d13f6a0e4c92bb14c2408f379c289327c
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 2cb5317ded0e5dd4b8aef3bf2431cf9aae0fe47d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:00 +0200
Subject: [PATCH 214/404] knewstuff: update to 5.81.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 141ab05ccc84..5085b07c9b4c 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe874f7fe944fe877c0d443349102ceacb268c45dc1f666ec42ff219024735d
+checksum=d3ae54a7a8dc4293c305eb440dfe524d4ef394e2ebcb050a0abadb66ad41ae72
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From d11642618807ba8ec54e60aeada7476e12dd92ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:02 +0200
Subject: [PATCH 215/404] knotifications: update to 5.81.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 03560e2b6ca5..4e9c06b5064f 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a7c9914f868818d57e2062e27c258a94c4041e702a0b55dafe3e1067730d6e9
+checksum=1ad7f7d0e17724085c2e55f9fda34828add9ff74966aae0bc95aa1041accce13
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 3bd4e2739d33c487a69a4d24b28c7961b6abed70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:05 +0200
Subject: [PATCH 216/404] knotifyconfig: update to 5.81.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index e49a03147110..247f563d8e6f 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fd474e9d231330b141e1443f46036d5b6d884c0edb9e55f1a4e762e1e2bd812c
+checksum=7a49ef1a4416b17082cc9d56e7ee01264999289cdcf06bd2d1a08717ce492d77
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 37339feb1fc76f236e96d332017f1d9cc95d80f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:07 +0200
Subject: [PATCH 217/404] kpackage: update to 5.81.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 220b30965a1f..04493841d112 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90894de985c5acfd7a393787a295d50778a9562ad5d88725e06dc71195e79880
+checksum=6a164389b07a6f00176a985cf9f88f9d5880514ba57084281a94722d7cd93ee4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 828a991fd9ab5eba4f7c846135b87dbf910c4bec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:11 +0200
Subject: [PATCH 218/404] kparts: update to 5.81.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index f20b15bc97a4..95e4fa3ff477 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9eb464f171f219e264237bb200767c8b3c70f10004521fad2d90af93bf926eba
+checksum=eb90dee4329fbc97acf3349fe344a86b2ef742dece35edf80e44ca5b1eaf58be
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From b75a62831a35441a59b8f7f35cbc865ef724d96e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:14 +0200
Subject: [PATCH 219/404] kpeople: update to 5.81.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index e729f8ec2aed..1ac63125702c 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c99f07f1acaf6ffbf94a9c2be7564f724ec41604986a74fc4400ea82296c9b2
+checksum=305a2b5c43c8964fa88e4326ef9d8a487b56af04c858a4f18e991b9218d2c3a8
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From 25882c511797297754f5f45abf8635f1c112e82b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:16 +0200
Subject: [PATCH 220/404] kplotting: update to 5.81.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index f414dfcf867c..66c507e07650 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc5ba241d24d063d6973303eaed1dce9d2d9aba630b83c74e4e73d06fe63711c
+checksum=cbfb7207c45b2e2afae2f78f9f924ec269515d07ac93bf52ca556287ab4266e8
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 495bc033f6576e055f6b2232bbab9f2d9ff33bcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:18 +0200
Subject: [PATCH 221/404] kpty: update to 5.81.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 03bb3537ca7e..0fb2a200b176 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93d0d266db0bb249ccb4f329acc0dbfb52289e697e0a6bfbb8c98e687fb6748d
+checksum=f34a4f614e2ce5346363fc303d2cc2291fee52c9c359115e9f1a8638e7954351
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 22695e1200cb39fa51f613027c0cccd4973c5bbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:21 +0200
Subject: [PATCH 222/404] kquickcharts: update to 5.81.0.

---
 srcpkgs/kquickcharts/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 14338d2dbc1e..729e06b14982 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,16 +1,17 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel"
+checkdepends="glslang which"
 short_desc="QtQuick plugin providing high-performance charts"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=962ed2b22ccac8ae900827bc41581efea546b833495869d3e3ccc5795314c74d
+checksum=5f864d1132a11fdbd9f77419a98277cfd4b761a227f171d08d8dd2c82fa88203
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From cb8df7243a1be30272e636647ff9665667d27ab2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:24 +0200
Subject: [PATCH 223/404] kross: update to 5.81.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 81bf735b1388..e5661c59b4cb 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=29ce280dd59d2019387bbe29326dbfd2a0a66b7f73ea15149b3ee5d561c5be19
+checksum=a3522ed07a9a33013639cb36484b4745af5025ef65efb10e291bc663b3f25a0a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5cea9a43729c8c90c9f0f219a9f60f65c14949c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:26 +0200
Subject: [PATCH 224/404] krunner: update to 5.81.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 87bf57cd88d1..c3a1da63a692 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fcf6e404e4a56877751ea5dc60c7a4b58cfb8986ae4262cc77bdeeca01342d2e
+checksum=45bdc312c28c995a9a29e8212b1299bd89350ea4cab706d343bf42813826c0f9
 
 krunner-devel_package() {
 	short_desc+=" - development"

From c2d1bd7078094743cd55b6c304e135cff902901e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:29 +0200
Subject: [PATCH 225/404] kservice: update to 5.81.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 10466421046c..3fb47fc5023b 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e868f2a337e8e05a8cc596f8baaa9c310cbc51e73b3dfd4f81ed3c3ca8217319
+checksum=ec6b054942417cb8c6adb2f502c43a268f96d85d9e4477e1292b1dd4d0e766cd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From a41d8fc1a6f17fd7f09e4736d56edecdddfe377e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:31 +0200
Subject: [PATCH 226/404] ksolid: update to 5.81.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 48791cc8f7ed..c35ba77d9442 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a54fdcbcd4d7f8cc3d10808199b2c09a249e0059e70b23053c8d79a3e8997f08
+checksum=8199ec5bc1443a54632c7c3999ec574b40bb0c35b9fb0ef6c54f5e0d9b242470
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 06dd11141ace3b79fe95f158dc7bee8e1d4cfdf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:35 +0200
Subject: [PATCH 227/404] ktexteditor: update to 5.81.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 5b2dac88d17f..549fe251f632 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a081655a8ea67818be740363a9310b2972ca34659e61f879ebf0df85421d073c
+checksum=75e774bff6eb0134818dc93fc505639ce3aa8316dce45255b28892f9f19c7ddd
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From 7e483ea0d9f73f0e573f1a2184dbafaf1180daf6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:37 +0200
Subject: [PATCH 228/404] ktextwidgets: update to 5.81.0.

---
 srcpkgs/ktextwidgets/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 432795e79b4a..32cfc30c64d7 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,18 +1,19 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  qt5-tools gettext python3"
-makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel"
+makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel
+ qt5-speech-devel"
 short_desc="KDE Text editing widgets"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e8d5dd11835b8245ad1cb0ce0de74d40a9e8310df93b3c64998b2e3eb29d2289
+checksum=c8274b737da6535af2bfe3b51733baaea5f1bb348ea7854658b84f58bb10b612
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From bd2c72edebf29798985f6f7324b62fc5722109f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:40 +0200
Subject: [PATCH 229/404] kunitconversion: update to 5.81.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 7f4ba3ab48c9..b96701a522b0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94ac5214e4a990ae569f2e4bdc66d2d6f46b60a225ee9f90274c4b39e69093c1
+checksum=3efc21a1438875429620a725e4bb4b8dbe40e2aa5f041f5d6557e2e1461131bd
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 08a9b9600abd60837daa161e5c461dedb0e859ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:43 +0200
Subject: [PATCH 230/404] kwallet: update to 5.81.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 913f8c6ce984..83de3e0b794e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e1c9ed012735fdea4000086c2646e2ad99f15127b399420885a7b7de25ec99df
+checksum=ff8596bf771c55bbfdc9da2736eeb4f86a63a92bc82132ce4a6b1d82809005c4
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 18eb93200b8ea8dfccf11298735c1d91624a5737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:46 +0200
Subject: [PATCH 231/404] kwayland: update to 5.81.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index ada4563d3aef..868c326c9abb 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=403bf7c8426febfda37f26addb90a31b5978d9fc76d25a22472570e8273b79ab
+checksum=de22cad7b4ddaebbfc9a9b60cbd7e41c5de5a943c89b46b077a12b651cfb43a8
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 7151853d8cf8240a58b414e5060cfda184148b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:50 +0200
Subject: [PATCH 232/404] kwidgetsaddons: update to 5.81.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 0a005d1c4acb..3685b6bc3480 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a9bfd5653d4c45d55bac5d0a28c8caec8d504bce2ee192d68ecf3ce10a0fcf1
+checksum=2f25e926edcab19e3ff3529b71ca409b2bb100c35f5a6e3aff663e1854a3b642
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From b7bebe6fd90a928a0762e2dc8ddc51425cc0b6c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:52 +0200
Subject: [PATCH 233/404] kwindowsystem: update to 5.81.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 7b24aaa197ac..00ae6c415e12 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b352b67752d17d67a4eb120c224b5b165af3b09f9ac5e1224909d278042704b2
+checksum=4753aaabb073b41dd8be79d454756ec616cc386f3be16f5503a77c84e12eaa86
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 466898419659e11505cefa2d447a3b9d47caabca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:56 +0200
Subject: [PATCH 234/404] kxmlgui: update to 5.81.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 8d43d3f35ed3..d70a1b72485b 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81af735b097231e4343e9d695dc4b8d80e64ab49a32d34c4bce1cd17c566b79d
+checksum=db232450286e515491059ee5017287ba4b610be0a194179e882af4c03e4e6ad0
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 326da8bbcac0564fd2d9f1163f25ee3826d7dcc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:59 +0200
Subject: [PATCH 235/404] kxmlrpcclient: update to 5.81.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 02b6a0686c99..b0246c669822 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04122dcbd5fdc4ebaa3091750fc51e29a5dcb0dc7acbaf72ce6fe92ea7115a29
+checksum=0f8e5a6b331e306292763fa573e832a62e1c0ace911051b687d617dbb8e10397
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 0911a84b58d55ca4eefa23b68ea2c3859754d2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:01 +0200
Subject: [PATCH 236/404] modemmanager-qt5: update to 5.81.0.

---
 srcpkgs/modemmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b312445f1851..9740a3b11394 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=865aa36da3bca6657dc130313bfcc6030b6b2bac2993c0dfa3b02321448724e0
+checksum=060e62f99bf7786619a9b182f6f5a2191f173b2ad3a764e05152e39e80243907
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9a7189ba5c39b0bdecbdb7e0d8d8e605b0deb82f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:03 +0200
Subject: [PATCH 237/404] networkmanager-qt5: update to 5.81.0.

---
 srcpkgs/networkmanager-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index b42fdefafb3f..a9f42dd23cc6 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e0da7c2fcdc3f9d1250c8f0757267c5110ac3e38f70c26a736df9e4aacb0bff1
+checksum=2e8a6c1a78119d5ccd21e92a99ed55d3f866dccc2622e8c908c76793899246c8
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From 82a58f24f3c66d5aa9410680da64d0cdbe451f5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:12 +0200
Subject: [PATCH 238/404] oxygen-icons5: update to 5.81.0.

---
 srcpkgs/oxygen-icons5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index ea26c4941341..a8d582b00d88 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=35a97955b45f35244ca0d30433f3ad1e9348e9083f91e42d0e0198b6474ab84e
+checksum=1f9a1b5fb676eeb71b9180d6a4703dc25ce872019231464ca0cd709759dc0fe8
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From e8f2b76ad2d1e9d78be4ac4fa6367260b2ca8976 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:15 +0200
Subject: [PATCH 239/404] plasma-framework: update to 5.81.0.

---
 srcpkgs/plasma-framework/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 3ff14239726d..57747992d4e6 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3af0f7628c6404c63ac871ffe7540fc6d12be2bf988503724c6bb00505893d9
+checksum=67037be91694620fa713a1cf3972f42f3ca798217c8c5915dcdaa9298651663c
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From b013ad298aacd44dd88052ec6e806a82323a30a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:18 +0200
Subject: [PATCH 240/404] prison: update to 5.81.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 24d408da29bc..6b3c6fa22283 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=ff2eed5feff0a57e22eef9dcbf324435894ba76892a06e7087f1380438df9ab9
+checksum=cf13d796b99e2aa9f5d591f9936782ee891ff8b0cf487a5eca242f941ee439d7
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 31a9a5766f2921842b40016da20329126a337c02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:20 +0200
Subject: [PATCH 241/404] purpose: update to 5.81.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 7beaa7a64fc4..1a4bc42f37e5 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad507573aa42e0223771679c92887ff309fa33e68f20820c98b5702617acfd80
+checksum=4e0a04c90c6e2d97a08158e80f486163d30abf156035214ed5e665e37be70805
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 69bb1d686ea65b2bae0f75963439c1c46b15c6a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:22 +0200
Subject: [PATCH 242/404] qqc2-desktop-style: update to 5.81.0.

---
 srcpkgs/qqc2-desktop-style/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 3317bdb40389..59ba3ccb4f2c 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efb3ed865996100921b8dd7340d4f7dd1bc477381ce401cf36b8ed548d3dbe91
+checksum=a5cb7fcc4fa7bc87a66a2ef3df7d67568faf685e21b01d7db3dc99e80d9384a9
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 786f6cdf49f8e64a1291a4d038016fefa84c083f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:25 +0200
Subject: [PATCH 243/404] sonnet: update to 5.81.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index cff67af11bc7..661cd1376b02 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b0d2eda96edc461319d48b05171457a3648217805f3481b893b8be65bc6b788e
+checksum=4a7c4e4d3da2df50004565c76ce0334697b941bd011be08fed7d91f96c37364e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From e940ca396f46f312da41c93a083f97e28e15eaba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:27 +0200
Subject: [PATCH 244/404] syndication: update to 5.81.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index a31e5480c573..5b565eeb0daa 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=10f2273b87e89f2ea73baee66a8b1cc993acea96d74be29f99ac631145f742c8
+checksum=76be770e0ba18fb6494b4de5b6928553b56495ac736d32c80818d0899a85adbb
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 48aadd06d84368b2afa8b175eaa995172b3ab28d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:31 +0200
Subject: [PATCH 245/404] syntax-highlighting: update to 5.81.0.

---
 srcpkgs/syntax-highlighting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index ed80a704ff27..b7a15a589afa 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91f458918613703468512b00690a02b617eb47be4df5ed7d9e3f1311b3b31218
+checksum=cb170316f447c7b0097a72b9690b17b1fb87cb578528c5c5e3bb4de411ff4a5d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 0d930ca196881a4f60883e290a1253d54b9fe816 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:34 +0200
Subject: [PATCH 246/404] threadweaver: update to 5.81.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 2f7b6e7a09aa..0534f4d03712 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a3722a5c927eeaf8e9841fdcb513018ea41f384f41c25a1542cc52bdd43b5c8
+checksum=4e25142bf75212660d2b1c20293ff5d04aa8c6b51aef8e935231d7bde227bf0e
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 4679e372f749db3a11b9ea5d49f601e3da94d21e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 20:35:32 +0200
Subject: [PATCH 247/404] sispmctl: update to 4.9.

---
 srcpkgs/sispmctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sispmctl/template b/srcpkgs/sispmctl/template
index e3aef58360f5..c8a6753b03b0 100644
--- a/srcpkgs/sispmctl/template
+++ b/srcpkgs/sispmctl/template
@@ -1,6 +1,6 @@
 # Template file for 'sispmctl'
 pkgname=sispmctl
-version=4.8
+version=4.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://sispmctl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0f8391f7e95cbf1fb96a68686a1dcf1e16747b050ae1b8ff90653c99976068db
+checksum=6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647
 system_groups="sispmctl"
 
 post_install() {

From 7e6531f3760f6061c523cb913849a497e2e41db8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:13:51 +0200
Subject: [PATCH 248/404] strip-nondeterminism: update to 1.11.0.

---
 srcpkgs/strip-nondeterminism/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template
index 6cd5094e8b0f..3d02ed349f83 100644
--- a/srcpkgs/strip-nondeterminism/template
+++ b/srcpkgs/strip-nondeterminism/template
@@ -1,6 +1,6 @@
 # Template file for 'strip-nondeterminism'
 pkgname=strip-nondeterminism
-version=1.9.0
+version=1.11.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl-Archive-Zip perl-Sub-Override"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
 distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
-checksum=467a1f11830e82c41b2f40c5f7a7f1c5579391a18170652ece581d83ba6d1242
+checksum=0774647828fe348a4f957a32fc0d8ab1749c013347bd6544147d059c208700d6
 
 post_install() {
 	# remove Debhelper add-on

From 30c1a13dfc2bc6f0b913a88f57eae4f9e569a880 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@mabragor.physics.uu.se>
Date: Fri, 9 Apr 2021 17:58:40 +0200
Subject: [PATCH 249/404] thunderbird: update to 78.9.1.

Closes: #30112 [via git-merge-pr]
---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 78531a033701..001956952220 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.9.0
+version=78.9.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=8015a7f78b1644578f398b5ab670637c70890ab2bade35ba321d47d099ed3ac0
+checksum=6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d
 
 lib32disabled=yes
 

From 39c5359b63e177c1e21536063015803da9acca95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 16:21:23 -0300
Subject: [PATCH 250/404] thunderbird-i18n: update to 78.9.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index e00b1cb59577..bd4fc0c38f89 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.9.0
+version=78.9.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="63771cab0ed5fda4da901b6b6ecd2c88d87ddb9db019e0d5150e6a7111be6be3
- efd68277617e53282fbcb54bb63274d55c13211eac7340e6ba481d6b083604d3
- 9d9d566a8a71ce6bcbf7fdc4adf0d4e621bfcfffb792d582e86dbbd393f4eb4c
- 3edf831839f3d3a5ae3edce5578748cc6a73a2b3a4f413a10c32e7808eb4a242
- e2968ec5aabddb23249acb95a56f3f4c5068a3024f4a987cfcec29f46d1295df
- a254d31294909e4007811c8ab1f21f2814863765da71cf999332a04910b8cc1c
- 82a842c5d4fe297b1adfbed74fc8a63831b9507a4b1098db26f31a59d268dad0
- 295f9730a9c9baa4325b346c163cd0ee1e19bf589cba595c151f7a31311a43c0
- cb21492b06e6d4d7dc10f93e1a9c673297af7f010cbc6807245a776795d56486
- ed1ce2005e42d5796596863344913506f7423ca31bb0640167964b7c36395585
- 873a10bfc3f54c3240830eae45310f137823c0b83fb83dfc2098cc3a89acd802
- e87877e537c49be2ce03cf8a41d6776e8f861f1f9d90bc862224df18acfc52bb
- 8cdc746af4060d0260b1cf1c7efbd102ed4eabf57bdfb0e62167a39a08b526e1
- 39363f37a388c7b82df2d3cf868803682d8d6612a2b6557f1fdb9ae1466d4be7
- 48f51bb821ffe212f15e2065a6b3377cc33704f0a07a18b3deaa79d839bef89d
- 11c649466c6df3d2a62402711be46d74a02b668ec95de83f87e0675692b4633f
- 5e4cf5c5b24cfabe35971dec28e47c337749a3d382b43f7a2558deadc73a7864
- 1c49fe83d149bb1bbe4adce5f43bbf9e6bff1c6a917f898c029ce3fd46a7174c
- e3ed198a41f20b4168b23e29324eec3e5149de2cc454675f1a30d68baaa301c3
- b3fece3eaaccedcf28702e747307e11988eec65ef0cadccc0a01ea4092df8ac0
- fd8f4cec4dba5ba66f905c0428f01c9be9a2a20f8d3996828f54da6fff331028
- b6031ea780b0bf7b4f8c96aaf38d96dc686f0e2f3d58a4ec9918ad282f554c94
- e7f28b4333ea0d2db01af8496192769af1cf2666585bb463dc39d1ba1fd73345
- 2a80d9ca7e942c5eca5cbd8b82ca47901728f52c2de074fb9751c6c37fcb37ec
- 3dc2a28bf96db0d678457f86e46d7a24e683c38579c0b480f59c1eb9ef2573b9
- ff9079655352bdf9f5c1bb2e4e1596d1755300eda7e1670dbdb796a99223158a
- 71a1964cc36893f217a3c778a3fa17810843f830245241af27054ac1222a14e5
- 70b03fb570e5f3443d3be9970dd65fdd4fcd81bff4cd8319f028c0a4c8c166a8
- 78833bae90336e27256341a6b7ff1e53be9dd65447a1e71528ead725504f330d
- ac5276b4a13bb4a07c92160a6c3cbdb3d76bd622c49163eb0e82f84153259b5b
- c1f8180207e1abdbeaed39337c9bbf5d421eb2c85146646a888bd02e5de8c27e
- 800eb1b98bbb145a5bf22fa8a1e7cb8581371939655d61dcd642bba0de8250ba
- f39cb90898efc60c0f977f3f9abb94db5c1e18e2ace7317240784dc6382bccb3
- 496275439573f95f41a28d08d434ccea79e86d40f2a8321b47b98daa6dd3036c
- cc3229a2a009fcec836b2056ccbf50cdd4aba461517dad9a04331ae5f95a3a2f
- d20ff56ab68e53e3e4365247b564f6efc3c0cbdb301ff79ff9a80aae986c3b7d
- 998224c8e059afc068b004c0dd3887f85974a0af56b9d0ef0dad945e049db2b0
- fcf47de621e9f75729b1fa8c6c5f2135eb5b6d3dd78c8fae01acd6ad857604d2
- c7b3a6b7c0a59620e65877b3eaef92b2b2b7b4f5e7e152b7297db3d24a00b399
- 7fae97e71b183f55292feed9847a8d6141671d703e2af8aa1d64a71db2c377ec
- c8aa778fcf6c1c32b0038affadf540145cee44c9e59d278b55c4d1966ffa27d3
- 14065be7c50080586aa36cd43814dcabfae8572065cc3ec1ee8344e77cae9ce1
- af30877d15eecc65804528bbd4fde0897663526f4d25fdef00b4eaf84be8e580
- 925ea6a7f6e1a1fb17004cc7ab16bc0a307995541b9741264497f51d8a60679e
- 419b8bd06dd680b27b0843f5cf6af1b787695dc608136970a417ebafe3ae325a
- 7d9eb5e2bea78aa75dc345598e62ccc3efb37e64f21ec19a92920f826f486651
- e8e88cfad04351f1cc3ecb811011bcd964d6b4ef3a6a30f98e0f8a1363c93d37
- 1ca503db23e2648c4ebb40b117c652e0d8b95e4d07e843031db0530e00bfdd6f
- d02b1a07f824644e336a9e92a8342d58f5eaec903fa6b80067f3c650659b3756
- 7caf4222472434b465fca8f072a29503d38c143c1900b71bac7a607a7120d359
- 9a7c0186b6fca8e48ec3d0c94f0bfaeb73f378178799adc04c79164b300e575a
- abac946215c6a41be19aeacd271a2a2b2040bda87906d7e1c6f76ea19a35e507
- 5a3827a6f662950fdb001863ce8367d02fabe1c40d44500ee6b7019874119d23
- d1a1f0a30e037d65b667e1cff856a195c4747af4bf599f1bc8211347259fedf6
- dcdd87071b6b16eafb39d752119f60105d461dae5155c9b33d00bc3037a98dbe"
+checksum="4fddad63b7354b9c6db09428d3f73918d931768f61ae126596ae982ee00a6f9e
+ ea442b319837fec3bdbb80cec6ec5095f621caca9c784de70bdcf8a2523802cc
+ d93560c0870d361eb7088749dd88e1e61d1c68a4770b487863bb9dfaa770663a
+ c568bda96a224835ed6ac5acb0bfa997fa847fe2ef3d5cba8c3258b682d80019
+ e1494a55fa057d58d1709275a79a56af4e018f6210159bf8fa1baa1189b5f0e8
+ a6243eaaa5e06ee93f242c9d79959cee2b295fc281014de904d8baef2c27c33a
+ 5e2f59621dc5af683ad7f436c6838c304a6746956874b6089c25b4831c43a28c
+ 3855cac8661f5dc6567729418bbd398a1492b53f71e1af4ce5fa3984ad42a447
+ 3f9d4b4d23272213b3ff9640cf053c788907dcd0f780c03439871eb7529d48a7
+ 7e334735fce0bf7263b667a1d2003edab972aa83d2f8e7765865f01da28fd6c5
+ 138ab3c032ed48178c399c610648f7a5c44579bdee4021446771ac5cab86233f
+ 6493bde23c0909295c1e2d784ba317f294bccd3ee9c3a679e999c59bc02899c3
+ d579a1c125082e2dbe78cadbe0d0d45f12fff3ade7fe73ce652d23cc3a906dbf
+ 9cc6ee40f58a1f6bb8ca8cf965d4a558a2e3f8583474f06e61e34d00c5e342a7
+ 3ada2f1216617809b0b3330e6d825a65e2901f9a86bdfc0f41ca0545bd088e8a
+ 9bd2900ec74cb8dd306df64032546255d603c9b324de9d057c840b42ee1706bf
+ 1b11b00f7fc9380e414af33f62519ca0da1068ad446815768e169b2494e9c8da
+ 68f91ed0da57e4783240c500d2a19d3b5de3b21a5dab61444d29926698ebe793
+ c1033137d32c87848cdf85d4bf8acef36dfd85b20172f3bc448bed64280f9c6d
+ 02062b3925df8c511f313cb973f55c41e1585e6891c95013288d1715d24ddfb7
+ a1365e409d1eb897317a39c7513c1703e9fb93595d43a0820a579246381f1605
+ d1622c075e451eb5b87cd1ba9a19c0abc36289d99b33dfbba6831df7ce8b3f53
+ 3ac54f983ae0adc2395266f6a882ac56583c87ab3f6345257c507835c0c2d14e
+ a86188f64f643175d760bac1086b6b466a4a657425596cd79987a76ced42a8d9
+ 8a0cf55c1eff56cb5c6be354b96bab973c9852dcdb39446822c0eaa555b950ef
+ 4ef44068b021fd2cc15cae58bbda4ca86fdf3f7b2ffe23a86d32cc8040baead3
+ 09e81eeaa1ade640d7788fc927c58a0a290fbbc84f250e2e954e594c8466b528
+ dd5791a364b2bd4901d337ce58f4cacc4640acbb116d98d3b38ab13ac57bfc64
+ 3073815242bab5a49d6c9412f963e7fbeff8da1bc5f7655c66a093ee0459dff6
+ 5eb605f125548132cb9e9ce65682708423f31bbaf84767d87d0c743014004563
+ c85771a299ed01b440d8354d7220cd52f489d0a7364c5e1769b178adc27c3d17
+ adec1b156f39f7f2e0aa6a7fe19179734629077a7e7d387332bdc2cbd205ff40
+ b50c4d047c042194c8150b005f5e3666bebcc22fe7785ca79874ef3ef1a66380
+ 6ccecfd19cf3ba6dff2da883812bff303f0b36001d9ae2663dc3d2cb1fd87363
+ 15b2744ebbcb1c6b2a935821f3059265e79678fbe34a07dba2525c7a3a160eb6
+ 44069899ee9f6bf19e4b4a9cd63d83fc61c7f8a882f24ff34d5161a7dbf8ae15
+ 24986599a7cc2cf57d703b6d72c2aecad593dc08b2e0184770e7a283e6f7f7b8
+ 104f713c761beb7de9d7b5aa8be3dfad23f6864a5ba0f67823cd61e31979ef57
+ a4d5d0cc0cdad59f66b6d9f76029059e29619c838f022e322046ac210f963ac9
+ 4b1e917f5839f21a73e5595021c07573238df0212a984a5467adfd637cecd64c
+ f173d29ec6506635a622818b7e5cf2a11b0b7b5041daf555a930410f9d5cbf4b
+ 5699f89669e88c82a656488b4ad27d18beccb4db1a2293602d1e742628315a67
+ 842afff69b6fcac17e603a706b1d196aa3b4b875ff5139feb4c39324c2244563
+ de2499e4e04ed0bff3bc852f5e85baf60e4223d68cd323375d3df87f2828801d
+ 47cc9d5e63e5e99c066dba6bd1db440fbf6cd2885ed51af9bc021df892e4cdea
+ 89341fe50ff3655e7c41b8ad3097aaa745752f048739ac21652304e805491ac1
+ fc23e405ed4711c4b184f238e58b2be8705664e22038201deba674efd2315a15
+ b52ee3d71341f581b2b1b82764fb6d98e59bcd5d5564ad069b0f6220c82385dd
+ 29473e268c7a89302844a313f0ba1be93580a3aa5c11e78469fc1e73c6b14e50
+ 3d1f7950d66db5d01b3972ccee16056bc495866eff57b8c7434121d5fb54fa14
+ 59027c47928ccd0a326194dedffcffa2cdc1d73e9ee8d9e7edb87f9e0d8a4d37
+ cba44dee27d9a1bccbd23fcf46080e3e2e2d8b2e2bacd5414542f10824d9a969
+ de72ecf79efdd8fd97ead8af456fe02eee3725f5b41d96cb0c5c1e391a32e65a
+ 6f9d8cb48f7845874219c6cef403d037d52ef4f465e62494e53d43e640b7e1f7
+ 8c5e997ca6a2a512d3ad72424d0bed9d6e9adddacaed5151ad153529e28cb67e"

From 8b03f3e3e810c1df94c585a0650688c5b11c87ec Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 10 Apr 2021 17:39:54 +0300
Subject: [PATCH 251/404] ttyd: update to 1.6.3.

---
 .../patches/cmake-find-libwebsockets.patch    | 27 -------------------
 srcpkgs/ttyd/template                         |  6 ++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch

diff --git a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch b/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
deleted file mode 100644
index 68816ea49a1c..000000000000
--- a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# make it link against libwebsockets dynamically
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -53,21 +53,9 @@
- 
- find_package(OpenSSL REQUIRED)
- find_package(ZLIB REQUIRED)
--find_package(Libwebsockets 1.7.0 QUIET)
--
--if(NOT Libwebsockets_FOUND) # for libwebsockets-dev on ubuntu 16.04
--    find_path(LIBWEBSOCKETS_INCLUDE_DIR NAMES libwebsockets.h)
--    find_library(LIBWEBSOCKETS_LIBRARY NAMES websockets)
--    find_package_handle_standard_args(Libwebsockets REQUIRED_VARS LIBWEBSOCKETS_LIBRARY LIBWEBSOCKETS_INCLUDE_DIR)
--    mark_as_advanced(LIBWEBSOCKETS_INCLUDE_DIR LIBWEBSOCKETS_LIBRARY)
--    if(Libwebsockets_FOUND)
--        SET(LIBWEBSOCKETS_INCLUDE_DIRS "${LIBWEBSOCKETS_INCLUDE_DIR}")
--        SET(LIBWEBSOCKETS_LIBRARIES "${LIBWEBSOCKETS_LIBRARY}")
--    endif()
--endif()
- 
- set(INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIRS} ${JSON-C_INCLUDE_DIRS} ${LIBUV_INCLUDE_DIRS})
--set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
-+set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} websockets ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
- 
- if(WIN32)
-     list(APPEND LINK_LIBS shell32)
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index e870724e1d9a..0ed4cb21f952 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,7 +1,7 @@
 # Template file for 'ttyd'
 pkgname=ttyd
-version=1.6.0
-revision=5
+version=1.6.3
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config xxd"
 makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://tsl0922.github.io/ttyd/"
 distfiles="https://github.com/tsl0922/ttyd/archive/${version}.tar.gz"
-checksum=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83
+checksum=1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2e203c141f002b9f4153ad48f91ca25478a42bc4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:20:46 +0200
Subject: [PATCH 252/404] hiawatha: update to 10.12.

---
 srcpkgs/hiawatha/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 7e50522c999b..04377f40b88b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,6 +1,6 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
-version=10.11
+version=10.12
 revision=1
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://hiawatha-webserver.org"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.gz"
-checksum=79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727
+checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
 make_dirs="/var/log/hiawatha 0755 root root"
 

From 05829a1ae8348376b786f064b440edfca691caa0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:58:02 +0200
Subject: [PATCH 253/404] bwm-ng: update to 0.6.3.

---
 srcpkgs/bwm-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bwm-ng/template b/srcpkgs/bwm-ng/template
index fef308bd29b9..da2098cbec20 100644
--- a/srcpkgs/bwm-ng/template
+++ b/srcpkgs/bwm-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'bwm-ng'
 pkgname=bwm-ng
-version=0.6.2
+version=0.6.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gropp.org/?id=projects&sub=bwm-ng"
 distfiles="https://github.com/vgropp/bwm-ng/archive/v${version}.tar.gz"
-checksum=906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70
+checksum=c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46
 
 CFLAGS="-fgnu89-inline"
 

From 8d58f0bfc94435e8b2521773258409cabf059f68 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:59:38 +0200
Subject: [PATCH 254/404] btrbk: update to 0.31.2.

---
 srcpkgs/btrbk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 2f2d73653a8f..cad73834ecbc 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,6 +1,6 @@
 # Template file for 'btrbk'
 pkgname=btrbk
-version=0.31.1
+version=0.31.2
 revision=1
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://digint.ch/btrbk"
 changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
-checksum=ab461532d8f60ec794bddc8942e5a5bb055d92eb638b7b141134fe7d972b7a7a
+checksum=ec18ec934e7b6d22e3cf210b9d78c2961167aac0d31419de7b88d03fc8bfec80
 conf_files="/etc/btrbk/*"
 
 post_install() {

From 034292eabf2a51c62acfccbe3db4988d5d72e9dd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 10 Apr 2021 19:39:39 -0500
Subject: [PATCH 255/404] spotify: update to 1.1.56.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index e6e75f86daa6..c978264e78b7 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.55
+version=1.1.56
 revision=1
-_ver="${version}.498.gf9a83c60_amd64"
+_ver="${version}.595.g2d2da0de_amd64"
 _filename="spotify-client_${_ver}.deb"
 archs="x86_64"
 create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="custom:Proprietary"
 homepage="https://www.spotify.com"
 distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/${_filename}"
-checksum=78b2364f050c2b02b05784710344e70109b288a2661f92de29f373a718e2ac24
+checksum=eee658c4ce875e4646c2ef617832a9dbb3ad09ba1b7aeeaaf3476b7b00b833d1
 _license_checksum=3c073aa5bd7ffaba3df5283cdd2d3b36a415bd824234693844548fc3e16027a5
 repository=nonfree
 restricted=yes

From 901b83c7bf19c266fe8bc097a7c1151e899e7f78 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 11 Apr 2021 08:59:41 +1000
Subject: [PATCH 256/404] kops: update to 1.20.0

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 08bff1e80434..11aedb91559b 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.19.1
+version=1.20.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 308760f889047cfa9cc90a135556b8797e5058b2 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:24:34 +0200
Subject: [PATCH 257/404] vale: update to 2.10.2.

---
 srcpkgs/vale/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 387c8af6ed4d..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,16 +1,17 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.6.7
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
+go_package="${go_import_path}/cmd/vale"
 go_ldflags=" -X main.version=${version}"
 short_desc="Natural language linter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=21a43c7122932d0914bd023ae412432aed3e0112473bf809b542dba3986ee4bd
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE

From 4a3cb6dcef1ca0fcae43ec2ee1e8479686c41f99 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 10 Apr 2021 22:17:33 +0200
Subject: [PATCH 258/404] pipe-viewer: update to 0.0.9.

---
 srcpkgs/pipe-viewer/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 32991f6806bc..0ef7f35c9db0 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,11 +1,10 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.0.7
+version=0.0.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
 hostmakedepends="perl-Module-Build"
-makedepends="perl"
 depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https perl-Term-ReadLine-Gnu
  perl-Unicode-LineBreak perl-JSON-XS"
 checkdepends="perl-Test-Pod"
@@ -15,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=5e1211ec963aa2a187bcb0983227c5667e6c580bfc9de93dcb582388cc1baf22
+checksum=598ec7c39be0a42900ed1f4c5c68c26a728dd09b774e9dd38a873aa2def76e27
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 294a5e51a99016cd9bae1ea1e0169f41b180788d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 10 Apr 2021 22:20:01 +0200
Subject: [PATCH 259/404] x42-plugins: update to 20210409.

---
 srcpkgs/x42-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 76c74f6f7a32..432739cded19 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210408
+version=20210409
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cdc1d958581556ba56a6984fb8c1c66144e4c7447c11417824239fb2fa787fe4
+checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 063cf8cac15ed7e79b06a9505633e5e061882a6c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:05 +0200
Subject: [PATCH 260/404] glfw-wayland: update to 3.3.4.

---
 srcpkgs/glfw-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index ca283a9ddc7a..6f90d6bc7778 100644
--- a/srcpkgs/glfw-wayland/template
+++ b/srcpkgs/glfw-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'glfw-wayland'
 pkgname=glfw-wayland
-version=3.3.3
+version=3.3.4
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 882c847c39ac0185b24786df54ec6e67162ecd58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:09 +0200
Subject: [PATCH 261/404] glfw: update to 3.3.4.

---
 srcpkgs/glfw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index 9db52afc0e09..99feb63bca77 100644
--- a/srcpkgs/glfw/template
+++ b/srcpkgs/glfw/template
@@ -1,7 +1,7 @@
 # Template file for 'glfw'
 # update together with glfw-wayland
 pkgname=glfw
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 06f2a2e8696069472f72f32e0fa59926c8ad0135 Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 10 Apr 2021 14:40:52 +0200
Subject: [PATCH 262/404] gnucash: update to 4.5

---
 srcpkgs/gnucash/patches/fixtest.patch | 17 -----------------
 srcpkgs/gnucash/template              |  6 +++---
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gnucash/patches/fixtest.patch

diff --git a/srcpkgs/gnucash/patches/fixtest.patch b/srcpkgs/gnucash/patches/fixtest.patch
deleted file mode 100644
index 4404d99a534b..000000000000
--- a/srcpkgs/gnucash/patches/fixtest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgnucash/engine/test/utest-Transaction.cpp
-+++ libgnucash/engine/test/utest-Transaction.cpp
-@@ -901,7 +901,6 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-    g_assert_cmpint (check->hits, ==, 10);
-    g_assert_cmpint (check2->hits, ==, 1);
-
--   g_free (check->msg);
-    g_free (check2->msg);
-    check2->msg = g_strdup_printf (
-                     "[xaccTransEqual] splits %s and %s differ", split_guid0, split_guid0);
-@@ -924,6 +923,7 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-        auto bal01 = gnc_numeric_to_string (split01->balance);
-        auto bal10 = gnc_numeric_to_string (split10->balance);
-        auto bal11 = gnc_numeric_to_string (split11->balance);
-+       g_free (check->msg);
-        check->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal10, bal00);
-        check3->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal11, bal01);
\ No newline at end of file
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 125b7100770d..fa8bd17d09ad 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.4
-revision=2
+version=4.5
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 #distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2"
-checksum=d91e0d126b461d71de1bc1b20d9cf142704353dec07d3e6599d138422759e67a
+checksum=bc1f48a8453488a2e9f6b83b68613aa55caebe4d2983460bdac7e084b46cffdc
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"

From 8adb38273d8046930e050bdab769424da65a5dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Apr 2021 16:31:51 -0300
Subject: [PATCH 263/404] intel-gmmlib: add comment about -march used in
 compiler flags.

Reported by sgn
Suggestion for "fix" by tornaria
Closes #29801
---
 srcpkgs/intel-gmmlib/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index de10b7059d95..ad6ba012fa90 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -5,6 +5,14 @@ revision=1
 archs="i686* x86_64*"
 wrksrc=gmmlib-intel-gmmlib-${version}
 build_style=cmake
+# We could add -DGMMLIB_ARCH=generic to make it use -march=generic
+# instead of their default of 'corei7', but it isn't necessary:
+# the baseline of CPUs supported by gmmlib all fit under 'corei7'.
+# They also add many '-msse*' flags, but they are all supported
+# as well. Since this library isn't a dependency for anything but
+# intel-media-driver, which is wholly optional and installed only on
+# systems with supported CPUs, it doesn't make sense to change the
+# compilers flag in use.
 configure_args="-Wno-dev"
 short_desc="Intel Graphics Memory Management Library"
 maintainer="Stefano Ragni <st3r4g@protonmail.com>"

From ca36c49c5e8349dd5b03fba2be68f80445a9aec5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 09:14:43 -0700
Subject: [PATCH 264/404] daemonize: fix license

---
 srcpkgs/daemonize/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template
index 70dd249d23df..05ec75cda058 100644
--- a/srcpkgs/daemonize/template
+++ b/srcpkgs/daemonize/template
@@ -1,16 +1,16 @@
 # Template file for 'daemonize'
 pkgname=daemonize
 version=1.7.8
-revision=1
+revision=2
+wrksrc="$pkgname-release-$version"
 build_style=gnu-configure
 make_install_args="INSTALL_SBIN=/usr/bin"
 short_desc="Run a program as a Unix daemon"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD, MIT, Public Domain"
+license="BSD-3-Clause, MIT, Public Domain"
 homepage="http://software.clapper.org/daemonize/daemonize.html"
 distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz"
 checksum=20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60
-wrksrc="$pkgname-release-$version"
 
 post_extract() {
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile.in

From 4d3b493adaa7886f5fc3119a16ee8bcff502e6de Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 10:30:36 -0700
Subject: [PATCH 265/404] darkice: fix license

---
 srcpkgs/darkice/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index b86b883060a8..b61c6d8c7f8a 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -1,7 +1,7 @@
 # Template file for 'darkice'
 pkgname=darkice
 version=1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-lame-prefix=${XBPS_CROSS_BASE}/usr
@@ -15,9 +15,9 @@ hostmakedepends="pkg-config"
 makedepends="lame-devel libogg-devel libvorbis-devel faac-devel
  alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel"
 conf_files="/etc/darkice.cfg"
-short_desc="A live audio streamer source client for icecast"
+short_desc="Live audio streamer source client for icecast"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.darkice.org"
 distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz"
 checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6

From 6931e0a794a0cdbcbb1146de8f3940f47752fce7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:18:46 -0700
Subject: [PATCH 266/404] dcfldd: fix license, use vsed

---
 srcpkgs/dcfldd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dcfldd/template b/srcpkgs/dcfldd/template
index 60df0c6b4017..6a935d979d76 100644
--- a/srcpkgs/dcfldd/template
+++ b/srcpkgs/dcfldd/template
@@ -1,16 +1,16 @@
 # Template file for 'dcfldd'
 pkgname=dcfldd
 version=1.3.4r1
-revision=2
+revision=3
 wrksrc="${pkgname}-${version/r/-}"
 build_style=gnu-configure
 short_desc="Fork of dd with hashing, status, wipe and verify"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dcfldd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version/r/-}.tar.gz"
 checksum=f5143a184da56fd5ac729d6d8cbcf9f5da8e1cf4604aa9fb97c59553b7e6d5f8
 
 post_extract() {
-	sed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
+	vsed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
 }

From 7c3bb0d01cda31935b154f5ba0894c171e62dbcb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:21:26 -0700
Subject: [PATCH 267/404] dfc: fix license

---
 srcpkgs/dfc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template
index 8e29452f84a4..3b351375dcd0 100644
--- a/srcpkgs/dfc/template
+++ b/srcpkgs/dfc/template
@@ -1,13 +1,13 @@
 # Template file for 'dfc'
 pkgname=dfc
 version=3.1.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DXDG_CONFIG_DIR=/etc/xdg"
 hostmakedepends="gettext"
 short_desc="Display file system space usage using graphs and colors"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://projects.gw-computing.net/projects/dfc"
 distfiles="https://github.com/Rolinh/dfc/archive/v${version}.tar.gz"
 checksum=cea18fab1f053eddc359530816712edd1f497c556035a7c4d63ac87a4abc4b28

From ce8619860d6d6e17dfab3f6192601d9ce44fce1c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:22:43 -0700
Subject: [PATCH 268/404] dfu-programmer: fix license

---
 srcpkgs/dfu-programmer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dfu-programmer/template b/srcpkgs/dfu-programmer/template
index 7556fe631a10..d3fca448e6bf 100644
--- a/srcpkgs/dfu-programmer/template
+++ b/srcpkgs/dfu-programmer/template
@@ -1,17 +1,17 @@
 # Template file for 'dfu-programmer'
 pkgname=dfu-programmer
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="automake"
 makedepends="libusb-devel"
 short_desc="Device Firmware Upgrade class USB driver and flasher"
 maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dfu-programmer.github.io"
 distfiles="${SOURCEFORGE_SITE}/dfu-programmer/dfu-programmer/${version}/dfu-programmer-${version}.tar.gz"
 checksum=1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995
-configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 
 pre_configure() {
 	./bootstrap.sh

From f574f9926afe60320a34f410677507d709b00447 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 13:55:59 -0700
Subject: [PATCH 269/404] dgen-sdl: fix licenses

---
 srcpkgs/dgen-sdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index 52bc28e21688..d32ca6d23948 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,13 +1,13 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
 makedepends="SDL-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD, GPL-2, LGPL-2.1"
+license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://dgen.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/dgen/${pkgname}-${version}.tar.gz"
 checksum=99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e

From 3c9452f73d8fd237df02ba5c83f76bf50b9c0519 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:00:13 -0700
Subject: [PATCH 270/404] dhcp-helper: fix license

As there isn't a GPL v2.1 nor a GPL v4, I'm making the assumption that
GPL-2-only OR GPL-3-only is a wordy way of sauing GPL-2-or-later.
---
 srcpkgs/dhcp-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcp-helper/template b/srcpkgs/dhcp-helper/template
index bf5e2641e050..bf2672d010d3 100644
--- a/srcpkgs/dhcp-helper/template
+++ b/srcpkgs/dhcp-helper/template
@@ -1,14 +1,14 @@
 # Template file for 'dhcp-helper'
 pkgname=dhcp-helper
 version=1.2
-revision=1
+revision=2
 _srcver=1
 build_style=gnu-makefile
 make_build_args="version=$version"
 make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
 short_desc="Simple, straightforward DHCP relay agent"
 maintainer="fosslinux <fosslinux@aussies.space>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dhcp-helper/"
 distfiles="${DEBIAN_SITE}/main/d/dhcp-helper/dhcp-helper_${version}-${_srcver}.tar.gz"
 checksum=d11647e4af1f8b25fb854b6f444fec66910d7446d97de918eff5b8a284397e49

From 393b2ecfc0103c12a4483ca936403842023c2c52 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:10:59 -0700
Subject: [PATCH 271/404] dhcping: fix license

---
 srcpkgs/dhcping/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dhcping/template b/srcpkgs/dhcping/template
index 201c54bde415..e7fc06965a8c 100644
--- a/srcpkgs/dhcping/template
+++ b/srcpkgs/dhcping/template
@@ -1,11 +1,15 @@
 # Template file for 'dhcping'
 pkgname=dhcping
 version=1.2
-revision=2
+revision=3
 build_style=gnu-configure
+short_desc="Small tool to test availability of a dhcp-server"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/general.php"
-short_desc="A small tool letting you perform a dhcp-request to find out if a dhcp-server is still running"
 distfiles="http://www.mavetju.org/download/${pkgname}-${version}.tar.gz"
 checksum=32ef86959b0bdce4b33d4b2b216eee7148f7de7037ced81b2116210bc7d3646a
+
+post_install() {
+	vlicense LICENSE
+}

From b30ee5c25b45689f98f01ad6350d47e5c7ec0d63 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:16:50 -0700
Subject: [PATCH 272/404] diction: fix license

---
 srcpkgs/diction/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diction/template b/srcpkgs/diction/template
index 0a141dffb580..4beee8c9564a 100644
--- a/srcpkgs/diction/template
+++ b/srcpkgs/diction/template
@@ -1,11 +1,11 @@
 # Template file for 'diction'
 pkgname=diction
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Writing style checkers, diction and style"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/diction/diction.html"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6

From 1c65e2c49f146ddf3fcd3ffb6968da91f74815a1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:19:00 -0700
Subject: [PATCH 273/404] diff-pdf: fix license

---
 srcpkgs/diff-pdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 520c2c24e8ba..d58932a4a0df 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475

From 2555dfa2ab0827dcdf11c250fe7039e1d0696ecd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:44:59 -0700
Subject: [PATCH 274/404] dnstracer: fix license

---
 srcpkgs/dnstracer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnstracer/template b/srcpkgs/dnstracer/template
index f71827d3d792..eb5c5baa2321 100644
--- a/srcpkgs/dnstracer/template
+++ b/srcpkgs/dnstracer/template
@@ -1,13 +1,13 @@
 # Template file for 'dnstracer'
 pkgname=dnstracer
 version=1.10
-revision=1
+revision=2
 wrksrc="$pkgname"
 build_style=gnu-makefile
 hostmakedepends="perl"
 short_desc="Trace a chain of DNS servers to the source"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/dnstracer.php"
 distfiles="http://www.mavetju.org/download/dnstracer-${version}.tar.bz2"
 checksum=64cda0ed15ef598a38ec72a96a356e3d10b7f822fc75928115eae96a65ae2b21

From cba0a9842e9c500079f0f88473f7a56bdeafdd25 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:51:38 -0700
Subject: [PATCH 275/404] docker-gc: fix license

---
 srcpkgs/docker-gc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-gc/template b/srcpkgs/docker-gc/template
index 87d828eecf8d..d8e39ff15fc1 100644
--- a/srcpkgs/docker-gc/template
+++ b/srcpkgs/docker-gc/template
@@ -1,13 +1,13 @@
 # Template file for 'docker-gc'
 pkgname=docker-gc
 version=0.0.20170125
-revision=1
+revision=2
 _commit=f460c1d2d50b652e156ffe68489362bedc9278a5
 wrksrc="$pkgname-$_commit"
 depends="docker"
 short_desc="Docker garbage collection of containers and images"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="Apache-2.0"
 homepage="https://github.com/spotify/docker-gc"
 distfiles="$homepage/archive/$_commit.tar.gz"
 checksum=82ebc5eab842b41282c10e5cf1a82af521e4aa46e6d0fb9bddb2565cef5984a2

From 6f679a60dba7cbfd8677916ce4db8eb0d72f4d96 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:56:56 -0700
Subject: [PATCH 276/404] dssi: fix license

---
 srcpkgs/dssi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index fac019b9f57b..0a53d93ea421 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,7 +1,7 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
@@ -9,7 +9,7 @@ makedepends="
  ladspa-sdk libSM-devel libX11-devel"
 short_desc="API for audio processing plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e

From cacaf1953b3ad69bec7ff40e1a36c7040c5ac853 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:58:04 -0700
Subject: [PATCH 277/404] dtach: fix license

---
 srcpkgs/dtach/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index f1a0fe3fd865..09fdd2505cdb 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -1,12 +1,12 @@
 # Template file for 'dtach'
 pkgname=dtach
 version=0.9
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Tiny program that emulates the detach feature of GNU screen"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://dtach.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=32e9fd6923c553c443fab4ec9c1f95d83fa47b771e6e1dafb018c567291492f3
 

From 9015a7309953c10f8dcdfb8f479c3d81989e02c2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:59:24 -0700
Subject: [PATCH 278/404] dumpet: fix license

---
 srcpkgs/dumpet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template
index bb6a7713afe6..35204d8aa5e2 100644
--- a/srcpkgs/dumpet/template
+++ b/srcpkgs/dumpet/template
@@ -1,13 +1,13 @@
 # Template file for 'dumpet'
 pkgname=dumpet
 version=2.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="popt-devel libxml2-devel"
 short_desc="Tool to dump and debug bootable CD-like images"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/dumpet"
 distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2"
 checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3

From fedf4b6e9c487dfe883654d86f10cedb90bfb32f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 15:27:59 -0700
Subject: [PATCH 279/404] dvd+rw-tools: fix license and description

Closes: #29837 [via git-merge-pr]
---
 srcpkgs/dvd+rw-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dvd+rw-tools/template b/srcpkgs/dvd+rw-tools/template
index 5388e15692c9..b3c996b8fc2f 100644
--- a/srcpkgs/dvd+rw-tools/template
+++ b/srcpkgs/dvd+rw-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'dvd+rw-tools'
 pkgname=dvd+rw-tools
 version=7.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="m4"
-short_desc="A set of tools for DVD+RW/-RW drives"
+short_desc="Tools for DVD+RW/-RW drives"
 maintainer="Duncaen <mail@duncano.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fy.chalmers.se/~appro/linux/DVD+RW/"
 distfiles="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${version}.tar.gz"
 checksum=f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca

From 21a17b5a1365b0e191e31a3d0ffaaf238899f426 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:42:58 -0700
Subject: [PATCH 280/404] dmraid: fix license, xlint

---
 srcpkgs/dmraid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 7fccd9201546..420749bc8aa6 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -3,20 +3,20 @@ pkgname=dmraid
 _distver=1.0.0.rc16
 _patchver=3
 version="${_distver}.${_patchver}"
-revision=11
+revision=12
 wrksrc="${pkgname}"
 build_wrksrc="${_distver}-${_patchver}/${pkgname}"
 build_style=gnu-configure
 configure_args="--enable-led --enable-intel_led --enable-shared_lib"
 makedepends="device-mapper-devel"
-lib32disabled=yes
-disable_parallel_build="yes"
 short_desc="Device mapper RAID interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://people.redhat.com/~heinzm/sw/dmraid/"
 distfiles="${homepage}/src/dmraid-${_distver}-${_patchver}.tar.bz2"
 checksum=93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8
+disable_parallel_build=yes
+lib32disabled=yes
 
 dmraid-devel_package() {
 	short_desc+=" - development files"

From f44f22a76753f150ab2321794f2c0879491b00cd Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 22 Mar 2021 22:49:03 +0100
Subject: [PATCH 281/404] New package: pulseeffects-legacy-4.8.5

pulseeffects-legacy is a version of pulseeffects before 5.0.0 which still supports pulseaudio
---
 srcpkgs/pulseeffects-legacy/template | 21 +++++++++++++++++++++
 srcpkgs/pulseeffects-legacy/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/pulseeffects-legacy/template
 create mode 100644 srcpkgs/pulseeffects-legacy/update

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
new file mode 100644
index 000000000000..c38c8ef2d9ef
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -0,0 +1,21 @@
+# Template file for 'pulseeffects-legacy'
+pkgname=pulseeffects-legacy
+version=4.8.5
+revision=1
+wrksrc="pulseeffects-${version}"
+build_style=meson
+hostmakedepends="itstool pkg-config gettext"
+makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+ gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
+ pulseaudio-devel python3-gobject-devel sratom-devel
+ libsndfile-devel"
+depends="calf gsettings-desktop-schemas gst-plugins-bad1
+ gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
+short_desc="Sound effects for systems using PulseAudio (legacy)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/wwmm/pulseeffects"
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=df1c4c4a9811c62a549822dacde3a9e36233ba3ec58817ae52a236f6181a507c
+python_version=3
+conflicts="pulseeffects"
diff --git a/srcpkgs/pulseeffects-legacy/update b/srcpkgs/pulseeffects-legacy/update
new file mode 100644
index 000000000000..2638b2b10b6e
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/update
@@ -0,0 +1 @@
+ignore="5.*"

From 9ee630ba8e1f8620d6f84a26a479d797e4d8307a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 20 Mar 2021 23:54:16 +0100
Subject: [PATCH 282/404] pulseeffects: update to 5.0.3

Closes: #29638 [via git-merge-pr]
---
 srcpkgs/pulseeffects/INSTALL.msg |  2 ++
 srcpkgs/pulseeffects/template    | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/pulseeffects/INSTALL.msg

diff --git a/srcpkgs/pulseeffects/INSTALL.msg b/srcpkgs/pulseeffects/INSTALL.msg
new file mode 100644
index 000000000000..74c17ca2a8c5
--- /dev/null
+++ b/srcpkgs/pulseeffects/INSTALL.msg
@@ -0,0 +1,2 @@
+PulseEffects version 5 and later only support PipeWire and drop support for PulseAudio.
+If you want to use PulseEffects with PulseAudio, install pulseeffects-legacy instead.
diff --git a/srcpkgs/pulseeffects/template b/srcpkgs/pulseeffects/template
index a06f3042d97f..3b94e3dc873b 100644
--- a/srcpkgs/pulseeffects/template
+++ b/srcpkgs/pulseeffects/template
@@ -1,19 +1,20 @@
 # Template file for 'pulseeffects'
 pkgname=pulseeffects
-version=4.8.4
+version=5.0.3
 revision=1
 build_style=meson
 hostmakedepends="itstool pkg-config gettext"
 makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
- pulseaudio-devel python3-gobject-devel sratom-devel
- libsndfile-devel"
+ pipewire-devel python3-gobject-devel sratom-devel zita-convolver-devel
+ libsndfile-devel libbs2b-devel"
 depends="calf gsettings-desktop-schemas gst-plugins-bad1
- gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
-short_desc="Sound effects for Pulseaudio applications"
+ gst-plugins-good1 pipewire python3-gobject python3-scipy zita-convolver
+ gstreamer1-pipewire"
+short_desc="Sound effects for systems using PipeWire"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/pulseeffects"
-distfiles="https://github.com/wwmm/pulseeffects/archive/${version}.tar.gz"
-checksum=12ba3205025d815a747b58636861594f7d1e43a578a5b0411f7794f4c12e5d86
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=2e14858918b54bee5f6e4898cc803ae2170b4d624407fef39e0831b6584c4a4f
 python_version=3

From 2c28f7de3ead042b2791927d51951a5c2a96978e Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 10 Apr 2021 11:47:47 +0200
Subject: [PATCH 283/404] libheif: enable avif and heif encoding

---
 srcpkgs/libheif/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 64518027febf..5a7af30c347d 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,11 +1,12 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
-makedepends="libjpeg-turbo-devel libpng-devel libde265-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
+ libaom-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
@@ -19,7 +20,7 @@ pre_configure() {
 
 libheif-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libde265-devel"
+	depends="${sourcepkg}>=${version}_${revision} libde265-devel x265-devel libaom-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 3f64a1753569eee07949acfb5b58b851a830cd9f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:06 -0500
Subject: [PATCH 284/404] gns3-server: update to 2.2.20.

---
 srcpkgs/gns3-server/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 97b3922b3335..5d1569f3255b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,17 +13,15 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@d40618d1a623acd27733e9f172a57827eb46d7a25d18d49d7f6a3b77f98296e0
+checksum=@a7e068fd48b985acdfef111258c066c75e6d48a07bdb5b19af785ae3be607bf0
 make_check=no
 
 post_patch() {
 	# relax requirements
 	vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \
-		-e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \
-		-e 's|aiohttp=.*|aiohttp>=3.6.2|' \
+		-e 's|aiohttp=.*|aiohttp>=3.7.4|' \
 		-e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' \
-		-e 's|py-cpuinfo.*|py-cpuinfo>=5.0.0|' -i requirements.txt
+		-e 's|py-cpuinfo.*|py-cpuinfo>=5.8.0|' -i requirements.txt
 }
 post_install() {
 	# remove tests directory polluting site-packages

From ae400fb02fefc581af60bcc82c95414bdd1499ef Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:00 -0500
Subject: [PATCH 285/404] gns3-gui: update to 2.2.20.

---
 srcpkgs/gns3-gui/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index db049f1065a4..c50b2880a7aa 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,11 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@8da8b09690bf5d086732c032d3871b8e77fd55efa8553ac9e5f65c4c19bfb3d6
+checksum=@6a5cc45f2a1d7ec8634b33b812013df6635b4c3994f58bf0f55efc41d0a096d0
 
 post_patch() {
 	# relax requirements
-	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' -i requirements.txt
+	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' -i requirements.txt
 }
 
 do_check() {

From e36529422a4d0b2d143a326c5b81ac32e14c5f2f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 20:49:31 -0500
Subject: [PATCH 286/404] python3-sentry: update to 1.0.0.

---
 srcpkgs/python3-sentry/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c4406811688e..c2056965cad9 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
-version=0.15.1
-revision=2
+version=1.0.0
+revision=1
 wrksrc="sentry-python-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools
@@ -12,7 +12,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="BSD-2-Clause"
 homepage="https://github.com/getsentry/sentry-python"
 distfiles="https://github.com/getsentry/sentry-python/archive/${version}.tar.gz"
-checksum=92008498d7e1d286cf0d971200398152eb776293814db82a2121f1f264cd966e
+checksum=@514331143990028b4cecf9f8e4ff5dfe4c0dddd0dcb206b28b7fba22ada6cece
 
 do_check() {
 	cd build/lib

From 6b73c86490b519a05d6c9b44e0bff0c6a46482db Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:05 -0400
Subject: [PATCH 287/404] python3-googleapis-common-protos: update to 1.53.0.

---
 srcpkgs/python3-googleapis-common-protos/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template
index 776af77144ba..8b3c309b55d4 100644
--- a/srcpkgs/python3-googleapis-common-protos/template
+++ b/srcpkgs/python3-googleapis-common-protos/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-googleapis-common-protos'
 pkgname=python3-googleapis-common-protos
-version=1.52.0
-revision=2
+version=1.53.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,9 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/googleapis"
 distfiles="${PYPI_SITE}/g/googleapis-common-protos/googleapis-common-protos-${version}.tar.gz"
-checksum=560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351
+checksum=a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4
+# testing requires many optional dependencies
+make_check=no
 
 post_install() {
 	chmod -R +r "${DESTDIR}/${py3_sitelib}"

From 103b651cd1724ab4cfc4953386f435bf09009cba Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:12 -0400
Subject: [PATCH 288/404] python3-google-api-core: update to 1.26.2.

---
 srcpkgs/python3-google-api-core/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template
index f933a7e028b1..3530e7d8941c 100644
--- a/srcpkgs/python3-google-api-core/template
+++ b/srcpkgs/python3-google-api-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-core'
 pkgname=python3-google-api-core
-version=1.22.2
-revision=2
+version=1.26.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,6 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/python-api-core"
 distfiles="${PYPI_SITE}/g/google-api-core/google-api-core-${version}.tar.gz"
-checksum=779107f17e0fef8169c5239d56a8fbff03f9f72a3893c0c9e5842ec29dfedd54
-
-do_check() {
-	: all tests require grpc, which is optional dependencies.
-}
+checksum=418a131cd349e8bda036741d93e7fb9caefa691daa7296851193edc60b3c946c
+# all tests require grpc, which is optional dependencies.
+make_check=no

From 5e70d3ab93d8ed248e4c50a16e04602ff3c7115c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:49:12 -0400
Subject: [PATCH 289/404] python3-google-auth: update to 1.28.0.

---
 srcpkgs/python3-google-auth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template
index 9048569a95e2..880bb0441a1e 100644
--- a/srcpkgs/python3-google-auth/template
+++ b/srcpkgs/python3-google-auth/template
@@ -1,14 +1,16 @@
 # Template file for 'python3-google-auth'
 pkgname=python3-google-auth
-version=1.22.0
-revision=2
+version=1.28.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-pyasn1-modules python3-rsa python3-six python3-cachetools"
 short_desc="Google Authentication Library (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python"
 distfiles="${PYPI_SITE}/g/google-auth/google-auth-${version}.tar.gz"
-checksum=a73e6fb6d232ed1293ef9a5301e6f8aada7880d19c65d7f63e130dc50ec05593
+checksum=9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e
+# all tests require many optional dependencies
+make_check=no

From bcee9a0e73a67e5b303d3c3b65d432640d0c8fb9 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:55:35 -0400
Subject: [PATCH 290/404] python3-google-auth-httplib2: update to 0.1.0.

---
 srcpkgs/python3-google-auth-httplib2/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template
index 08d324c28714..c8ecea74b5f3 100644
--- a/srcpkgs/python3-google-auth-httplib2/template
+++ b/srcpkgs/python3-google-auth-httplib2/template
@@ -1,14 +1,17 @@
 # Template file for 'python3-google-auth-httplib2'
 pkgname=python3-google-auth-httplib2
-version=0.0.4
-revision=2
+version=0.1.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-google-auth python3-httplib2"
+checkdepends="$depends python3-mock python3-pytest python3-Flask"
 short_desc="Google Authentication Library: httplib2 transport (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
-homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python3-httplib2"
+homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
 distfiles="${PYPI_SITE}/g/google-auth-httplib2/google-auth-httplib2-${version}.tar.gz"
-checksum=8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39
+checksum=a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac
+# tests require unpackaged optional dependency
+make_check=no

From 8f828a2dda8229802326805189e6f9299961fa3e Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:57:44 -0400
Subject: [PATCH 291/404] python3-google-api-python-client: update to 2.0.2.

Closes: #29719 [via git-merge-pr]
---
 srcpkgs/python3-google-api-python-client/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index 10685d99dbe5..a3ed75efa6cf 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -1,26 +1,23 @@
 # Template file for 'python3-google-api-python-client'
 pkgname=python3-google-api-python-client
-version=1.12.3
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-httplib2 python3-google-auth python3-google-auth-httplib2
  python3-google-api-core python3-uritemplate python3-six"
+# FIXME: 6 unittests are failing, cannot use py test to override
 checkdepends="python3-mock $depends python3-oauth2client"
 short_desc="Google API client library for Python3"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/google-api-python-client"
 distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz"
-checksum=844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a
+checksum=48686cceb0dc8cb8b9ee1920ad7c0d9b499ef4fca0ca51c1c69f1e462a628011
 
 post_patch() {
 	# unittest2 is python2 thing.
 	vsed -i -e '/^import unittest2 as unittest/s/.*/import unittest/' \
 		tests/test_*.py
 }
-
-do_check() {
-	: 6 unittest is failing, cannot use py test to override
-}

From 2a59d3b8e20c6d131d2c0547a678da36f2e99c70 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:09:33 +0100
Subject: [PATCH 292/404] attr: update to 2.5.1.

Closes: #29609 [via git-merge-pr]
---
 srcpkgs/attr/patches/escape-left-brace-regex.patch | 11 -----------
 srcpkgs/attr/template                              |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/attr/patches/escape-left-brace-regex.patch

diff --git a/srcpkgs/attr/patches/escape-left-brace-regex.patch b/srcpkgs/attr/patches/escape-left-brace-regex.patch
deleted file mode 100644
index 5c91bba818ad..000000000000
--- a/srcpkgs/attr/patches/escape-left-brace-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/run
-+++ test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index c5e6b8aa5ebf..231701bd0158 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -1,19 +1,19 @@
 # Template file for 'attr'
 pkgname=attr
-version=2.4.48
+version=2.5.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
-checkdepends="perl"
 configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
  --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+make_check_args="-j1" # Tests broken when ran in parallel
+checkdepends="perl"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://savannah.nongnu.org/projects/attr"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz"
-checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
-make_check_args="-j1" # Tests broken when ran in parallel
+checksum=bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8
 conf_files="/etc/xattr.conf"
 
 # The included libtool is rotten and only works with bash; easiest fix.

From 03697f10165e9a450ee1db2932f171c679edb118 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:44:24 +0100
Subject: [PATCH 293/404] acl: update to 2.3.1.

Closes: #29623 [via git-merge-pr]
---
 srcpkgs/acl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 3edfcfef82b8..9fa74946a240 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,6 +1,6 @@
 # Template file for 'acl'
 pkgname=acl
-version=2.2.53
+version=2.3.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://savannah.nongnu.org/projects/acl"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz"
-checksum=06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7
+checksum=760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From a07c2533e5c31653b3f7f885d8f346ddf5be36c8 Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 24 Mar 2021 22:10:30 +0100
Subject: [PATCH 294/404] gqrx: update to 2.14.4

Closes: #25849 [via git-merge-pr]
---
 srcpkgs/gqrx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 1fe79b02e27f..b1b6597b1ef9 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,6 +1,6 @@
 # Template file for 'gqrx'
 pkgname=gqrx
-version=2.12.1
+version=2.14.4
 revision=2
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
@@ -10,14 +10,14 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3
 makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel
  pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel
  fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel
- $(vopt_if portaudio portaudio-devel)"
+ qt5-tools $(vopt_if portaudio portaudio-devel)"
 short_desc="Software defined radio receiver powered by GNU Radio and Qt"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://gqrx.dk/"
 changelog="https://raw.githubusercontent.com/csete/gqrx/master/resources/news.txt"
 distfiles="https://github.com/csete/gqrx/archive/v${version}.tar.gz"
-checksum=7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
+checksum=aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b
 
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio

From af4b5b92be920fc42e8e475d14beb0e71e97b4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 18:33:46 +0100
Subject: [PATCH 295/404] cargo-deny: update to 0.9.1.

Closes: #29596 [via git-merge-pr]
---
 srcpkgs/cargo-deny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 56fbd4eba258..5ee0066d8cf9 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.8.2
-revision=2
+version=0.9.1
+revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=6e081a843637c78846389c3d2922d0b07d95fd7aae496a87ef0e3bfb33bd4d06
+checksum=3fcb347ed35caf3a3e303c4ec3426fafab53dcc084d83ea5c62e79a600f4ed5f
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 2a00dc6293e190daf934fcf2b2f9c0894b49b383 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 8 Apr 2021 21:56:27 +0300
Subject: [PATCH 296/404] mesa: update to 21.0.2

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index fd6d0c77b651..0dbe36205d7e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.0.1
+version=21.0.2
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb
+checksum=46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From bbd304a29f2501628f3ac5255bbb63c23ad37397 Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Mon, 15 Mar 2021 18:47:05 -0700
Subject: [PATCH 297/404] signal-backup-decode: update to 0.2.3

Closes: #29502 [via git-merge-pr]
---
 srcpkgs/signal-backup-decode/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 119546b61ea7..747736adeb5e 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,7 +1,7 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
-version=0.2.0
-revision=2
+version=0.2.3
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel sqlite-devel"
@@ -9,5 +9,5 @@ short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pajowu/signal-backup-decode"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=e7727b6628004cd027e374bcd8a004d8c3e68b3ba03e82ce2c9e04ee58623ed2

From 064eed282a02c1d59d1ad9880380e84310304308 Mon Sep 17 00:00:00 2001
From: Nicolas Porcel <nicolasporcel06@gmail.com>
Date: Thu, 5 Sep 2019 01:22:00 +0100
Subject: [PATCH 298/404] clisp: enable readline by default

---
 srcpkgs/clisp/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index 0bd8d107d041..ee0941a3d581 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,7 +1,7 @@
 # Template file for 'clisp'
 pkgname=clisp
 version=2.49
-revision=5
+revision=6
 # possibly works elsewhere but not in an ancient 2010 release
 archs="x86_64* i686*"
 build_style=configure
@@ -20,6 +20,7 @@ nocross=yes
 lib32disabled=yes
 disable_parallel_build=yes
 build_options="readline"
+build_options_default="readline"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;

From 80471f8fba514f6b1c6b2686fdca59659894a9bd Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 6 Apr 2021 00:24:56 +0200
Subject: [PATCH 299/404] pandoc: update to 2.11.4.

---
 srcpkgs/pandoc/files/stack.yaml | 26 +++++++++-----------------
 srcpkgs/pandoc/template         | 18 ++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
index 47bf3bb1b5e4..82a5fcaded3f 100644
--- a/srcpkgs/pandoc/files/stack.yaml
+++ b/srcpkgs/pandoc/files/stack.yaml
@@ -1,31 +1,23 @@
-resolver: lts-16.20
+resolver: lts-17.9
 
 packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
+  - ./pandoc-2.11.4
   - ./pandoc-sidenote-0.20.0
 
 flags:
   pandoc:
     trypandoc: false
     embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
 
 extra-deps:
-  - pandoc-types-1.21
+  - pandoc-types-1.22
   - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
+  - regex-pcre-builtin-0.95.2.3.8.43
+  - hslua-1.2.0
+  - jira-wiki-markup-1.3.4
+  - commonmark-0.1.1.4
+  - commonmark-extensions-0.2.0.4
+  - commonmark-pandoc-0.2.0.1
 
 ghc-options:
    "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..ad233dd0aaf3 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,34 +1,30 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
- --flag=hslua:system-lua --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files --flag=hslua:system-lua
+ --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
-short_desc="Universal converter between markup formats (with citeproc support)"
+short_desc="Universal converter between markup formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +34,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From f5faefdbb5a620e9d6cd1bc15631ae1b2af9eb4c Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:25:28 +0200
Subject: [PATCH 300/404] python3-typed-ast: update to 1.4.2.

---
 srcpkgs/python3-typed-ast/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template
index 7c176c7c3154..8461f830a8cb 100644
--- a/srcpkgs/python3-typed-ast/template
+++ b/srcpkgs/python3-typed-ast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typed-ast'
 pkgname=python3-typed-ast
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 wrksrc="typed_ast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="whoami <whoami@systemli.org>"
 license="Apache-2.0"
 homepage="https://github.com/python/typed_ast"
 distfiles="https://github.com/python/typed_ast/archive/${version}.tar.gz"
-checksum=498a6cd88f78e4b2058092ff38c9941d61f4eba2c12b371240ba663f063adf7d
+checksum=be4b75ea880768489e30818267cf920027ed99014001ac428aedd0b31bbfc899
 
 do_patch() {
 	# python3-typed-ast uses the same header name with Python

From 87204f79c00f0718a658b8cbcf85fb880d2ede41 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 16:43:23 +0300
Subject: [PATCH 301/404] soundconverter: update to 4.0.0.

---
 srcpkgs/soundconverter/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 9e933929f971..bfffc3084732 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,10 +1,10 @@
 # Template file for 'soundconverter'
 pkgname=soundconverter
-version=3.0.2
-revision=2
-build_style=gnu-configure
+version=4.0.0
+revision=1
+build_style=python3-module
 pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
-hostmakedepends="glib intltool pkg-config python3-gobject"
+hostmakedepends="glib intltool pkg-config python3-gobject python3-distutils-extra"
 makedepends="gtk+3-devel gstreamer1-devel"
 depends="desktop-file-utils gst-plugins-good1 gst-plugins-ugly1
  hicolor-icon-theme python3-gobject"
@@ -12,8 +12,8 @@ short_desc="Leading audio file converter for the GNOME Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://soundconverter.org/"
-distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
-checksum=21d0b97bd4800a8e07840cf0ec035fa84a71a10c8cdadf5ea671880805aa68cb
+distfiles="https://launchpad.net/soundconverter/trunk/${version}/+download/soundconverter-${version}.tar.gz"
+checksum=4ad497793e40b321b2e10a363ab360b2b0bf338ff846eee7e00c895293ad4adb
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 35b9ccd3468672db478ac7089203f036292b8b48 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Mar 2021 19:34:59 +0100
Subject: [PATCH 302/404] cyrus-sasl: remove dependency to main package from
 modules

The various sasl modules do not dependent on any of the tools and
daemons that are included in the main cyrus-sasl package. Drop the
dependency.

Closes: #29383 [via git-merge-pr]
---
 srcpkgs/cyrus-sasl/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 03d12dcb28f6..608049a1d883 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -39,7 +39,6 @@ post_install() {
 }
 
 cyrus-sasl-modules-ldap_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (LDAP)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libldapdb.*"
@@ -47,7 +46,6 @@ cyrus-sasl-modules-ldap_package() {
 }
 
 cyrus-sasl-modules-sql_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (SQL)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libsql.*"
@@ -55,7 +53,6 @@ cyrus-sasl-modules-sql_package() {
 }
 
 cyrus-sasl-modules-gssapi_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libgssapi*"
@@ -63,7 +60,6 @@ cyrus-sasl-modules-gssapi_package() {
 }
 
 cyrus-sasl-modules_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules"
 	pkg_install() {
 		vmove usr/lib/sasl2

From 2228b05ef3f42d575178a8c6370d29dc8dfc61e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 15:24:12 -0300
Subject: [PATCH 303/404] ell: update to 0.39.

Add warnings about ABI stability.
---
 common/shlibs        | 2 +-
 srcpkgs/ell/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index db975d7164c4..077da5c7e735 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1001,7 +1001,7 @@ libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
 libev.so.4 libev-4.04_1
-libell.so.0 ell-0.20_1
+libell.so.0 ell-0.39_1
 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1
 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1
 libyaml-0.so.2 libyaml-0.1.4_1
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 19634a337aa0..9c798a84e8ae 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,7 @@
 # Template file for 'ell'
+# ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.36
+version=0.39
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -12,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6
+checksum=653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08
 # tests depend on kernel features
 make_check=extended
 

From 00f26e8192a3d31c661c9486f67b9a8bc5b24a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:50 -0300
Subject: [PATCH 304/404] ofono: revbump for ell.

---
 srcpkgs/ofono/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index 16695994583a..248e58d9502d 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,7 +1,7 @@
 # Template file for 'ofono'
 pkgname=ofono
 version=1.31
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"

From 81732f405791af3d13075b6e9c17c1543519975e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:43 -0300
Subject: [PATCH 305/404] bluez: update to 5.58.

Requested by paper42:
- add logging to services
- add experimental build option
---
 srcpkgs/bluez/files/bluetooth-meshd/log/run |  1 +
 srcpkgs/bluez/files/bluetooth-meshd/run     |  3 ++-
 srcpkgs/bluez/files/bluetoothd/log/run      |  1 +
 srcpkgs/bluez/files/bluetoothd/run          |  3 ++-
 srcpkgs/bluez/template                      | 12 +++++++-----
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
 create mode 120000 srcpkgs/bluez/files/bluetoothd/log/run

diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
index 752dbcc37bf7..2594d5fe56e4 100755
--- a/srcpkgs/bluez/files/bluetooth-meshd/run
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetoothd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run
index 2b96adcdcdc6..860fa4bf80b3 100755
--- a/srcpkgs/bluez/files/bluetoothd/run
+++ b/srcpkgs/bluez/files/bluetoothd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetoothd -n
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 80fcf51c85a0..2130b7340580 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,11 +1,12 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.55
+version=5.58
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)"
+ --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)
+ $(vopt_enable experimental)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
  readline-devel ell-devel $(vopt_if mesh json-c-devel)"
@@ -14,19 +15,20 @@ maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88
+checksum=c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
-build_options="mesh nfc"
 patch_args="-Np1"
 
+build_options="mesh nfc experimental"
+
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 post_patch() {
 	# Use system ell
-	rm -rf ell/*
+	rm -r ell/*
 }
 
 pre_configure() {

From ecc16ac1eab611322c92be4406536540e4c9535a Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Tue, 6 Apr 2021 19:36:44 -0700
Subject: [PATCH 306/404] vpnc-scripts: update to 20210402.

---
 srcpkgs/vpnc-scripts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index 80e2fdedeb7e..c2152391688f 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -1,13 +1,13 @@
 # Template file for 'vpnc-scripts'
 pkgname=vpnc-scripts
-version=20200930
+version=20210402
 revision=1
 short_desc="Network configuration scripts for VPNC and OpenConnect"
 maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.infradead.org/openconnect/vpnc-script.html"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=364a00b3ef0f4b036fc2ac4271723da1e9a1648137b65f771d73e04f1215b8ba
+checksum=cd00e831904554c7acbc9cd20e6457c6e787fe52dc2f75d39263a65faccc19f0
 
 do_install() {
 	vinstall vpnc-script 755 usr/libexec/vpnc-scripts

From b54a958ffa3fc9b6c2e6fdfb2ed063b59a350828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 11 Apr 2021 02:22:36 -0300
Subject: [PATCH 307/404] linux5.11: update to 5.11.13.

---
 srcpkgs/linux5.11/files/arm64-dotconfig | 6 +++---
 srcpkgs/linux5.11/template              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux5.11/files/arm64-dotconfig b/srcpkgs/linux5.11/files/arm64-dotconfig
index 2ae2b39dd4ed..293f821d5cbf 100644
--- a/srcpkgs/linux5.11/files/arm64-dotconfig
+++ b/srcpkgs/linux5.11/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.1 Kernel Configuration
+# Linux/arm64 5.11.13 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -228,6 +228,7 @@ CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -371,6 +372,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
@@ -2115,7 +2117,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -10177,7 +10178,6 @@ CONFIG_RESET_TEGRA_BPMP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=m
-CONFIG_USB_LGM_PHY=m
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index ad0b1ba7361b..61162540a83d 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.11'
 pkgname=linux5.11
-version=5.11.12
+version=5.11.13
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- ec443b0e6c9c10d94dc25b1662245d6421f75e223e7ea6de51e4f2c465b08164"
+ d38e0f7f732ec95c247182ad1c97dd433e9fbb1619c99f7a0a8a24fddd001c82"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 47522b7a5716c3237f4c3c02a0df4a8a63e93871 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:10:59 -0700
Subject: [PATCH 308/404] cachefilesd: fix license

---
 srcpkgs/cachefilesd/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cachefilesd/template b/srcpkgs/cachefilesd/template
index 67b75a779d34..0100afaeb273 100644
--- a/srcpkgs/cachefilesd/template
+++ b/srcpkgs/cachefilesd/template
@@ -1,19 +1,19 @@
 # Template file for 'cachefilesd'
 pkgname=cachefilesd
 version=0.10.10
-revision=1
+revision=2
 build_style=gnu-makefile
+make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 short_desc="Userspace daemon acting as a backend for FS-Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~dhowells/fscache/"
 distfiles="http://people.redhat.com/~dhowells/fscache/${pkgname}-${version}.tar.bz2"
-checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
-make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 conf_files="/etc/cachefilesd.conf"
+checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
 
-do_configure() {
-	sed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
+post_patch() {
+	vsed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
 }
 
 post_install() {

From ec5fc6fa5a221eb50dba69c85dd8b1ac70247158 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:21:18 -0700
Subject: [PATCH 309/404] cairo-dock-plugins: fix license

---
 srcpkgs/cairo-dock-plugins/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 1086ee328e40..7069ed9ed64d 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
@@ -10,7 +10,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
 checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
@@ -32,7 +32,6 @@ pre_configure() {
 
 cairo-dock-plugins-python3_package() {
 	depends="python3 ${sourcepkg}>=${version}_${revision}"
-	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"
 	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove ${py3_sitelib}

From 760153f073135db75c8bbc395524276a4c70f61d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:25:36 -0700
Subject: [PATCH 310/404] canto-curses: fix license

---
 srcpkgs/canto-curses/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 841369c23e86..b67f9f284f5b 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,16 +1,15 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=6
+revision=7
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel ncurses-devel readline-devel"
 depends="canto-next"
-pycompile_module="canto_curses"
-pycompile_dirs="/usr/lib/canto/plugins"
-short_desc="An ncurses frontend for canto-next Atom/RSS feed reader"
+short_desc="Ncurses frontend for canto-next Atom/RSS feed reader"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=88db1e4ac71f13f02ffb076a33b290e6c343da669dc54ea771af705b21ea6452

From a4cad7ad57be69ffd842b5cc2cfe8df8416a24ff Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:28:45 -0700
Subject: [PATCH 311/404] canto-next: fix license

---
 srcpkgs/canto-next/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 03eb9deb18eb..8fd497829427 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,15 +1,14 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=4
+revision=5
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-feedparser"
-pycompile_module="canto_next"
-pycompile_dirs="/usr/lib/canto/plugins"
 short_desc="Quick and concise Atom/RSS feed reader daemon"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=222d0382c145f81010653fbe1006f61455ed0aeb6c3940145524e633e3567ad5

From ca2206c769e4d1d4ef5cad0e26a5b35919129a09 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:30:34 -0700
Subject: [PATCH 312/404] cbp2make: fix license

---
 srcpkgs/cbp2make/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cbp2make/template b/srcpkgs/cbp2make/template
index 30f0e69093d9..4b8736ff6351 100644
--- a/srcpkgs/cbp2make/template
+++ b/srcpkgs/cbp2make/template
@@ -1,12 +1,12 @@
 # Template file for 'cbp2make'
 pkgname=cbp2make
 version=147
-revision=1
+revision=2
 wrksrc="$pkgname-stl-rev${version}-all"
 hostmakedepends="doxygen p7zip"
 short_desc="Makefile generation tool for Code::Blocks IDE"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://sourceforge.net/projects/cbp2make/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/cbp2make-stl-rev${version}-all.tar.7z"
 checksum=1b211abb8de00dc3048fccad6ebd076ab03dcb9f672cdff379de33a1346ed129

From 75f8161687fa902bbb5b397e91f90cf40cd9e265 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:40:08 -0700
Subject: [PATCH 313/404] ccextractor: fix license

---
 srcpkgs/ccextractor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index c766b264779e..d4bdf07d6f76 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
 version=0.88
-revision=1
+revision=2
 build_wrksrc="linux"
 build_style=gnu-configure
 configure_args="--enable-ocr --enable-hardsubx"
@@ -9,7 +9,7 @@ hostmakedepends="automake pkg-config"
 makedepends="leptonica-devel tesseract-ocr-devel ffmpeg-devel"
 short_desc="Extract subtitles from video streams"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"

From 8fba1b91093b8d15253d4819a5f62ba7d4db0f33 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:47:43 -0700
Subject: [PATCH 314/404] cdb: fix license

---
 srcpkgs/cdb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template
index 213b1d1a245a..c95afff379bb 100644
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@@ -1,11 +1,11 @@
 # Template file for 'cdb'
 pkgname=cdb
 version=0.75
-revision=4
+revision=5
 build_style=gnu-makefile
 short_desc="Constant database utilities"
 maintainer="Lain <lain@waifu.club>"
-license="Public domain"
+license="Public Domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"

From ae17da6b0494225a62efccfbc31073e846fbdebd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:07 -0700
Subject: [PATCH 315/404] cdecl: fix license

---
 srcpkgs/cdecl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f81..e120ca3af500 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
@@ -9,8 +9,8 @@ hostmakedepends="flex"
 makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
 CFLAGS="-DUSE_READLINE"

From 14afa0c4eab30aa61a8d00b30aade2014ba11e14 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:50 -0700
Subject: [PATCH 316/404] cdrdao: fix license

---
 srcpkgs/cdrdao/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template
index e2b43bf855fc..f8fae75ab2b3 100644
--- a/srcpkgs/cdrdao/template
+++ b/srcpkgs/cdrdao/template
@@ -1,13 +1,13 @@
 # Template file for 'cdrdao'
 pkgname=cdrdao
 version=1.2.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="lame-devel libao-devel libmad-devel libvorbis-devel"
 short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2..0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://cdrdao.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2"
 checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4

From 9f453cfea09bbd875586602cd11f6630f5e96b91 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:23:27 -0700
Subject: [PATCH 317/404] chmlib: fix license

---
 srcpkgs/chmlib/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chmlib/template b/srcpkgs/chmlib/template
index 7f2eb56ab4a2..a573c27d1499 100644
--- a/srcpkgs/chmlib/template
+++ b/srcpkgs/chmlib/template
@@ -1,12 +1,12 @@
 # Template file for 'chmlib'
 pkgname=chmlib
 version=0.40
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-examples"
 short_desc="Utilities for dealing with Microsoft ITSS/CHM format files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.jedrea.com/chmlib/"
 distfiles="http://www.jedrea.com/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
@@ -26,4 +26,3 @@ libchmlib-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From fb8fe602f6bcec88e58013e35bb6ce42368d4a9c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:32:34 -0700
Subject: [PATCH 318/404] chntpw: fix license

---
 srcpkgs/chntpw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 75289c85961f..7ccac88fe06d 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -1,12 +1,12 @@
 # Template file for 'chntpw'
 pkgname=chntpw
 version=140201
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://pogostick.net/~pnh/ntpasswd/"
 distfiles="http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${version}.zip"
 checksum=96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc

From 0edd2a6d9d6b3000ebc26df17e3fef20c7da0d35 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:57:43 -0700
Subject: [PATCH 319/404] cksfv: fix license

---
 srcpkgs/cksfv/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cksfv/template b/srcpkgs/cksfv/template
index 864fe357e126..78f61f3f2579 100644
--- a/srcpkgs/cksfv/template
+++ b/srcpkgs/cksfv/template
@@ -1,11 +1,12 @@
+# Template file for 'cksfv'
 pkgname=cksfv
 version=1.3.14
-revision=2
+revision=3
 build_style=configure
+short_desc="SFV checksum utility (simple file verification)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://zakalwe.fi/~shd/foss/cksfv/"
-short_desc="SFV checksum utility (simple file verification)"
 distfiles="http://zakalwe.fi/~shd/foss/cksfv/files/${pkgname}-${version}.tar.gz"
 checksum=010facce85b317b7b9f952c84cd59ce03476a2b685db33a49b6ea0d1b38378ea
 

From 689037433291a56245a91276d0a1187c9cdf9cd5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 09:09:09 -0700
Subject: [PATCH 320/404] clustalw: fix license

---
 srcpkgs/clustalw/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/clustalw/template b/srcpkgs/clustalw/template
index 77fb0be93c62..5c048024e402 100644
--- a/srcpkgs/clustalw/template
+++ b/srcpkgs/clustalw/template
@@ -1,12 +1,11 @@
 # Template file for 'clustalw'
 pkgname=clustalw
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Bioinformatics program for multiple sequence alignment"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v3"
+license="LGPL-3.0-or-later"
 homepage="http://clustal.org"
-distfiles="http://www.clustal.org/download/current/clustalw-2.1.tar.gz"
+distfiles="http://www.clustal.org/download/current/clustalw-${version}.tar.gz"
 checksum=e052059b87abfd8c9e695c280bfba86a65899138c82abccd5b00478a80f49486
-

From 21b7fec34fffaa1bd1fe41c08a7f040304e7246b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:36 -0700
Subject: [PATCH 321/404] connman-ncurses: fix license

---
 srcpkgs/connman-ncurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template
index 8ba2028a5f28..5fd4b33b08fc 100644
--- a/srcpkgs/connman-ncurses/template
+++ b/srcpkgs/connman-ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'connman-ncurses'
 pkgname=connman-ncurses
 version=1.0
-revision=4
+revision=5
 wrksrc="connman-json-client-${version}"
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel"
@@ -9,7 +9,7 @@ makedepends="json-c-devel ncurses-devel dbus-devel"
 depends="dbus connman"
 short_desc="Simple ncurses-based UI for ConnMan"
 maintainer="Sergei Akhmatdinov <sakhmatd@riseup.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/eurogiciel-oss/connman-json-client"
 distfiles="https://github.com/eurogiciel-oss/connman-json-client/archive/v${version}.tar.gz"
 checksum=724604787b51cd3bd2ba5d2291f5f2efe0558a1ec78d92d3c92ebc78f6c63219

From 2ca4d91872aa91babb9fa6b55b12f1cf51a9a159 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:44 -0700
Subject: [PATCH 322/404] connman-ui: fix license

---
 srcpkgs/connman-ui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/connman-ui/template b/srcpkgs/connman-ui/template
index fdd0fa5d20c0..8aaafad5b55a 100644
--- a/srcpkgs/connman-ui/template
+++ b/srcpkgs/connman-ui/template
@@ -1,15 +1,15 @@
 # Template file for 'connman-ui'
 pkgname=connman-ui
 version=0.0.20150622
-revision=2
+revision=3
 _gitrev=fce0af94e121bde77c7fa2ebd6a319f0180c5516
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-configure
 hostmakedepends="automake libtool intltool glib-devel pkg-config"
 makedepends="dbus-devel glib-devel gtk+3-devel"
-short_desc="A full-featured GTK based trayicon UI for ConnMan"
+short_desc="Full-featured GTK based trayicon UI for ConnMan"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/tbursztyka/connman-ui"
 distfiles="${homepage}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=12ac39f1d4c9e3f54ede6c1d1ebc2dbd6d31cdb74516cb5080f9860499d0a1ee

From d7791ffd342f97fb6a4476d9e477a97be6b56876 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:28:42 -0700
Subject: [PATCH 323/404] cparser: fix license

---
 srcpkgs/cparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cparser/template b/srcpkgs/cparser/template
index d77478ac42a3..d56c074d648c 100644
--- a/srcpkgs/cparser/template
+++ b/srcpkgs/cparser/template
@@ -1,13 +1,13 @@
 # Template file for 'cparser'
 pkgname=cparser
 version=1.22.0
-revision=2
+revision=3
 wrksrc="cparser-cparser-${version}"
 makedepends="libfirm-devel"
 depends="gcc"
 short_desc="C99 parser (with GNU extensions) and libfirm frontend"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://libfirm.org/"
 distfiles="https://github.com/MatzeB/cparser/archive/cparser-${version}.tar.gz"
 checksum=0965aa23d8ed7d4cce309806fec2d2c18ad20a74a084340baed0dc874b24175b

From ff1149f68b389fb78ae16ec8892f11ebdc62c285 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:31:09 -0700
Subject: [PATCH 324/404] cppdb: fix license

---
 srcpkgs/cppdb/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppdb/template b/srcpkgs/cppdb/template
index cf5194e6f507..d09016575384 100644
--- a/srcpkgs/cppdb/template
+++ b/srcpkgs/cppdb/template
@@ -1,16 +1,19 @@
 # Template file for 'cppdb'
 pkgname=cppdb
 version=0.3.1
-revision=1
+revision=2
 build_style=cmake
 makedepends="libpqxx-devel"
 short_desc="SQL Connectivity Library"
 maintainer="Asaf Ohayon <asaf@sysbind.co.il>"
-license="LGPL-3"
+license="MIT"
 homepage="http://cppcms.com/sql/cppdb/"
 distfiles="${SOURCEFORGE_SITE}/cppcms/cppdb/${version}/cppdb-${version}.tar.bz2"
 checksum=d60eef5a732d8f84ef5e4a2845a8cefc543a6c75bf3782589c2cf6aa150b992e
 
+post_install() {
+	vlicense MIT.txt LICENSE
+}
 
 cppdb-devel_package() {
 	short_desc+=" - development files"

From 66d519a215bdd2361025aafc52006873714c2941 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:34:47 -0700
Subject: [PATCH 325/404] cproto: fix license

---
 srcpkgs/cproto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index df279033a6ee..7c1e844d2b85 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,12 +1,12 @@
 # Template file for 'cproto'
 pkgname=cproto
 version=4.7o
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Generates function prototypes and variable declarations from C code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
 checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f

From d40af9d3187e88fa7635b285808dd8d47c1f2fbb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:11:24 -0700
Subject: [PATCH 326/404] cpufrequtils: fix license

---
 srcpkgs/cpufrequtils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 77c7d335a91d..f29bb4155f6c 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -1,7 +1,7 @@
 # Template file for 'cpufrequtils'
 pkgname=cpufrequtils
 version=008
-revision=12
+revision=13
 _commit=a2f0c39d5f21596bb9f5223e895c0ff210b265d0
 wrksrc="${pkgname}-${_commit}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ make_install_args="mandir=/usr/share/man"
 hostmakedepends="gettext"
 short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git"
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95

From 1608a46f4281c9467f6de5d9b199e22ec174ced4 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:15:48 -0700
Subject: [PATCH 327/404] cpulimit: fix license

---
 srcpkgs/cpulimit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template
index 4857387f4e81..9fbf6eccf66c 100644
--- a/srcpkgs/cpulimit/template
+++ b/srcpkgs/cpulimit/template
@@ -1,11 +1,11 @@
 # Template file for 'cpulimit'
 pkgname=cpulimit
 version=0.2
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Tool to limit the CPU usage of a process"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/opsengine/cpulimit"
 distfiles="https://github.com/opsengine/${pkgname}/archive/v${version}.tar.gz"
 checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da

From 14cadbf0c2649aff9c731d873433a3f67af5dcef Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:24:24 -0700
Subject: [PATCH 328/404] crack-attack: fix license

---
 srcpkgs/crack-attack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index 422e369b84c6..df266ded665a 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -1,7 +1,7 @@
 # Template file for 'crack-attack'
 pkgname=crack-attack
 version=1.1.14
-revision=9
+revision=10
 wrksrc="$pkgname-$version"
 create_wrksrc=yes
 build_wrksrc="$wrksrc"
@@ -13,7 +13,7 @@ makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
 depends="desktop-file-utils"
 short_desc="Tetris Attack clone"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later,custom"
+license="GPL-2.0-or-later, custom:music-sound-copyright"
 homepage="http://www.nongnu.org/crack-attack/"
 distfiles="http://kojipkgs.fedoraproject.org/packages/${pkgname}/${version}/28.fc21/src/${pkgname}-${version}-28.fc21.src.rpm"
 checksum=6fb2ad5a1dcdc590fcbeb4d1925a7e55f1af27780a5550cded280475d2c08b1d

From 34cf29d82ae5426f687602f7b7924e426548f7de Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:27:10 -0700
Subject: [PATCH 329/404] crossguid: fix license

---
 srcpkgs/crossguid/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template
index 135e8d404035..c846590103fa 100644
--- a/srcpkgs/crossguid/template
+++ b/srcpkgs/crossguid/template
@@ -1,15 +1,15 @@
 # Template file for 'crossguid'
 pkgname=crossguid
 version=0.2.2
-revision=1
+revision=2
+build_style=cmake
+makedepends="libuuid-devel"
 short_desc="Lightweight cross platform C++ GUID/UUID library (git $_gitshort)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="MIT"
 homepage="https://github.com/graeme-hill/crossguid"
 distfiles="$homepage/archive/v$version.tar.gz"
-makedepends="libuuid-devel"
 checksum=48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195
-build_style=cmake
 
 do_install() {
 	vlicense LICENSE

From 2e44218c457e84d59ad594a1722e732ac42863a9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:42:18 -0700
Subject: [PATCH 330/404] cvm: fix license

---
 srcpkgs/cvm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index ecee255ba856..06ef23cc8002 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,13 +1,13 @@
 # Template file for 'cvm'
 pkgname=cvm
 version=0.97
-revision=2
+revision=3
 build_style=gnu-makefile
-makedepends="bglibs-devel"
 hostmakedepends="libtool"
+makedepends="bglibs-devel"
 short_desc="Credential Validation Modules"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/cvm/"
 distfiles="http://untroubled.org/cvm/cvm-${version}.tar.gz"
 checksum=82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47

From f797d349684beafd179b47d178db980f209210e3 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 10 Apr 2021 15:27:49 -0300
Subject: [PATCH 331/404] salt: update to 3003.

---
 srcpkgs/salt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 7f5386a77182..abac7da405f3 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,6 +1,6 @@
 # Template file for 'salt'
 pkgname=salt
-version=3002.5
+version=3003
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://saltstack.org/"
 changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
 distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af
+checksum=c4689733dfe738cf287e31cb3fdd3cb8d1606295202b18d8e66d48d372d5ca77
 conf_files="
  /etc/salt/cloud.providers.d/digitalocean.conf
  /etc/salt/cloud.providers.d/vsphere.conf

From d7bbf67c930ac79cfcb83158d85c5cc3763c2cd6 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:40:48 +0200
Subject: [PATCH 332/404] linux5.4: update to 5.4.111.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index da4e54344f58..1b2543f16e2a 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.110
+version=5.4.111
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
+checksum=21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
 python_version=3
 patch_args="-Np1"
 

From df99a0f756acd4541447b93e6ac5f377b62ba5e4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:43:15 +0200
Subject: [PATCH 333/404] linux4.19: update to 4.19.186.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 5cac6f099dd0..abbc9c9ed08e 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.185
+version=4.19.186
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=1689d78212997dae44b24bf037bc842d11d88e974d524af66f7864e5a8508597
+checksum=d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631
 python_version=2 #unverified
 patch_args="-Np1"
 

From 9463e3242b48eb66610dee3f9137c0e0a9aa67b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 8 Mar 2021 00:14:06 +0100
Subject: [PATCH 334/404] libupnp: update to 1.14.4.

also switch to github upstream.
---
 srcpkgs/libupnp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index 9adb5f00da65..b13c99374a98 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,15 +1,15 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.14.0
+version=1.14.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://pupnp.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+homepage="https://pupnp.github.io/pupnp/"
+distfiles="https://github.com/pupnp/pupnp/releases/download/release-$version/$pkgname-$version.tar.bz2"
+checksum=cd649ef53070e9b88680f730ed5b3f919658582d43dd315a2ed8b6105c6fbe63
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From 0b2b046cfdb5fe6a5133e3e2f0c0ff20ff1d4fa2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 10 Apr 2021 17:06:00 +0200
Subject: [PATCH 335/404] openradtool: update to 0.12.6.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index e1c588acae49..a04b3e7ec1a7 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.5
+version=0.12.6
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -15,7 +15,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/openradtool/"
 changelog="https://kristaps.bsd.lv/openradtool/archive.html"
 distfiles="https://kristaps.bsd.lv/openradtool/snapshots/openradtool-${version}.tar.gz"
-checksum=f74d4cb1f72124a6581e57392ca46b851870ebf0928addc71d6db90fe43992ee
+checksum=fec033245ad9371292f92eb87fce77e3e1d6b67ca131dcd181d36dc8df201023
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From dbf96bd3bde60e3f76edd2764f4ba16db3a3a7b6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 00:59:38 +0200
Subject: [PATCH 336/404] harfbuzz: update to 2.8.0.

---
 srcpkgs/harfbuzz/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1a1506276997..62ea9a3ffda3 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.7.4
+version=2.8.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7
+checksum=a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
 
 post_install() {
 	vlicense COPYING LICENSE

From 8ca1fa30885b0900890a85fffbfdd1eca3457ab2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:06:42 +0200
Subject: [PATCH 337/404] alttab: update to 1.6.0.

---
 srcpkgs/alttab/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template
index 66d8da9af66d..42a9961687ef 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,17 +1,20 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXft-devel libXmu-devel libXrandr-devel
  libXrender-devel libpng-devel libXpm-devel uthash"
+checkdepends="procps-ng xvfb-run xeyes xprop"
 short_desc="Task switcher for minimalistic window managers"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=d170425a34d1a92cf0eb5ba7306bf77729a6c04f211593cc5fdd8a0ab583a280
+checksum=9d362266a490a969b6398ccef1514dca2668c38c4b824bb11c8d16923bcb58ee
+
+make_check=no # needs cnee/xnee which is not packaged
 
 CFLAGS="-fcommon"
 

From dd18889917c595388d7b0558b4e787438096b76d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:24:59 +0200
Subject: [PATCH 338/404] binwalk: update to 2.3.1.

---
 srcpkgs/binwalk/patches/fallback-version.patch | 14 ++++++++++++++
 srcpkgs/binwalk/template                       |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/binwalk/patches/fallback-version.patch

diff --git a/srcpkgs/binwalk/patches/fallback-version.patch b/srcpkgs/binwalk/patches/fallback-version.patch
new file mode 100644
index 000000000000..b319bfebb5e0
--- /dev/null
+++ b/srcpkgs/binwalk/patches/fallback-version.patch
@@ -0,0 +1,14 @@
+--- src/binwalk/core/version.py.orig
++++ src/binwalk/core/version.py
+@@ -1,6 +1,10 @@
+ try:
+     from importlib import metadata
+-    get_version = lambda : metadata.version("binwalk")
++    def get_version():
++        try:
++            return metadata.version("binwalk")
++        except metadata.PackageNotFoundError:
++            return "unknown"
+ except ImportError:
+     try:
+         # Running on pre-3.8 Python; use importlib-metadata package
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index fa2328e7ae0a..6c61fff87aeb 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,18 +1,18 @@
 # Template file for 'binwalk'
 pkgname=binwalk
-version=2.2.0
-revision=3
+version=2.3.1
+revision=1
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"
 depends="python3"
-checkdepends="python3-nose"
+checkdepends="python3-coverage python3-nose"
 short_desc="Easy tool for analyzing/reversing/extracting firmware images"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ReFirmLabs/binwalk"
 distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27
+checksum=7ec9d8fcb8686f4060d37e1096669e3ed8ce1194c91ad80199622448bcc01b19
 
 post_extract() {
 	vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py

From 43757a5525a7374c0f5f6b6480f636bda45f812c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 11 Apr 2021 18:40:23 +0200
Subject: [PATCH 339/404] zbar: ignore prerelases.

---
 srcpkgs/zbar/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/zbar/update

diff --git a/srcpkgs/zbar/update b/srcpkgs/zbar/update
new file mode 100644
index 000000000000..e797246e05a6
--- /dev/null
+++ b/srcpkgs/zbar/update
@@ -0,0 +1 @@
+ignore='*.*.9?'

From c3aebc5af4c700aa9e14f259c9088286d6ff7a7d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 22:04:27 +0200
Subject: [PATCH 340/404] cdogs-sdl: update to 0.9.1.

---
 srcpkgs/cdogs-sdl-data     |  1 -
 srcpkgs/cdogs-sdl/template | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/cdogs-sdl-data

diff --git a/srcpkgs/cdogs-sdl-data b/srcpkgs/cdogs-sdl-data
deleted file mode 120000
index c95cdde7057a..000000000000
--- a/srcpkgs/cdogs-sdl-data
+++ /dev/null
@@ -1 +0,0 @@
-cdogs-sdl
\ No newline at end of file
diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index 8b5ef0911afb..add7d111a21d 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
-version=0.7.3
-revision=2
+version=0.9.1
+revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config"
@@ -13,16 +13,10 @@ license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
 checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e "s; -Werror;;"
 }
-
-cdogs-sdl-data_package() {
-	short_desc+=" - data"
-	pkg_install() {
-		vmove usr/share/cdogs
-	}
-}

From a4662c00e3f0dc4061df01bf01064c877ffe6969 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 11 Apr 2021 20:40:04 +0200
Subject: [PATCH 341/404] graphene: update to 1.10.6.

also fix comparision error.

ref: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3976#note_1079639

closes #30125.
---
 ...x-comparision-in-graphene_ray_intersect_box.patch | 12 ++++++++++++
 srcpkgs/graphene/template                            |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch

diff --git a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
new file mode 100644
index 000000000000..083146f9243e
--- /dev/null
+++ b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
@@ -0,0 +1,12 @@
+diff --git src/graphene-ray.c src/graphene-ray.c
+index 66c3393..9151300 100644
+--- src/graphene-ray.c
++++ src/graphene-ray.c
+@@ -563,7 +563,7 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
+ #else
+   if (ty_min > tx_min || fpclassify (tx_min) == FP_NAN)
+     tx_min = ty_min;
+-  if (ty_max > tx_max || fpclassify (tx_max) == FP_NAN)
++  if (ty_max < tx_max || fpclassify (tx_max) == FP_NAN)
+     tx_max = ty_max;
+ #endif
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index e868239bfa08..db7ca1f7563d 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,11 +1,11 @@
 # Template file for 'graphene'
 pkgname=graphene
-version=1.10.2
+version=1.10.6
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dtests=false -Dbenchmarks=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+ -Dintrospection=$(vopt_if gir enabled disabled) -Dsse2=true"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Thin layer of types for graphic libraries"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ebassi/graphene"
 distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
-checksum=e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6
+checksum=80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Darm_neon=false" ;;

From a2bc7da3513440e9c49734cf63490ca2cf9f60a2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:00:43 +0200
Subject: [PATCH 342/404] mozjs78: update to 78.9.0.

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 --------------
 srcpkgs/mozjs78/template                          |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
deleted file mode 100644
index f2cf04d79aca..000000000000
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
-so enforce a stricter one.
-
---- a/js/src/jit/none/MacroAssembler-none.h
-+++ b/js/src/jit/none/MacroAssembler-none.h
-@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Registers::invalid_reg};
- static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
- 
- static constexpr uint32_t ABIStackAlignment = 4;
--static constexpr uint32_t CodeAlignment = sizeof(void*);
-+static constexpr uint32_t CodeAlignment = 8;
- static constexpr uint32_t JitStackAlignment = 8;
- static constexpr uint32_t JitStackValueAlignment =
-     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index ebfb51801916..7b437946b196 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,6 +1,6 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
-version=78.2.0
+version=78.9.0
 revision=1
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
@@ -16,7 +16,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
+checksum=8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864
 patch_args="-Np1"
 
 CXXFLAGS="-Wno-class-memaccess"

From 5b1d052d3f0c353076466d09c28789e1d06c1bcf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:07:12 +0200
Subject: [PATCH 343/404] mozjs78: port build-non-jit-32bit patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 ++++++++++++++
 srcpkgs/mozjs78/template                          |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
new file mode 100644
index 000000000000..e3938fe8780c
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -0,0 +1,14 @@
+On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
+so enforce a stricter one.
+
+--- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
++++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
+ static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
+ 
+ static constexpr uint32_t ABIStackAlignment = 4;
+-static constexpr uint32_t CodeAlignment = 16;
++static constexpr uint32_t CodeAlignment = 8;
+ static constexpr uint32_t JitStackAlignment = 8;
+ static constexpr uint32_t JitStackValueAlignment =
+     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 7b437946b196..ee443e7a64c8 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 30ee817c2e2ad611a7531ce19628986694772960 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 17:45:06 -0500
Subject: [PATCH 344/404] cdogs-sdl: fix checksum

---
 srcpkgs/cdogs-sdl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index add7d111a21d..e2783fff55d3 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+checksum=fee87e90371e6c8f679e75a3628d82b863a67250bd822c672a4017f6a078eb56
 replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"

From 235e8d34fd2cd04899de2679415ee53090eeccc9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 18:01:36 -0500
Subject: [PATCH 345/404] cdogs-sdl: fix build

---
 srcpkgs/cdogs-sdl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index e2783fff55d3..d653cc0dcbca 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -4,8 +4,9 @@ version=0.9.1
 revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
-hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel"
+hostmakedepends="pkg-config python3-protobuf protobuf26"
+makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
+ gtk+3-devel protobuf-devel"
 depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 9702c403110f5211d92bdb9e80597c4cad24a610 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 23:07:46 +0200
Subject: [PATCH 346/404] MultiMarkdown: remove /usr/{LICENSE,README}.txt

---
 srcpkgs/MultiMarkdown/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template
index 96d153d87297..75bd1e04e476 100644
--- a/srcpkgs/MultiMarkdown/template
+++ b/srcpkgs/MultiMarkdown/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMarkdown'
 pkgname=MultiMarkdown
 version=6.6.0
-revision=1
+revision=2
 wrksrc="$pkgname-6-$version"
 build_style=cmake
 hostmakedepends="perl"
@@ -18,5 +18,6 @@ post_install() {
 	mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown
 	# Avoid conflict with mtools
 	mv ${DESTDIR}/usr/bin/mmd  ${DESTDIR}/usr/bin/multimarkdown-mmd
+	rm ${DESTDIR}/usr/{LICENSE,README}.txt
 	vlicense LICENSE
 }

From 9280dd6bf8a9ae1bf80f1c8311c3a4c279f598e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 07:46:06 +0700
Subject: [PATCH 347/404] Haru: build versioned SONAME

---
 common/shlibs                          |  2 +-
 srcpkgs/Haru/patches/Add-license.patch | 40 --------------------------
 srcpkgs/Haru/template                  | 15 +++++-----
 3 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/Haru/patches/Add-license.patch

diff --git a/common/shlibs b/common/shlibs
index 077da5c7e735..a2d4ddbcec14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3152,7 +3152,7 @@ libembb_mtapi_c.so embb-devel-1.0.0_1
 libembb_mtapi_network_c.so embb-devel-1.0.0_1
 libembb_base_cpp.so embb-devel-1.0.0_1
 libembb_base_c.so embb-devel-1.0.0_1
-libhpdf.so Haru-devel-2.3.0_1
+libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/Haru/patches/Add-license.patch b/srcpkgs/Haru/patches/Add-license.patch
deleted file mode 100644
index 367048748f4e..000000000000
--- a/srcpkgs/Haru/patches/Add-license.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 24443b76f4daf74c21307044e81b4942bd4e586a Mon Sep 17 00:00:00 2001
-From: Maciej Klemarczyk <m.klemarczyk+git@live.com>
-Date: Sun, 28 Jun 2015 12:05:05 +0200
-Subject: [PATCH 4/4] Missing LICENSE file was created
-
-File was created based on license provided by README file.
----
- LICENCE | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
- create mode 100644 LICENSE
-
-diff --git LICENSE LICENSE
-new file mode 100644
-index 0000000..bdf271e
---- /dev/null
-+++ LICENSE
-@@ -0,0 +1,20 @@
-+
-+Copyright (C) 1999-2006 Takeshi Kanno
-+Copyright (C) 2007-2009 Antony Dovgal
-+
-+This software is provided 'as-is', without any express or implied warranty.
-+
-+In no event will the authors be held liable for any damages arising from the 
-+use of this software.
-+
-+Permission is granted to anyone to use this software for any purpose,including 
-+commercial applications, and to alter it and redistribute it freely, subject 
-+to the following restrictions:
-+
-+ 1. The origin of this software must not be misrepresented; you must not claim 
-+    that you wrote the original software. If you use this software in a 
-+    product, an acknowledgment in the product documentation would be 
-+    appreciated but is not required.
-+ 2. Altered source versions must be plainly marked as such, and must not be 
-+    misrepresented as being the original software.
-+ 3. This notice may not be removed or altered from any source distribution.
--- 
-2.24.0
-
diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index c343c70ec5de..80db1e0e89f4 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -1,19 +1,20 @@
 # Template file for 'Haru'
 pkgname=Haru
 version=2.3.0
-revision=2
+revision=3
 wrksrc="libharu-RELEASE_${version//./_}"
-build_style=cmake
+build_style=gnu-configure
+hostmakedepends="automake libtool"
 makedepends="zlib-devel libpng-devel"
 short_desc="Free, cross platform, open source library for generating PDF files"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="ZLIB/LIBPNG"
+license="Zlib"
 homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
-post_install() {
-	vlicense LICENSE
+pre_configure() {
+	make -f build.mk
 }
 
 Haru-devel_package() {
@@ -21,7 +22,7 @@ Haru-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libhpdf.so
 	}
 }

From 1ea158abfbfd4832e04dc7a3ba249e679bd699cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 07:48:25 +0700
Subject: [PATCH 348/404] python3-anytree:  build with setuptools_scm

While we're at it, remove /usr/LICENSE (paper42).

Close: #30134
---
 srcpkgs/python3-anytree/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template
index e767018e6331..8f1f4a2d8f30 100644
--- a/srcpkgs/python3-anytree/template
+++ b/srcpkgs/python3-anytree/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-anytree'
 pkgname=python3-anytree
 version=2.8.0
-revision=2
+revision=3
 wrksrc="anytree-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-six"
+checkdepends="python3-six python3-coverage python3-nose graphviz"
 short_desc="Powerful and lightweight Python tree data structure"
 maintainer="q66 <daniel@octaforge.org>"
 license="Apache-2.0"
 homepage="https://github.com/c0fec0de/anytree"
 distfiles="${PYPI_SITE}/a/anytree/anytree-${version}.tar.gz"
 checksum=3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab
+
+post_install() {
+	rm ${DESTDIR}/usr/LICENSE
+}

From 6ca304569c135bc9fa2a6006283b73e6ee9517ec Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 22:31:23 +0200
Subject: [PATCH 349/404] lazygit: update to 0.27.4.

Closes: #30166 [via git-merge-pr]
---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 3caebf1d10f2..c725652ba15f 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.26.1
+version=0.27.4
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=7bfda18345993206d4d388ea0370e9b54af0354d37f4a64803461889b361d547
+checksum=8036c9b9539599fe9c112ed46d6234b3139a9dddc188b05cfa3bccfdb01422ca
 
 post_install() {
 	vlicense LICENSE

From bf2e2d584db2254e41e794c3856f5d07f542a83a Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 20:52:52 +0200
Subject: [PATCH 350/404] just: update to 0.9.0.

Closes: #30163 [via git-merge-pr]
---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index d4266e9f158b..e351ac32ad68 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.8.4
+version=0.9.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=7aee472e4b70e62e89d7d5185493a3c680aeae4cc323c842e4c5b9b8af47040a
+checksum=877fdd517722ec1a554b046e1a9fd112f3503d91211702895c5ba12b29dcbcc6
 
 # Fix failing test
 pre_check() {

From 285b934fcc318308a76515af849b1dc2a1a6aafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 19:43:30 +0200
Subject: [PATCH 351/404] btfs: update to 2.24.

Closes: #30162 [via git-merge-pr]
---
 srcpkgs/btfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 78af3c6bcc97..a41afd1e2db5 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.23
-revision=2
+version=2.24
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
+checksum=d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935
 
 pre_configure() {
 	autoreconf -fi

From 6a1b01dbb07ba31dccaf02c564cd426ab61c21d3 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:15:58 +0200
Subject: [PATCH 352/404] stagit: update to 0.9.5.

Closes: #30159 [via git-merge-pr]
---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 415761dc7e2f..89c5a8cb177c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=8889ab13fa345729cdc3cc92c8fdce10d49f6660f39a60def7646c86d8a61300
+checksum=025a17c7be3a4e98a2319efc4eb6329e9ea6a778b2b24b0eb97a342ece9bb039
 LDFLAGS="-lgit2"
 
 post_install() {

From 946925c106a4f41607e20ee7ed78bcec731ab040 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:15 +0200
Subject: [PATCH 353/404] acpica-utils: update to 20210331.

Closes: #30158 [via git-merge-pr]
---
 srcpkgs/acpica-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 6bcf51414cf1..bf2f0df5d93d 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20210105
+version=20210331
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8
+checksum=b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From b392fcb9e8a55aa8308256dd7b3b5274f78bfa18 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:16:20 +0200
Subject: [PATCH 354/404] sqlite: update to 3.35.4.

Closes: #30156 [via git-merge-pr]
---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 84116b6e638d..52a9f0d3e298 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.35.3
+version=3.35.4
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,7 +13,7 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=ecbccdd440bdf32c0e1bb3611d635239e3b5af268248d130d0445a32daf0274b
+checksum=7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 5f52d5a9041702d9f1f3823069dd717b405f2be7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:35 +0200
Subject: [PATCH 355/404] file: update to 5.40.

Closes: #30153 [via git-merge-pr]
---
 srcpkgs/file/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 83d62af699a4..0818250c798c 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,6 +1,6 @@
 # Template file for 'file'
 pkgname=file
-version=5.39
+version=5.40
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
+checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
 
 if [ -z "$CHROOT_READY" ]; then
 	# libseccomp's default=auto

From 613a76d7aaa856c9cc4b97b6ea160c8019b0c4fa Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:56 +0200
Subject: [PATCH 356/404] irssi: update to 1.2.3.

Closes: #30152 [via git-merge-pr]
---
 srcpkgs/irssi/patches/glib-2-63.patch | 40 ---------------------------
 srcpkgs/irssi/template                |  6 ++--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/irssi/patches/glib-2-63.patch

diff --git a/srcpkgs/irssi/patches/glib-2-63.patch b/srcpkgs/irssi/patches/glib-2-63.patch
deleted file mode 100644
index 669b04d9a6a3..000000000000
--- a/srcpkgs/irssi/patches/glib-2-63.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch
-
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- src/fe-text/term-terminfo.c
-+++ src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--	unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
-+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+		c = 0;
- 
- 	switch (c) {
- 	case (unichar)-1:
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 4d8df6bfd24f..b47640ec94d9 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
 # Template file for 'irssi'
 pkgname=irssi
-version=1.2.2
-revision=7
+version=1.2.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.irssi.org"
 distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
-checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
+checksum=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25
 
 LDFLAGS="-lncursesw"
 

From 24be7022ef82cbc2a5cb0157462515b44afa6cc0 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:25 +0200
Subject: [PATCH 357/404] fetchmail: update to 6.4.18.

Closes: #30151 [via git-merge-pr]
---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index be26641609a7..274105153ef0 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,6 +1,6 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
-version=6.4.17
+version=6.4.18
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
 homepage="http://fetchmail.sourceforge.net/"
 changelog="https://gitlab.com/fetchmail/fetchmail/-/raw/legacy_64/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a41bcdf11b41aa0682b259aee4717c617c15dadd43fa008b2ed38b770f4d50c6
+checksum=302dc9bcdc6927dedf375d2baaead2347557faa70d98b1da83f2409fa6fb259f
 
 post_install() {
 	vsed -i -e 's,/usr/bin/python ,/usr/bin/python3 ,' "${DESTDIR}/usr/bin/fetchmailconf"

From 0dd78c866b797137a71c3dab769be83af14c3bd8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:06 +0200
Subject: [PATCH 358/404] libassuan: update to 2.5.5.

Closes: #30150 [via git-merge-pr]
---
 srcpkgs/libassuan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 11c7f184e75c..c74d8b9b39f0 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -1,6 +1,6 @@
 # Template file for 'libassuan'
 pkgname=libassuan
-version=2.5.4
+version=2.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
-checksum=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0
+checksum=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
 
 libassuan-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 511273612c536b13cf3bc550ccfd1db3709d8362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 13:02:14 +0200
Subject: [PATCH 359/404] ccls: update to 0.20210330.

Closes: #30149 [via git-merge-pr]
---
 srcpkgs/ccls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 2b0d8a4b94ec..f2fcebc6b016 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,6 +1,6 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20201219
+version=0.20210330
 revision=1
 build_style=cmake
 hostmakedepends="clang-tools-extra"
@@ -10,7 +10,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
 distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
-checksum=edd3435bc7e55d9e5dc931932f9c98275a6a28d1ab1f66416110e029f3f2882a
+checksum=28c228f49dfc0f23cb5d581b7de35792648f32c39f4ca35f68ff8c9cb5ce56c2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 6e2f7d75fc1a866cf27cf4057f5073a059741920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 12:54:00 +0200
Subject: [PATCH 360/404] hcloud: update to 1.22.1.

Closes: #30148 [via git-merge-pr]
---
 srcpkgs/hcloud/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index d5eb343c9338..d07198b9ded4 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,19 +1,18 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.22.0
+version=1.22.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
 go_import_path=github.com/hetznercloud/cli
 go_package=github.com/hetznercloud/cli/cmd/hcloud
 go_ldflags="-X github.com/hetznercloud/cli.Version=${version}"
-hostmakedepends="git"
 short_desc="Command-line interface for Hetzner Cloud"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=fec0f1ae490ed4e1079138661fffcbf489544c460f631a6a4e5910d3645dad86
+checksum=6b43ad74ec243484c7c1dd1d7cb2d6f1231f596a2ea4753bf81087f5b8dcf1c2
 
 post_install() {
 	vlicense LICENSE

From 844b1653df85967c04f082d912e6dd349d83cad0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 11 Apr 2021 09:28:58 +0300
Subject: [PATCH 361/404] json-glib: update to 1.6.2.

Closes: #30144 [via git-merge-pr]
---
 srcpkgs/json-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index a96132e145e3..4a3c611826a7 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'json-glib'
 pkgname=json-glib
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,11 +8,11 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73
+checksum=a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24
 
 # Package build options
 build_options="gir"

From eb8f7b3190ae14c8329d4a83817ac57525e055d9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 02:20:41 +0300
Subject: [PATCH 362/404] libtorrent-rasterbar: update to 1.2.13.

Closes: #30172 [via git-merge-pr]
---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 8cef116f9aff..1fe9b88327c7 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,8 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.12
-revision=2
+version=1.2.13
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8
+checksum=976d2771ffcd564f08a63351e9c22e842aaa8cd29f6f7fe25d169c038a844e85
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From 3fdfc9089064eae596baf5b7f7bcbf4d14d14dee Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:13:05 +0300
Subject: [PATCH 363/404] librsync: update to 2.3.2, add changelog and
 checkdepends.

Closes: #30170 [via git-merge-pr]
---
 srcpkgs/librsync/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template
index 80583aa90f49..c5576cd0e48a 100644
--- a/srcpkgs/librsync/template
+++ b/srcpkgs/librsync/template
@@ -1,16 +1,18 @@
 # Template file for 'librsync'
 pkgname=librsync
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 hostmakedepends="perl"
 makedepends="zlib-devel bzip2-devel popt-devel"
+checkdepends="which perl"
 short_desc="Library that implements the rsync remote-delta algorithm (rdiff)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://librsync.sourceforge.net/"
+changelog="https://librsync.github.io/md_NEWS.html"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569
+checksum=ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -C disableRuntimeTests.cmake"

From e529068dcc1c9a96d59c14400327f64ce6f1f3bd Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:01:42 +0300
Subject: [PATCH 364/404] fotoxx: update to 21.40, add dcraw as runtime
 dependency.

Closes: #30169 [via git-merge-pr]
---
 srcpkgs/fotoxx/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index b2aff4b41061..a3c968fcdef0 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,19 +1,19 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=20.19
+version=21.40
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libchamplain-devel libraw-devel"
-depends="desktop-file-utils exiftool xdg-utils"
+depends="desktop-file-utils exiftool xdg-utils dcraw"
 short_desc="Free open source program for image editing and collection management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=4c9216d4612641151ca75e3f6fd74521a8dcfbb0a14d765b73d2ff62eed37a3e
+checksum=0c16597053ce8e186fb8163839f4f4ed44548bf00e43e88951f4346a9dbbb620
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
 
@@ -24,8 +24,3 @@ fi
 case "$XBPS_TARGET_LIBC" in
 	musl) makedepends+=" libexecinfo-devel"
 esac
-
-post_install() {
-	rm -rv ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} \
-		  ${DESTDIR}/usr/share/appdata
-}

From 293c07c4a1f91a221d617dcac871b00a8f343dbb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 00:44:52 +0300
Subject: [PATCH 365/404] dutree: update to 0.2.17.

Closes: #30168 [via git-merge-pr]
---
 srcpkgs/dutree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index 4bf082f3b7d5..70155936776a 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.16
+version=0.2.17
 revision=1
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=288e52f897785a03cae48eac581faf7d3743d36152f152ba25b8847528bf0a5f
+checksum=c88f2328c4e6cf96a0222efbe2a5c6d2de8cd0de0ebf01deb1f5fe81b5f8518e
 
 pre_build() {
 	# default version too old for ppc musl systems

From 69a51e614e87f61f3108eedb77c7883f7acc1e00 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:32 +0200
Subject: [PATCH 366/404] blackbox_exporter: update to 0.18.0.

Closes: #30138 [via git-merge-pr]
---
 srcpkgs/blackbox_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 4f6ca705e981..3000f9beb65f 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
-version=0.16.0
+version=0.18.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io"
 changelog="https://github.com/prometheus/blackbox_exporter/releases"
 distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz"
-checksum=6ebfd9f590286004dacf3c93b3aa3e3c560d6f1e5994f72c180e5af94fdd0099
+checksum=b41f1301c991c0d0011652e2093588521925d1960c6f7649f96edecbf1aadfb8
 
 system_accounts="_bbox_exporter"
 

From 0a366183cf8b2845ebc44796b0856d7e1ebbdc7a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:14 +0200
Subject: [PATCH 367/404] node_exporter: update to 1.1.2.

Closes: #30137 [via git-merge-pr]
---
 srcpkgs/node_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index 5397c01ff4dc..5f2855d6c6c3 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
-version=1.0.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/node_exporter/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/node_exporter/archive/v${version}.tar.gz"
-checksum=a841bf3e236376840be9e1d8e6c4a38196be6f3957b0982d1c7970a5e416b0ad
+checksum=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
 python_version=3
 
 system_accounts="_node_exporter"

From bc7a7d3cb00b1f0a2add36617bfa0595f55b77e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:18:37 +0700
Subject: [PATCH 368/404] embb: fix cmake, shared libs location

---
 common/shlibs         | 10 +++++-----
 srcpkgs/embb/template | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a2d4ddbcec14..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3147,11 +3147,11 @@ libGammu.so.8 gammu-1.39.0_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-27_2
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
-libembb_mtapi_cpp.so embb-devel-1.0.0_1
-libembb_mtapi_c.so embb-devel-1.0.0_1
-libembb_mtapi_network_c.so embb-devel-1.0.0_1
-libembb_base_cpp.so embb-devel-1.0.0_1
-libembb_base_c.so embb-devel-1.0.0_1
+libembb_mtapi_cpp.so embb-1.0.0_3
+libembb_mtapi_c.so embb-1.0.0_3
+libembb_mtapi_network_c.so embb-1.0.0_3
+libembb_base_cpp.so embb-1.0.0_3
+libembb_base_c.so embb-1.0.0_3
 libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template
index 0906831c53e3..d6a239cc3374 100644
--- a/srcpkgs/embb/template
+++ b/srcpkgs/embb/template
@@ -1,9 +1,10 @@
 # Template file for 'embb'
 pkgname=embb
 version=1.0.0
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
+configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
 short_desc="Library for parallel programming of embedded systems"
 maintainer="Florian Eich <flrn@nrmncr.net>"
 license="BSD-2-Clause"
@@ -13,6 +14,8 @@ checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8
 
 post_install() {
 	vlicense COPYING.md
+	vmkdir usr/lib/cmake
+	mv ${DESTDIR}/usr/CMake/* ${DESTDIR}/usr/lib/cmake
 }
 
 embb-devel_package() {
@@ -20,8 +23,8 @@ embb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.a"
 	}
 }
 

From 7de322e6bad19a966d142f88847b14dc04d30a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:32:48 +0700
Subject: [PATCH 369/404] mozjs78: fix new patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
index e3938fe8780c..a1ba0bd86621 100644
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -1,8 +1,8 @@
 On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
 so enforce a stricter one.
 
---- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
-+++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+--- a/js/src/jit/none/MacroAssembler-none.h
++++ b/js/src/jit/none/MacroAssembler-none.h
 @@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
  static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
  

From 9389e7a345181848511848e4d22f428432b2bfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 12 Apr 2021 08:42:29 +0700
Subject: [PATCH 370/404] Haru: fix cross build

---
 srcpkgs/Haru/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index 80db1e0e89f4..d1207b72b881 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -13,6 +13,11 @@ homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr"
+	configure_args+=" --with-png=${XBPS_CROSS_BASE}/usr"
+fi
+
 pre_configure() {
 	make -f build.mk
 }

From 40d8da581d64f27b2dc61cdfb95e9db0cc44bdfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:29:26 -0400
Subject: [PATCH 371/404] python3-tifffile: update to 2021.4.8.

---
 srcpkgs/python3-tifffile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 821635e7d88c..f09d1d9d33c6 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2021.3.31
+version=2021.4.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=82ce2f4f4d49415e95ae03f839f84eae4018435051106a1223e8b85d1a27b6f4
+checksum=449d05149e2dd3c0c2195d9a2ccd719c53840a516f82634e7dee1b5195f9d3c1
 # Tests require unpackaged fsspec
 make_check=no
 

From 127224a2e35b0f18aafc9b324dc533f18a3c6e65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:30:36 -0400
Subject: [PATCH 372/404] python3-breathe: update to 4.29.0.

---
 srcpkgs/python3-breathe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index c4c3550b3a68..2c041b141f2a 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.28.0
+version=4.29.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 changelog="https://raw.githubusercontent.com/michaeljones/breathe/master/README.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6948cf4700582c5b7115940367c87f74fbc4510b0a7db67fbcb5165181a784ad
+checksum=5fc965cfd248c01909a4ba78f3d7130d85e08b6f373b5224f4fc682cbfd760b4
 
 post_install() {
 	vlicense LICENSE

From 49fe078f4832dea6453c199c9d50f90d8ae88d9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:35:00 -0400
Subject: [PATCH 373/404] protobuf26: update to 3.15.8.

---
 srcpkgs/protobuf26/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 8e8cfbe6bece..8eac1187676b 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.7
+version=3.15.8
 revision=1
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504
+checksum=0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From e13bf69cff72170251436843b4651cc50c52a74d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:38:51 -0400
Subject: [PATCH 374/404] python3-protobuf: update to 3.15.8.

---
 srcpkgs/python3-protobuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 1a61e9218f75..33d8fa57a3ee 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
-version=3.15.7
+version=3.15.8
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 distfiles="${PYPI_SITE}/p/protobuf/protobuf-${version}.tar.gz"
-checksum=2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d
+checksum=0277f62b1e42210cafe79a71628c1d553348da81cbd553402a7f7549c50b11d0
 
 build_options="cppext"
 build_options_default="cppext"

From 2f5c9214d4926689c725ea5050d0e409d37bad8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:46:47 -0400
Subject: [PATCH 375/404] python3-hypothesis: update to 6.9.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 4f80d7b05c89..f66e8e3ddc19 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypothesis'
 pkgname=python3-hypothesis
-version=6.8.9
+version=6.9.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=41147c391beab58898eb11296f3edc5d1b5dc7d58041f1bc3517e1d59414cbef
+checksum=c44ee0355477012d4fad8650aff95bfcb6346a21ea8248010ee915c30eff462a
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 1e4aa187d2a256d3658b49b70e4134a752570a3b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 13:43:19 +0200
Subject: [PATCH 376/404] cdogs-sdl: fix broken dependencies

---
 srcpkgs/cdogs-sdl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index d653cc0dcbca..a0cf7dafd7b8 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,13 +1,12 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
 version=0.9.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config python3-protobuf protobuf26"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
  gtk+3-devel protobuf-devel"
-depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 380ce0cf10086e0844ad26ad54e7a785e118a90f Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 11 Apr 2021 12:27:18 +1000
Subject: [PATCH 377/404] libnpupnp: update to 4.1.3

Closes: #30141 [via git-merge-pr]
---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index d709bb6c8632..16c0d5b6cc57 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=8b59b730b39daeb46ad89021d7fbfe7c5a2a71cd0f85bb537d593c8a82746981
+checksum=74703d49be52d29b52f59342ec7359178b127568399551d9d3f56bb7950fcc02
 
 post_install() {
 	vlicense COPYING

From 0e361778b831728b9eee5785d731841015b3ebfa Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Mon, 12 Apr 2021 12:54:05 +0300
Subject: [PATCH 378/404] nicotine+: update to 3.0.4

---
 srcpkgs/nicotine+/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index fd1284c4a5f7..6f28e7582c58 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.0.2
+version=3.0.4
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="doggone <doggone@airmail.cc>"
 license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=a2a50a442e1dee035aa5825ef7b590c1c457bddba17e5a4abe6466113f5a4af1
+checksum=f0af2d45e7b2672e2c431a199f4faf0aee18da79f8d9aff9833cde6368192032

From ff954d9387fd752ded0228ea0eea085aa37d066e Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Mon, 12 Apr 2021 09:40:29 +0200
Subject: [PATCH 379/404] emptty: update to 0.5.1.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 402733e1b2a2..3a0ac68bceb6 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=30fd606e9f2c00c923d6fc5d28774d2454e70f999aee57ff29de73eed824f384
+checksum=798819b7d320df6ced703b5878564c3a2544638babc7666a5c8391c26976c704
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 02c4724cbe054f47a0952d62015b19d12d817d2a Mon Sep 17 00:00:00 2001
From: Gustavo Costa <gusbemacbe@gmail.com>
Date: Mon, 12 Apr 2021 00:12:05 -0300
Subject: [PATCH 380/404] adwaita-plus: update to 6.1

---
 srcpkgs/adwaita-plus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index 5d8611835163..5d603894af3b 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,13 +1,13 @@
 # Template file for 'adwaita-plus'
 pkgname=adwaita-plus
-version=5.0
+version=6.1
 revision=2
 short_desc="Modern third-party icons theme based on GNOME's Adwaita"
 maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Bonandry/adwaita-plus"
 distfiles="https://github.com/Bonandry/${pkgname}/archive/v${version}.tar.gz"
-checksum=c83a867a713b7ec0fe01c95fa2b1118ef97e8bdb62bc4467f317ea8c611b50d1
+checksum=f8c791754110b7b9c19f50fb19f5344ad0a50e5834ca25a1161312eacfbf027b
 
 do_install() {
 	vmkdir usr/share/icons

From 95dea476d3b4a0530be7c9102903c2ccd2e346cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 12 Apr 2021 18:28:39 +0200
Subject: [PATCH 381/404] removed-packages: add subpkgs of shiboken2,
 python3-pyside2

---
 srcpkgs/removed-packages/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3dee863e0d27..163647c10e49 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=41
+revision=42
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -190,11 +190,13 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libpyside-python3<=5.15.0_2
  libqmatrixclient<=0.5.3.2_1
  libqmatrixclient-devel<=0.5.3.2_1
  libqzeitgeist<=0.8.0_6
  librpcsecgss<=0.19_6
  librpcsecgss-devel<=0.19_6
+ libshiboken-python3<=5.15.0_3
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
@@ -241,6 +243,10 @@ replaces="
  python3-Django<=3.0.7_2
  python3-cloudscraper<=1.2.52_1
  python3-pyPEG2<=2.15.2_7
+ python3-pyenet<=5.15.0_2
+ python3-pyside<=5.15.0_2
+ python3-pyside-phonon<=5.15.0_2
+ python3-shiboken<=5.15.0_3
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
  qupzilla1<=1.8.9_16

From 6f4c08d9ea684ed87380ef85002a6d5084939fc3 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Mon, 12 Apr 2021 10:06:53 +0600
Subject: [PATCH 382/404] New package: pnpm-6.0.1

---
 srcpkgs/pnpm/template | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/pnpm/template

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
new file mode 100644
index 000000000000..6d7ecfe1ce8b
--- /dev/null
+++ b/srcpkgs/pnpm/template
@@ -0,0 +1,30 @@
+# Template file for 'pnpm'
+pkgname=pnpm
+version=6.0.1
+revision=1
+build_style=fetch
+hostmakedepends="nodejs jq"
+depends="nodejs"
+short_desc="Fast, disk space efficient package manager"
+maintainer="reback00 <reback00@protonmail.com>"
+license="MIT"
+homepage="https://pnpm.js.org/"
+distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
+checksum=6e390217ab6250f85d28cb0135620e3b0526a849dda7fb7c54f092c1b6bd465c
+python_version=3
+
+do_install() {
+	npm install -g --user root --prefix "${DESTDIR}/usr" "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tgz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+
+	# Sort and cleanup package.json
+	jq '.|=with_entries(select(.key|test("_.+")|not))' "$_npmdir/package.json" > "$_npmdir/package.json"
+	chmod 644 "$_npmdir/package.json"
+
+	# Delete JS SourceMaps
+	find "${DESTDIR}/usr/lib" -depth -name '*.map' -delete
+
+	vlicense "$_npmdir/LICENSE"
+	vdoc "$_npmdir/README.md"
+	rm -rf "${DESTDIR}/usr/etc" "$_npmdir/LICENSE" "$_npmdir/README.md"
+}

From eff24a11028a6b81e1cec12b879ee7db41b2bed0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 10:42:02 -0500
Subject: [PATCH 383/404] gef: update to 2021.04.

---
 srcpkgs/gef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 9188044d9c9a..679b30deb6bb 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,6 +1,6 @@
 # Template file for 'gef'
 pkgname=gef
-version=2021.01
+version=2021.04
 revision=1
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gef.readthedocs.io/en/master/"
 distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=59e9c2327a66f125c625affa727feaf43aaf8bf9da0cf1025f428ec8851b1f64
+checksum=43e1f08d230dccc44d22dc723df65f26afabfbd277ae81de04664738ea388703
 python_version="3"
 
 do_install() {

From 81418ad784114521b56f4fc98c31a446a5e32f55 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 12 Apr 2021 21:01:01 +0200
Subject: [PATCH 384/404] vscode: update to 1.55.1

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 58a277841efa..b3d037f65314 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.55.0
+version=1.55.1
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=5a208d6cfaf35ea4d098c858faf2dff14092d74534c1b5966df87f1d5be24ef0
+checksum=6fe56f9328ded06b38b29de4f545fc82007006cac18bdea8961637e25025d4a2
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 089a6b16739b131c1f2ee9b330230d89a3d578d3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 16:11:00 -0500
Subject: [PATCH 385/404] wine: update to 6.6.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 516ea5d1b17e..5b0d64f18e2e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.5
+version=6.6
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0600fd208c06925d6634d29f543bba0a64361c34e9bd7609c2f0e209610ad347
- 965b96a5058d3b4403bafb46993a959b92a2eb7a896f1070368db795e32aeb10"
+checksum="99e522c6dcc0ac1d53d201bf3054891fdf11864257473c3eb341e37671fd84ad
+ c3fbcce35388b917981d72533d7d66ccc57b2b1e5af01435af0cb9b054744206"
 
 build_options="mingw staging"
 build_options_default="mingw"

From ef480657be6919a4fede8db0b3aa624eef40efbc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 386/404] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL  | 7 +++++++
 srcpkgs/mariadb/template | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 srcpkgs/mariadb/INSTALL

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..a69d0aaa7857 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -32,6 +32,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 

From 37cc8d2ca32fa2e643078483f537370529b9558a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 20:39:43 -0500
Subject: [PATCH 387/404] wine: broken on musl for now

---
 srcpkgs/wine/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 5b0d64f18e2e..0fbe8f22637a 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -64,6 +64,10 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "$XBPS_LIBC" = "musl" ]; then
+	broken="undefined reference to `ns_name_skip'"
+fi
+
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

From 0d7f1be2c50c7922af6cf2ac0cdd520721571f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 13 Apr 2021 02:06:49 -0300
Subject: [PATCH 388/404] wine: fix musl build.

They started using the undocumented and glibc specific ns_name_skip
function, so vendor that function in as a static function; it's luckily
simple enough.
---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 48 ++++++++++++++++++++
 srcpkgs/wine/template                        |  4 --
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-ns_name_skip.patch

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
new file mode 100644
index 000000000000..3246959f9bbb
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -0,0 +1,48 @@
+diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
+index ac52147..0f8c2ef 100644
+--- wine-6.6/dlls/dnsapi/libresolv.c
++++ wine-6.6/dlls/dnsapi/libresolv.c
+@@ -57,6 +57,43 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
+ 
++/* code from glibc's resolv/ns_name.c, with errno setting removed */
++/*%
++ *	Advance *ptrptr to skip over the compressed name it points at.
++ *
++ * return:
++ *\li	0 on success, -1 (with errno set) on failure.
++ */
++#ifndef __GLIBC__
++static int
++ns_name_skip(const u_char **ptrptr, const u_char *eom)
++{
++	const u_char *cp;
++	u_int n;
++
++	cp = *ptrptr;
++	while (cp < eom && (n = *cp++) != 0) {
++		/* Check for indirection. */
++		switch (n & NS_CMPRSFLGS) {
++		case 0:			/*%< normal case, n == len */
++			cp += n;
++			continue;
++		case NS_CMPRSFLGS:	/*%< indirection */
++			cp++;
++			break;
++		default:		/*%< illegal type */
++			return (-1);
++		}
++		break;
++	}
++	if (cp > eom) {
++		return (-1);
++	}
++	*ptrptr = cp;
++	return (0);
++}
++#endif
++
+ static const char *debugstr_type( unsigned short type )
+ {
+     const char *str;
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0fbe8f22637a..5b0d64f18e2e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -64,10 +64,6 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_LIBC" = "musl" ]; then
-	broken="undefined reference to `ns_name_skip'"
-fi
-
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

From 63b539bb1ada0087ef008403d4374ad5925942e1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:37:33 +0200
Subject: [PATCH 389/404] python3-boto3: update to 1.17.49.

---
 srcpkgs/python3-boto3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index 93abe914cbf3..c376eedc533b 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
-version=1.17.47
+version=1.17.49
 revision=1
 wrksrc="boto3-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/boto/boto3"
 distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz"
-checksum=841ba34d61296a30128e16e987f66a999aea555f45d7fad9e85eb27f98ab05be
+checksum=08c4ee7dbcf5814555aeb2fed8496ab4165b8e3878acf2fcfd81f8d233f78ada
 
 post_install() {
 	vlicense LICENSE

From f161041a5e08f57b563008058bf90e70fddd92cc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:38:10 +0200
Subject: [PATCH 390/404] apk-tools: update to 2.12.5.

---
 srcpkgs/apk-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 0c7b8fbc442d..e7e03bde84ad 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.12.4
+version=2.12.5
 revision=1
 build_style=gnu-makefile
 # Link libapk statically
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=9b5c3754e0fef61f6acf15afd233ad801543636bdd3ee16f307b784a2853bb55
+checksum=a3cbabbcd3072f197b19f85e13e526b8b769d1e537f8156457b1779bcc9300fe
 CFLAGS="-Wno-error"
 
 do_install() {

From e5ee9efe69d18114f2f20c78741a150bb4f1d910 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:38:34 +0200
Subject: [PATCH 391/404] minify: update to 2.9.16.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 29df03334904..14ae97e4b1f2 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.15
+version=2.9.16
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=c05839ae2aa0aa13c2321bcea2df9aaed4dd52d85e7a3564b0313409e8bba074
+checksum=5bc765bf1a1ac641217b7921d3110fa8c5a5739b710a2077f16073b990fe46ff
 
 post_install() {
 	vlicense LICENSE

From e353f6a625b86f259b220a8f84a15380ffa2907a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 01:46:22 +0200
Subject: [PATCH 392/404] New package: neochat-1.1.1, kquickimageeditor-0.1.3.

---
 srcpkgs/kquickimageeditor-devel    |  1 +
 srcpkgs/kquickimageeditor/template | 26 ++++++++++++++++++++++++++
 srcpkgs/neochat/template           | 22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/kquickimageeditor-devel
 create mode 100644 srcpkgs/kquickimageeditor/template
 create mode 100644 srcpkgs/neochat/template

diff --git a/srcpkgs/kquickimageeditor-devel b/srcpkgs/kquickimageeditor-devel
new file mode 120000
index 000000000000..acc5eacd1d75
--- /dev/null
+++ b/srcpkgs/kquickimageeditor-devel
@@ -0,0 +1 @@
+kquickimageeditor
\ No newline at end of file
diff --git a/srcpkgs/kquickimageeditor/template b/srcpkgs/kquickimageeditor/template
new file mode 100644
index 000000000000..2073799689de
--- /dev/null
+++ b/srcpkgs/kquickimageeditor/template
@@ -0,0 +1,26 @@
+# Template file for 'kquickimageeditor'
+pkgname=kquickimageeditor
+version=0.1.3
+revision=1
+build_style=cmake
+hostmakedepends="cmake extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-declarative-devel"
+short_desc="QML image editing components"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="LGPL-2.1-or-later, BSD-2-Clause, CC0-1.0"
+homepage="https://invent.kde.org/libraries/kquickimageeditor"
+distfiles="${KDE_SITE}/kquickimageeditor/${version%.*}/$pkgname-$version.tar.xz"
+checksum=5b13f8e53bc7ea960b24064948f3d28bfb39f47529d5fa63a2090a047465c1ea
+
+post_install() {
+	vlicense LICENSES/BSD-2-Clause.txt
+}
+
+kquickimageeditor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+	}
+}
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
new file mode 100644
index 000000000000..d057c3e9e9f2
--- /dev/null
+++ b/srcpkgs/neochat/template
@@ -0,0 +1,22 @@
+# Template file for 'neochat'
+pkgname=neochat
+version=1.1.1
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake
+ qt5-host-tools kcoreaddons kconfig AppStream"
+makedepends="kdbusaddons-devel kquickimageeditor-devel libQuotient-devel
+ qtkeychain-qt5-devel qt5-quickcontrols2-devel qt5-declarative-devel
+ qt5-multimedia-devel qt5-svg-devel kirigami2-devel ki18n-devel cmark-devel
+ knotifications-devel kconfig-devel kcoreaddons-devel"
+depends="kquickimageeditor kitemmodels"
+short_desc="Client for matrix from KDE"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-3.0-only, GPL-3.0-or-later, GPL-2.0-or-later, BSD-2-Clause"
+homepage="https://apps.kde.org/en/neochat"
+distfiles="${KDE_SITE}/neochat/$version/neochat-$version.tar.xz"
+checksum=dcaecf35fadffe298d849955b39f5d193161df6d6388ce402b4207a24b06757b
+
+post_install() {
+	vlicense LICENSES/BSD-2-Clause.txt
+}

From b0b0cc27989c3d2e6d6f619f501e36436438208f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 13 Apr 2021 10:57:13 -0400
Subject: [PATCH 393/404] EmptyEpsilon: update to 2021.03.31.

---
 srcpkgs/EmptyEpsilon/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
index c20280877634..f191433eec50 100644
--- a/srcpkgs/EmptyEpsilon/template
+++ b/srcpkgs/EmptyEpsilon/template
@@ -1,10 +1,10 @@
 # Template file for 'EmptyEpsilon'
 pkgname=EmptyEpsilon
-_ver_major=2020
-_ver_minor=11
-_ver_patch=23
+_ver_major=2021
+_ver_minor=03
+_ver_patch=31
 version="${_ver_major}.${_ver_minor}.${_ver_patch}"
-revision=3
+revision=1
 wrksrc="EmptyEpsilon-EE-${version}"
 build_style=cmake
 configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}
@@ -20,5 +20,5 @@ license="GPL-2.0-only"
 homepage="https://daid.github.io/EmptyEpsilon/"
 distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
  https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
-checksum="339df2f3b57135663cb7bd253d7e157c3c5d457137bc6ed4c9651f48e8e6bf0c
- 7552ab3b2a82735401aba2215ae5bcae5fa2c9946b709ff77e0c2cc5a60abc23"
+checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24
+ 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7"

From a17717f775a75986abbafba738af349ac56c929c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 16:57:28 +0200
Subject: [PATCH 394/404] xorg-server: update to 1.20.11.

---
 srcpkgs/xorg-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 780738711835..7832f45ff7e6 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.10
-revision=4
+version=1.20.11
+revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99
+checksum=914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From e2a737318cb23faae3020734c978e0a6cec428aa Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 13 Apr 2021 16:17:51 +0200
Subject: [PATCH 395/404] man-pages: don't remove xattr syscall pages

Those are not longer provided by attr-devel, and this prevents the xattr
family of syscall man-pages from getting included in the man-pages devel
package.
---
 srcpkgs/man-pages/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index f9f7e9a144a7..c5cc250ad353 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,7 +1,7 @@
 # Template file for 'man-pages'
 pkgname=man-pages
 version=5.11
-revision=1
+revision=2
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -34,9 +34,6 @@ do_install() {
 	# mdocml
 	rm -f man7/man.7
 	rm -f man7/mdoc.7
-	# attr-devel
-	rm -f man5/attr.5
-	rm -f man2/*xattr.2
 	# openssl-devel
 	mv man3/rand.3 man3/glibc-rand.3
 	mv man3/err.3 man3/glibc-err.3

From b12d63ca69f6794198bba59f9ab41e5ab8a23b41 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 13:52:25 +0200
Subject: [PATCH 396/404] unrar: update to 6.0.5.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index f3a6ceded883..a4478ba38330 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.0.4
+version=6.0.5
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1
+checksum=7e34064c9e97464462c81aed80c25619149f71d4900995021780787f51dd63f0
 repository=nonfree
 
 do_build() {

From 5b00d3368accff41b68343bfed3ecbc2e39e0cf7 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Tue, 13 Apr 2021 16:44:33 +0300
Subject: [PATCH 397/404] hydroxide: update to 0.2.18.

---
 srcpkgs/hydroxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index bd4dc1b255e8..ac417c59ed8e 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.17
+version=0.2.18
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d1e24ce95c181fdad8cef78dc93ed6ba259302a21c0b160b7552ffc6b346bde8
+checksum=93865423bad0e37fd231d5ee52f9b98d63b6950cfc664e2d557fc579681a400b
 
 post_install() {
 	vlicense LICENSE

From c75d82806dbefb802198a0117ec97d06302a4754 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 13 Apr 2021 12:20:15 +0300
Subject: [PATCH 398/404] exa: update to 0.10.1

---
 srcpkgs/exa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ea3ad487fa43..fd5d7266f589 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,6 +1,6 @@
 # Template file for 'exa'
 pkgname=exa
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config libgit2-devel"
@@ -11,8 +11,8 @@ license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz
  https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
-checksum="27420f7b805941988399d63f388be4f6077eee94a505bf01c2fb0e7d15cbf78d
- c1ab340af63e64bc3fd854c03f6161aa240a533e928688036a7d4544aecabc05"
+checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
+ 531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
 
 post_extract() {
 	mkdir -p accoutrements

From d5bdfe908beac9fa137c0aba47b1d35880d63ca6 Mon Sep 17 00:00:00 2001
From: K M J <Menten@noreply.codeberg.org>
Date: Tue, 13 Apr 2021 13:18:44 +0200
Subject: [PATCH 399/404] distrobuilder: update to 1.2.

---
 srcpkgs/distrobuilder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index a6847d085e25..fd58594e1748 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,6 +1,6 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
-version=1.1
+version=1.2
 revision=1
 wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
@@ -13,4 +13,4 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/distrobuilder/introduction/"
 distfiles="https://github.com/lxc/distrobuilder/archive/distrobuilder-${version}.tar.gz"
-checksum=a21b41f7d4030b923d7ea3840f90ff6912f6474e516140f488b87c8dfe970bbc
+checksum=c60f8cee78a9ed6b4606a3849f1bc3288f5e80651b7c59ea62c5dd8aae3e9e45

From 8876dbc34356c0305f5f0ae349a3606cc6e00473 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 13 Apr 2021 11:32:50 +0300
Subject: [PATCH 400/404] rssguard: update to 3.9.2.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index df1ccd7ede93..88f7d36d6b31 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=3.9.1
+version=3.9.2
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=312468a21a370159b0e10f6814071f6182314e196f2930402ffc307871e36fbf
+checksum=05eb628ff085ff10056289fd83b5e3b0583c19e3711795ade024bdfe71de5d97
 
 post_install() {
 	# Install rssguard icon manually

From b3834f7d6adff87dc255864d121587b61e24058f Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:23:09 +0300
Subject: [PATCH 401/404] monero: update to 0.17.2.0

---
 srcpkgs/monero/patches/march_cross.patch      | 16 +++++++++-------
 srcpkgs/monero/patches/system-miniupnpc.patch |  7 +++----
 srcpkgs/monero/template                       |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch
index 1c086feee419..a1276013b00d 100644
--- a/srcpkgs/monero/patches/march_cross.patch
+++ b/srcpkgs/monero/patches/march_cross.patch
@@ -1,11 +1,13 @@
---- CMakeLists.txt	2017-09-22 19:22:04.735657685 +0200
-+++ CMakeLists.txt	2017-09-22 19:20:08.164169125 +0200
-@@ -388,7 +388,7 @@
-   include(TestCXXAcceptsFlag)
-   set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all")
+diff --git CMakeLists.txt CMakeLists.txt
+index 953707657..394e8cb32 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -581,7 +581,7 @@ else()
+     set_default_arch()
+   endif()
    message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
-+  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
 -  if(ARCH STREQUAL "default")
++  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
      set(ARCH_FLAG "")
    elseif(PPC64LE)
-     set(ARCH_FLAG "-mcpu=${ARCH}")
+     set(ARCH_FLAG "-mcpu=power8")
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 79b2e4d842c8..607162d8a54d 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,7 +1,6 @@
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- 
+@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
  add_subdirectory(external)
  
 +# Final setup for miniupnpc
@@ -19,9 +18,9 @@ diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
 index 9b21705e..76340a22 100644
 --- src/p2p/net_node.inl
 +++ src/p2p/net_node.inl
-@@ -49,9 +49,16 @@
- #include "storages/levin_abstract_invoke2.h"
+@@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h"
  #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
  
 -#include <miniupnp/miniupnpc/miniupnpc.h>
 -#include <miniupnp/miniupnpc/upnpcommands.h>
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 45072e81b820..3617a446f098 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
-version=0.17.1.9
-revision=2
+version=0.17.2.0
+revision=1
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -23,7 +23,7 @@ distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
  https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
-checksum="efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"

From 2e04204366d444a193af7ae2619a45da9e1a66b3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:55:35 +0300
Subject: [PATCH 402/404] monero-gui: update to 0.17.2.0

---
 srcpkgs/monero-gui/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6ed3b0f5ce6a..16d2926d770a 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,8 +1,8 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
-version=0.17.1.9
-revision=2
-_monero_version=0.17.1.9
+version=0.17.2.0
+revision=1
+_monero_version=0.17.2.0
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -26,8 +26,8 @@ distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz
  https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
- efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="00fbadca8090b85781b66b9cf54c36926ba9502ea5ce8e375a4342993b4ce907
+ 5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7

From 62c00a8a357ab390279a3e24d313d19ab47a2c5c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 22:20:17 -0500
Subject: [PATCH 403/404] stunnel: update to 5.59.

---
 srcpkgs/stunnel/patches/patch-src_ctx_c.patch | 41 -------------------
 srcpkgs/stunnel/patches/patch-src_ssl_c.patch | 13 ------
 .../stunnel/patches/patch-src_verify_c.patch  | 13 ------
 srcpkgs/stunnel/template                      | 37 +++--------------
 4 files changed, 5 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_ctx_c.patch
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_ssl_c.patch
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_verify_c.patch

diff --git a/srcpkgs/stunnel/patches/patch-src_ctx_c.patch b/srcpkgs/stunnel/patches/patch-src_ctx_c.patch
deleted file mode 100644
index 2fdcdbacca10..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_ctx_c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_ctx_c,v 1.7 2018/02/23 10:26:56 sthen Exp $
-Index: src/ctx.c
---- src/ctx.c.orig
-+++ src/ctx.c
-@@ -93,7 +93,7 @@ NOEXPORT int ui_retry();
- /* session callbacks */
- NOEXPORT int sess_new_cb(SSL *, SSL_SESSION *);
- NOEXPORT SSL_SESSION *sess_get_cb(SSL *,
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     const
- #endif
-     unsigned char *, int, int *);
-@@ -295,7 +295,8 @@ NOEXPORT int matches_wildcard(char *servername, char *
- 
- #ifndef OPENSSL_NO_DH
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
-     return ctx->cipher_list;
- }
-@@ -398,7 +399,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- /**************************************** initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CONF_CTX *cctx;
-     NAME_LIST *curr;
-     char *cmd, *param;
-@@ -907,7 +908,7 @@ NOEXPORT int sess_new_cb(SSL *ssl, SSL_SESSION *sess) 
- }
- 
- NOEXPORT SSL_SESSION *sess_get_cb(SSL *ssl,
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         const
- #endif
-         unsigned char *key, int key_len, int *do_copy) {
diff --git a/srcpkgs/stunnel/patches/patch-src_ssl_c.patch b/srcpkgs/stunnel/patches/patch-src_ssl_c.patch
deleted file mode 100644
index a2ca0c16c77a..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_ssl_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_ssl_c,v 1.8 2018/04/14 09:05:14 tb Exp $
-Index: src/ssl.c
---- src/ssl.c.orig
-+++ src/ssl.c
-@@ -51,7 +51,7 @@ int index_ssl_cli, index_ssl_ctx_opt;
- int index_session_authenticated, index_session_connect_address;
- 
- int ssl_init(void) { /* init TLS before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
-         OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL);
- #else
diff --git a/srcpkgs/stunnel/patches/patch-src_verify_c.patch b/srcpkgs/stunnel/patches/patch-src_verify_c.patch
deleted file mode 100644
index f4ee8c595dc8..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_verify_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_verify_c,v 1.6 2017/09/12 16:15:24 gsoares Exp $
-Index: src/verify.c
---- src/verify.c.orig
-+++ src/verify.c
-@@ -353,7 +353,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback
-     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     subject=X509_get_subject_name(cert);
- 
--#if OPENSSL_VERSION_NUMBER<0x10100006L
-+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
- #endif
-     /* modern API allows retrieving multiple matching certificates */
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 54ecff002a05..e5e9636b2e66 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,49 +1,22 @@
 # Template file for 'stunnel'
 pkgname=stunnel
-version=5.46
-revision=5
+version=5.59
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
 makedepends="openssl-devel"
-checkdepends="nmap procps-ng"
+checkdepends="nmap procps-ng iproute2"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.stunnel.org/"
 changelog="https://www.stunnel.org/sdf_ChangeLog.html"
-distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz"
-checksum=76aab48c28743d78e4b2f6b2dfe49994b6ca74126046c179444f699fae7a84c7
+distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+checksum=137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f
 
 post_install() {
 	rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8
 	vsconf tools/stunnel.conf-sample
 	rm -r ${DESTDIR}/etc/stunnel ${DESTDIR}/usr/share/doc/stunnel
 }
-
-# REMARKS:
-# What. A. Pain. What a total pain.
-# Using the archive is the only way to get builds to keep working after the
-# new version is out. LibreSSL patches for stunnel 5.35 don't yet work. Not
-# enough is made conditional.
-# --
-# It is important to note that upstream has expressly refused to support
-# LibreSSL.
-# --
-# Significant thanks to the OpenBSD project for creating patch sets for 5.37
-# One thing OpenBSD does that we don't do here is add a _stunnel user/group and
-# modify the configuration samples to chroot and use this by default.
-# As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what openssl provides.
-# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
-# This is probably not a security problem. EDIT: Well, it would break. Badly.
-# --
-# As of 5.39_2 the code now doesn't use above function call if using LibreSSL,
-# and a different call to SSL_CTX_sess_set_get_cb gets a const unsigned char *
-# instead of an unsigned char *
-# --
-# As of 5.41_1 there are only two sorts of code warnings:
-# conversion 'long int' from 'long unsigned int' for what appear to be flags
-# and SSL_SESSION* (*)(struct ssl_st *, unsigned char *, int, int*) expected
-# got SSL_SESSION* (*)(struct ssl_st *, const unsigned char *, int, int*)
-# These are not being considered issues.

From 8acf77271c4b9c2b172b98c01f58b872ea01dac8 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 13 Apr 2021 10:29:12 -0500
Subject: [PATCH 404/404] pahole: update to 1.21.

---
 srcpkgs/pahole/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index 184b67b95286..d3b720d72f24 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,7 +1,7 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.20
-revision=2
+version=1.21
+revision=1
 wrksrc="dwarves-${version}"
 build_style=cmake
 configure_args="-D__LIB=lib"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=a0dbda45ce83c0bf21eba78c44b4fd72560a970285fbb3e4f88375015aab6f06
+checksum=33a8bed6c0e1a5889578e01d1afed3f752353dc087d8bda36d258fe83e42a476
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (40 preceding siblings ...)
  2021-04-13 16:56 ` Veganizer
@ 2021-04-13 17:08 ` Veganizer
  2021-04-13 18:46 ` Veganizer
                   ` (6 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-13 17:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 64862 bytes --]

From da05b46f3b360e014713ab49bc907ce3e86692c0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From d00bbe828affd81d3ceadd56bfdc9a3c4fcb03e3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 75fde703ab4450d4effa71d4655082056e758e49 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 13b767ba370c424143c1beb1f26722313cda8fdf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From 7c5f0b214ece751144e8b1488b323821d743e5d1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 46721f2e07f5eb96a7ea4186955925c8c60ae73e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 769cd4eb5ae93a0613d8058ec1e10ee8f6c8b636 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 07/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From cae12b2762b513f15daf89920cd1b6514cf863cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 08/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 7e9b1a85454d894ae0c4ef46883c73d27bf6a8f3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 09/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 67f31e5d89781008ab228c9d5e128d48dbcf8cc4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 10/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 57a718e20049193dae5cc40d97fb56e68d15f04f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 11/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From e9fee087eab6dea1823a7511b2048eb75fa67109 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 12/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 9485e72c6b1cb5a0053bd234697478f199d8e6f6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 13/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7d6f6b12c152..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 19f133578b3e74d597e96bca4935cf76010bd5bc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 14/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From a0905dc7f8579a72f7a1901e379af03d2f14788e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 15/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From e8f16af0e00a5d8a462bb3157f263e7ed48ddb13 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 16/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 812a11c0ea95b753c01d8857f93ad853875d0878 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 17/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 8ab5ebffbef3b9c80999b874a9f7a34444c86cd6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 18/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 3afb19fffe4fdcf12c5bb41da94d8d42a8be71e5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 19/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 418201a11754476012a6bfff6bc9febdba275bc7 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 20/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e66138668f80e4002a7bec52ae0464d6620a0085 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 21/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From dd88c988cee3f336c9a6b06e9f29794800d5c24d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 22/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From fe77fb3eb915bf1f79ed04400796217c4a7c51a6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 23/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From 7a2494b77ce04345acfd179e2c91f74939594e8d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 24/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 2dfeee5c22c0fee4529a8b27f9e176cdfc8a2fc8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 25/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 7a3f6ae9b27fa14fd7a75092135fd7dc270bfda6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 26/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From 62b23a9c6c0d5505ab5576967fd7932a11adb82e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 27/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 865d83e646959769550d02a03239b28453430af6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 28/28] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL  | 7 +++++++
 srcpkgs/mariadb/template | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 srcpkgs/mariadb/INSTALL

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..a69d0aaa7857 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -32,6 +32,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (41 preceding siblings ...)
  2021-04-13 17:08 ` Veganizer
@ 2021-04-13 18:46 ` Veganizer
  2021-04-14 10:52 ` [PR REVIEW] " grooverdan
                   ` (5 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-13 18:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1631 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 65628 bytes --]

From da05b46f3b360e014713ab49bc907ce3e86692c0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From d00bbe828affd81d3ceadd56bfdc9a3c4fcb03e3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 75fde703ab4450d4effa71d4655082056e758e49 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 13b767ba370c424143c1beb1f26722313cda8fdf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From 7c5f0b214ece751144e8b1488b323821d743e5d1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 46721f2e07f5eb96a7ea4186955925c8c60ae73e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 769cd4eb5ae93a0613d8058ec1e10ee8f6c8b636 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 07/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From cae12b2762b513f15daf89920cd1b6514cf863cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 08/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 7e9b1a85454d894ae0c4ef46883c73d27bf6a8f3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 09/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 67f31e5d89781008ab228c9d5e128d48dbcf8cc4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 10/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 57a718e20049193dae5cc40d97fb56e68d15f04f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 11/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From e9fee087eab6dea1823a7511b2048eb75fa67109 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 12/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 9485e72c6b1cb5a0053bd234697478f199d8e6f6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 13/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7d6f6b12c152..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 19f133578b3e74d597e96bca4935cf76010bd5bc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 14/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From a0905dc7f8579a72f7a1901e379af03d2f14788e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 15/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From e8f16af0e00a5d8a462bb3157f263e7ed48ddb13 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 16/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 812a11c0ea95b753c01d8857f93ad853875d0878 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 17/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 8ab5ebffbef3b9c80999b874a9f7a34444c86cd6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 18/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 3afb19fffe4fdcf12c5bb41da94d8d42a8be71e5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 19/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 418201a11754476012a6bfff6bc9febdba275bc7 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 20/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e66138668f80e4002a7bec52ae0464d6620a0085 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 21/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From dd88c988cee3f336c9a6b06e9f29794800d5c24d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 22/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From fe77fb3eb915bf1f79ed04400796217c4a7c51a6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 23/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From 7a2494b77ce04345acfd179e2c91f74939594e8d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 24/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 2dfeee5c22c0fee4529a8b27f9e176cdfc8a2fc8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 25/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 7a3f6ae9b27fa14fd7a75092135fd7dc270bfda6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 26/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From 62b23a9c6c0d5505ab5576967fd7932a11adb82e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 27/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 1080fae4e31b91135c1882f907255450eb13b887 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 28/28] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL  | 7 +++++++
 srcpkgs/mariadb/template | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mariadb/INSTALL

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..13fce466290f 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -16,10 +16,11 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
  -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
  -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
- -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON
+ -DWITH_PCRE=system"
 hostmakedepends="bison perl flex pkg-config git"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- libatomic-devel"
+ pcre2-devel libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -32,6 +33,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR REVIEW] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (42 preceding siblings ...)
  2021-04-13 18:46 ` Veganizer
@ 2021-04-14 10:52 ` grooverdan
  2021-04-14 10:52 ` grooverdan
                   ` (4 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: grooverdan @ 2021-04-14 10:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

New review comment by grooverdan on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#discussion_r613143296

Comment:
MDEV-24131 was fixed in 10.5.9

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR REVIEW] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (43 preceding siblings ...)
  2021-04-14 10:52 ` [PR REVIEW] " grooverdan
@ 2021-04-14 10:52 ` grooverdan
  2021-04-14 13:21 ` [PR PATCH] [Updated] " Veganizer
                   ` (3 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: grooverdan @ 2021-04-14 10:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New review comment by grooverdan on void-packages repository

https://github.com/void-linux/void-packages/pull/30143#discussion_r613143296

Comment:
MDEV-24131 was fixed in 10.5.9. Please tell me if its not.

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (44 preceding siblings ...)
  2021-04-14 10:52 ` grooverdan
@ 2021-04-14 13:21 ` Veganizer
  2021-04-14 13:24 ` Veganizer
                   ` (2 subsequent siblings)
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-14 13:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 68626 bytes --]

From da05b46f3b360e014713ab49bc907ce3e86692c0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From d00bbe828affd81d3ceadd56bfdc9a3c4fcb03e3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 75fde703ab4450d4effa71d4655082056e758e49 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 13b767ba370c424143c1beb1f26722313cda8fdf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From 7c5f0b214ece751144e8b1488b323821d743e5d1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 46721f2e07f5eb96a7ea4186955925c8c60ae73e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 769cd4eb5ae93a0613d8058ec1e10ee8f6c8b636 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 07/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From cae12b2762b513f15daf89920cd1b6514cf863cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 08/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 7e9b1a85454d894ae0c4ef46883c73d27bf6a8f3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 09/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 67f31e5d89781008ab228c9d5e128d48dbcf8cc4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 10/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 57a718e20049193dae5cc40d97fb56e68d15f04f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 11/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From e9fee087eab6dea1823a7511b2048eb75fa67109 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 12/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 9485e72c6b1cb5a0053bd234697478f199d8e6f6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 13/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7d6f6b12c152..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 19f133578b3e74d597e96bca4935cf76010bd5bc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 14/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From a0905dc7f8579a72f7a1901e379af03d2f14788e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 15/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From e8f16af0e00a5d8a462bb3157f263e7ed48ddb13 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 16/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 812a11c0ea95b753c01d8857f93ad853875d0878 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 17/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 8ab5ebffbef3b9c80999b874a9f7a34444c86cd6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 18/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 3afb19fffe4fdcf12c5bb41da94d8d42a8be71e5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 19/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 418201a11754476012a6bfff6bc9febdba275bc7 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 20/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e66138668f80e4002a7bec52ae0464d6620a0085 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 21/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From dd88c988cee3f336c9a6b06e9f29794800d5c24d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 22/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From fe77fb3eb915bf1f79ed04400796217c4a7c51a6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 23/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From 7a2494b77ce04345acfd179e2c91f74939594e8d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 24/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 2dfeee5c22c0fee4529a8b27f9e176cdfc8a2fc8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 25/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 7a3f6ae9b27fa14fd7a75092135fd7dc270bfda6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 26/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From 62b23a9c6c0d5505ab5576967fd7932a11adb82e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 27/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 152b15b0f64bdee24c9aba7aa58243e54a793cc3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 28/28] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL                       |  7 +++++
 .../files/musl-disable-failing-test.patch     | 28 -------------------
 srcpkgs/mariadb/patches/fix-cross.patch       |  5 ++++
 srcpkgs/mariadb/template                      |  8 ++++--
 4 files changed, 17 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
deleted file mode 100644
index 450816150378..000000000000
--- a/srcpkgs/mariadb/files/musl-disable-failing-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./storage/maria/unittest/CMakeLists.txt
-+++ ./storage/maria/unittest/CMakeLists.txt
-@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
-         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
- MY_ADD_TEST(ma_test_loghandler_readonly)
-
--SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
--ADD_EXECUTABLE(ma_test_loghandler_nologs-t
--        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
--MY_ADD_TEST(ma_test_loghandler_nologs)
-+#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
-+#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
-+#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
-+#MY_ADD_TEST(ma_test_loghandler_nologs)
-
- SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
- SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
---- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
-+++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
-@@ -15,7 +15,7 @@
-
- MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
-              byte_order
--             queues stacktrace crc32 LINK_LIBRARIES mysys)
-+             queues crc32 LINK_LIBRARIES mysys)
- MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
- MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
- ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 0f836fe5c328..df46a2f2670a 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,3 +1,8 @@
+Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
+Date: Fri Apr 11 14:19:00 2021 +0200
+
+   Fix cross-compile patch to  consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
+
 --- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
 +++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
 @@ -397,7 +397,7 @@
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..747f7c4d0f13 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -16,10 +16,11 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
  -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
  -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
- -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON
+ -DWITH_PCRE=system"
 hostmakedepends="bison perl flex pkg-config git"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- libatomic-devel"
+ pcre2-devel libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -32,6 +33,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 
@@ -39,7 +41,7 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
-			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			#patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
 			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
 			;;
 	esac

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (45 preceding siblings ...)
  2021-04-14 13:21 ` [PR PATCH] [Updated] " Veganizer
@ 2021-04-14 13:24 ` Veganizer
  2021-04-15 19:12 ` Johnnynator
  2021-04-15 19:23 ` [PR PATCH] [Merged]: " Johnnynator
  48 siblings, 0 replies; 50+ messages in thread
From: Veganizer @ 2021-04-14 13:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]

There is an updated pull request by Veganizer against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 68563 bytes --]

From da05b46f3b360e014713ab49bc907ce3e86692c0 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   9 -
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../files/musl-disable-failing-test.patch     |  28 ++
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 136 +++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  90 +++---
 srcpkgs/mariadb/update                        |   2 -
 17 files changed, 343 insertions(+), 620 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 create mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..635f95b207bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
deleted file mode 100644
index 171f3bc4d7e2..000000000000
--- a/srcpkgs/mariadb/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# *-*-shell-*-*
-#
-case ${ACTION} in
-post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
-	;;
-esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
new file mode 100644
index 000000000000..450816150378
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
@@ -0,0 +1,28 @@
+--- ./storage/maria/unittest/CMakeLists.txt
++++ ./storage/maria/unittest/CMakeLists.txt
+@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
+         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
+ MY_ADD_TEST(ma_test_loghandler_readonly)
+
+-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
+-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+-        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+-MY_ADD_TEST(ma_test_loghandler_nologs)
++#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
++#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
++#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
++#MY_ADD_TEST(ma_test_loghandler_nologs)
+
+ SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
+ SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..0f836fe5c328 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,121 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..55a7cc86eb67 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,48 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+ignore_elf_dirs="/usr/share"
+make_check=extended
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
-}
-
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
-	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
 post_install() {
@@ -72,8 +51,8 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
 
 	vsv mysqld
 }
@@ -83,8 +62,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From d00bbe828affd81d3ceadd56bfdc9a3c4fcb03e3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From 75fde703ab4450d4effa71d4655082056e758e49 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 13b767ba370c424143c1beb1f26722313cda8fdf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From 7c5f0b214ece751144e8b1488b323821d743e5d1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 46721f2e07f5eb96a7ea4186955925c8c60ae73e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 769cd4eb5ae93a0613d8058ec1e10ee8f6c8b636 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 07/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From cae12b2762b513f15daf89920cd1b6514cf863cf Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 08/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From 7e9b1a85454d894ae0c4ef46883c73d27bf6a8f3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 09/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From 67f31e5d89781008ab228c9d5e128d48dbcf8cc4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 10/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 57a718e20049193dae5cc40d97fb56e68d15f04f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 11/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From e9fee087eab6dea1823a7511b2048eb75fa67109 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 12/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From 9485e72c6b1cb5a0053bd234697478f199d8e6f6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 13/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7d6f6b12c152..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 19f133578b3e74d597e96bca4935cf76010bd5bc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 14/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From a0905dc7f8579a72f7a1901e379af03d2f14788e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 15/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From e8f16af0e00a5d8a462bb3157f263e7ed48ddb13 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 16/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From 812a11c0ea95b753c01d8857f93ad853875d0878 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 17/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 8ab5ebffbef3b9c80999b874a9f7a34444c86cd6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 18/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 3afb19fffe4fdcf12c5bb41da94d8d42a8be71e5 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 19/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..3ebc34472c46 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.9
-revision=3
+revision=4
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 418201a11754476012a6bfff6bc9febdba275bc7 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 20/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e66138668f80e4002a7bec52ae0464d6620a0085 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 21/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From dd88c988cee3f336c9a6b06e9f29794800d5c24d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 22/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From fe77fb3eb915bf1f79ed04400796217c4a7c51a6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 23/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From 7a2494b77ce04345acfd179e2c91f74939594e8d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 24/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 2dfeee5c22c0fee4529a8b27f9e176cdfc8a2fc8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 25/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 7a3f6ae9b27fa14fd7a75092135fd7dc270bfda6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 26/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From 62b23a9c6c0d5505ab5576967fd7932a11adb82e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 27/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From 51cc5d5b8325f328ef19a008067b054a5adf3c90 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 18:41:16 +0200
Subject: [PATCH 28/28] fixup! mariadb:

---
 srcpkgs/mariadb/INSTALL                       |  7 +++++
 .../files/musl-disable-failing-test.patch     | 28 -------------------
 srcpkgs/mariadb/patches/fix-cross.patch       |  5 ++++
 srcpkgs/mariadb/template                      |  7 +++--
 4 files changed, 16 insertions(+), 31 deletions(-)
 create mode 100644 srcpkgs/mariadb/INSTALL
 delete mode 100644 srcpkgs/mariadb/files/musl-disable-failing-test.patch

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
new file mode 100644
index 000000000000..256a89f2dfb8
--- /dev/null
+++ b/srcpkgs/mariadb/INSTALL
@@ -0,0 +1,7 @@
+# *-*-shell-*-*
+#
+case ${ACTION} in
+post)
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	;;
+esac
diff --git a/srcpkgs/mariadb/files/musl-disable-failing-test.patch b/srcpkgs/mariadb/files/musl-disable-failing-test.patch
deleted file mode 100644
index 450816150378..000000000000
--- a/srcpkgs/mariadb/files/musl-disable-failing-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./storage/maria/unittest/CMakeLists.txt
-+++ ./storage/maria/unittest/CMakeLists.txt
-@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
-         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
- MY_ADD_TEST(ma_test_loghandler_readonly)
-
--SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
--ADD_EXECUTABLE(ma_test_loghandler_nologs-t
--        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
--MY_ADD_TEST(ma_test_loghandler_nologs)
-+#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
-+#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
-+#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
-+#MY_ADD_TEST(ma_test_loghandler_nologs)
-
- SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
- SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
---- ./unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
-+++ ./unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
-@@ -15,7 +15,7 @@
-
- MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
-              byte_order
--             queues stacktrace crc32 LINK_LIBRARIES mysys)
-+             queues crc32 LINK_LIBRARIES mysys)
- MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
- MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
- ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 0f836fe5c328..df46a2f2670a 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,3 +1,8 @@
+Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
+Date: Fri Apr 11 14:19:00 2021 +0200
+
+   Fix cross-compile patch to  consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
+
 --- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
 +++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
 @@ -397,7 +397,7 @@
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 55a7cc86eb67..9e82d59d46ee 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -16,10 +16,11 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
  -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
  -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
- -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON"
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DSKIP_TESTS=ON
+ -DWITH_PCRE=system"
 hostmakedepends="bison perl flex pkg-config git"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- libatomic-devel"
+ pcre2-devel libatomic-devel"
 depends="mariadb-client"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Justin Jagieniak <justin@jagieniak.net>"
@@ -32,6 +33,7 @@ provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 ignore_elf_dirs="/usr/share"
 make_check=extended
 
@@ -39,7 +41,6 @@ pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
-			patch -p0 -i ${FILESDIR}/musl-disable-failing-test.patch
 			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
 			;;
 	esac

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Updated] mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (46 preceding siblings ...)
  2021-04-14 13:24 ` Veganizer
@ 2021-04-15 19:12 ` Johnnynator
  2021-04-15 19:23 ` [PR PATCH] [Merged]: " Johnnynator
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-15 19:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Veganizer/void-packages mariadb-server
https://github.com/void-linux/void-packages/pull/30143

mariadb: update to 10.5.9.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/30143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-server-30143.patch --]
[-- Type: text/x-diff, Size: 63331 bytes --]

From 45deb7393510ee77e6f68c20ffa8e0caeceee5bd Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 01/28] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   4 +-
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 141 ++++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  99 +++----
 srcpkgs/mariadb/update                        |   2 -
 16 files changed, 332 insertions(+), 612 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 3f35575eeadc..bb2b60e1f247 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ libmd.so.0 libmd-1.0.3_1
 libldacBT_abr.so.2 ldacBT-2.0.2.3_1
 libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
index 171f3bc4d7e2..256a89f2dfb8 100644
--- a/srcpkgs/mariadb/INSTALL
+++ b/srcpkgs/mariadb/INSTALL
@@ -2,8 +2,6 @@
 #
 case ${ACTION} in
 post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
 	;;
 esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..df46a2f2670a 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,126 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
+Date: Fri Apr 11 14:19:00 2021 +0200
+
+   Fix cross-compile patch to  consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
+
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..894e1bd7b896 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,59 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
+ pcre2-devel libatomic-devel"
 depends="mariadb-client"
+checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 
 pre_configure() {
-	# We need some host binaries before starting cross compilation.
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p build.native
-		# XXX still broken: jemalloc configure execs host bins.
-		CC= CXX= CPP= LD= AR= AS= RANLIB= CFLAGS= CXXFLAGS= LDFLAGS= \
-			cmake -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		cp build.native/extra/comp_err ${wrksrc}/extra
-		cp build.native/extra/comp_err ${wrksrc}/build/extra
-		cp build.native/scripts/comp_sql ${wrksrc}/scripts
-		cp build.native/scripts/comp_sql ${wrksrc}/build/scripts
-		cp build.native/sql/gen_lex_hash ${wrksrc}/sql
-		cp build.native/sql/gen_lex_hash ${wrksrc}/build/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/sql
-		cp build.native/sql/gen_lex_token ${wrksrc}/build/sql
-		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
+do_check() {
+	cd build
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		if [ ! "$CROSS_BUILD" ]; then
+			mem="--mem"
+		fi
+		vtargetrun ${XBPS_CROSS_BASE}/usr/bin/perl mysql-test/mtr --parallel=${XBPS_MAKEJOBS} ${mem} --force --max-test-fail=40
+	else
+		CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(conc336|bulk1|performance|basic-t|fetch|charset|logs|cursor|errors|view|ps|ps_bugs|sp|result|connection|misc|ps_new|thread|features-10_2|async|test-connect)"
 	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {
@@ -72,8 +62,10 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	vmkdir etc/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+	mv ${DESTDIR}/usr/share/user_map.conf etc/security/
 
 	vsv mysqld
 }
@@ -83,8 +75,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From abaeccc7a13ebf280f76cef3a07b508b33d64ee4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 02/28] FreeRADIUS: rebuild against mariadb-10.5.9.

---
 srcpkgs/FreeRADIUS/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From f395c1bdf9bd288c664775d63cf1e2af1b13b02d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 03/28] apr-util: rebuild against mariadb-10.5.9.

---
 srcpkgs/apr-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From 0f08cacf064ed6bdb938a5c4e9f776ed0de7444e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 04/28] bacula-common: rebuild against mariadb-10.5.9.

---
 srcpkgs/bacula-common/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From ef7b0b6fa1f686498cb03e9ac83e1f5b23db89a4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 05/28] collectd: rebuild against mariadb-10.5.9.

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 4d4e31d3c751c45e3d74e95a73bcd537fa5c919a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 06/28] coturn: rebuild against mariadb-10.5.9.

---
 srcpkgs/coturn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 993ea1411b9d72f2e4fb1de039f4eb955d0de73b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 07/28] dovecot: rebuild against mariadb-10.5.9.

---
 srcpkgs/dovecot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From 0030f7a2e643f1d6f2966731e4a8b8fca9c04944 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 08/28] gnunet: rebuild against mariadb-10.5.9.

---
 srcpkgs/gnunet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From ff07888820c31cb0693e28984544bd505fb1aa3e Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 09/28] icinga2: rebuild against mariadb-10.5.9.

---
 srcpkgs/icinga2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From e29d86bfaf52396e11ba8c1cbbaa5b8ed552e6d3 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 10/28] kdb: rebuild against mariadb-10.5.9.

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From c19ddbf444b222a631e9a71c4f16060a8ef02617 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 11/28] kodi: rebuild against mariadb-10.5.9.

---
 srcpkgs/kodi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From 4ab33db315e9924e3d878033c1ac5447c67b5f17 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 12/28] libgda: rebuild against mariadb-10.5.9.

---
 srcpkgs/libgda/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From d935128c50bc6dd6d2bec8797a0eb1c318f296b6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 13/28] libreoffice: rebuild against mariadb-10.5.9.

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 7d6f6b12c152..d10c5e457a9d 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.1.0.3
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From e4e37155390f3b5a7ebc9cea52734b20b86521a4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 14/28] lua54-luadbi: rebuild against mariadb-10.5.9.

---
 srcpkgs/lua54-luadbi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From d6c0c20b66c3fe3197950f3ba746cc36194b48a4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 15/28] monitoring-plugins: rebuild against mariadb-10.5.9.

---
 srcpkgs/monitoring-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 92f4a70f89f844735e609e9568cc854f51188df2 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 16/28] mysql++: rebuild against mariadb-10.5.9.

---
 srcpkgs/mysql++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From a4ad1a78f3b72c8a1b10b08e82f21201e42caa41 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 17/28] opensmtpd-extras: rebuild against mariadb-10.5.9.

---
 srcpkgs/opensmtpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From 803b4ff0901f823a148198d5e0da93cf19d4076c Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 18/28] perl-DBD-mysql: rebuild against mariadb-10.5.9.

---
 srcpkgs/perl-DBD-mysql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 8867561d42092d7385b11809d2eac66d1b522f19 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 19/28] postfix: rebuild against mariadb-10.5.9.

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index dc76f50f8166..8cef3964841f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.10
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 93f15285e9f13a50ebdfdd3468cd0251b2a1575a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 20/28] python3-mysqlclient: rebuild against mariadb-10.5.9.

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 397478d8920079a91594b986d5147344e3cd0574 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 21/28] qt5: rebuild against mariadb-10.5.9.

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From 357e36e78e68f0d8dc5c89bbc9317aaf958aed66 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 22/28] redland: rebuild against mariadb-10.5.9.

---
 srcpkgs/redland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From e86ad0ff2aa034ca305ab8237567eded1f3c9f05 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 23/28] rsyslog: rebuild against mariadb-10.5.9.

---
 srcpkgs/rsyslog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From b3e26d05a92253d934130e3582c98e2f53bdab85 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 24/28] slurm-wlm: rebuild against mariadb-10.5.9.

---
 srcpkgs/slurm-wlm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From d496f94a73105a46b9e6ba74d6bfcba7595a0f4f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 25/28] sysbench: rebuild against mariadb-10.5.9.

---
 srcpkgs/sysbench/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 4677d6111d235ceb5187223a9f6aa41d07da5649 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 26/28] thc-hydra: rebuild against mariadb-10.5.9.

---
 srcpkgs/thc-hydra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From 310e69af54349bb0bd0b8dee5b8285d801b00d86 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 27/28] zabbix: rebuild against mariadb-10.5.9.

---
 srcpkgs/zabbix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From b1230bec2ea52d9889aede195f0160ff5c4a12b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 14 Apr 2021 23:20:57 +0200
Subject: [PATCH 28/28] cyrus-sasl: rebuild against mariadb-10.5.9

---
 srcpkgs/cyrus-sasl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 608049a1d883..5bfe46557991 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

^ permalink raw reply	[flat|nested] 50+ messages in thread

* Re: [PR PATCH] [Merged]: mariadb: update to 10.5.9.
  2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
                   ` (47 preceding siblings ...)
  2021-04-15 19:12 ` Johnnynator
@ 2021-04-15 19:23 ` Johnnynator
  48 siblings, 0 replies; 50+ messages in thread
From: Johnnynator @ 2021-04-15 19:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]

There's a merged pull request on the void-packages repository

mariadb: update to 10.5.9.
https://github.com/void-linux/void-packages/pull/30143

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl


Cross compiling works now!

[ci skip]

^ permalink raw reply	[flat|nested] 50+ messages in thread

end of thread, other threads:[~2021-04-15 19:23 UTC | newest]

Thread overview: 50+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-11  4:28 [PR PATCH] mariadb: update to 10.5.9 Veganizer
2021-04-11  5:13 ` ericonr
2021-04-11  5:47 ` Veganizer
2021-04-11  5:51 ` Veganizer
2021-04-11  5:59 ` Veganizer
2021-04-11  6:04 ` Veganizer
2021-04-11  6:16 ` [PR PATCH] [Updated] " Veganizer
2021-04-11  6:21 ` Veganizer
2021-04-11  6:26 ` Veganizer
2021-04-11  7:12 ` Veganizer
2021-04-11  8:57 ` Veganizer
2021-04-11  9:17 ` Veganizer
2021-04-11  9:19 ` [PR REVIEW] " Johnnynator
2021-04-11  9:19 ` [PR PATCH] [Updated] " Veganizer
2021-04-11  9:22 ` Veganizer
2021-04-11  9:26 ` Veganizer
2021-04-11  9:44 ` Veganizer
2021-04-11  9:58 ` Veganizer
2021-04-11 10:41 ` Veganizer
2021-04-11 10:45 ` Veganizer
2021-04-11 11:07 ` Veganizer
2021-04-11 11:26 ` Veganizer
2021-04-11 11:36 ` Veganizer
2021-04-11 12:00 ` Veganizer
2021-04-11 12:04 ` Veganizer
2021-04-11 12:15 ` Veganizer
2021-04-11 13:07 ` Veganizer
2021-04-11 13:09 ` Veganizer
2021-04-11 13:10 ` Veganizer
2021-04-11 13:23 ` Veganizer
2021-04-11 13:30 ` Veganizer
2021-04-11 13:41 ` Veganizer
2021-04-11 16:06 ` Veganizer
2021-04-11 16:17 ` Veganizer
2021-04-12  7:12 ` [PR PATCH] [Updated] " Veganizer
2021-04-12  7:15 ` Veganizer
2021-04-12  7:34 ` Veganizer
2021-04-13  7:12 ` Johnnynator
2021-04-13  9:37 ` Johnnynator
2021-04-13  9:37 ` Johnnynator
2021-04-13 16:44 ` [PR PATCH] [Updated] " Veganizer
2021-04-13 16:56 ` Veganizer
2021-04-13 17:08 ` Veganizer
2021-04-13 18:46 ` Veganizer
2021-04-14 10:52 ` [PR REVIEW] " grooverdan
2021-04-14 10:52 ` grooverdan
2021-04-14 13:21 ` [PR PATCH] [Updated] " Veganizer
2021-04-14 13:24 ` Veganizer
2021-04-15 19:12 ` Johnnynator
2021-04-15 19:23 ` [PR PATCH] [Merged]: " Johnnynator

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).