diff options
| -rw-r--r-- | system/iproute2/APKBUILD | 1 | ||||
| -rw-r--r-- | system/iproute2/iproute2.post-install | 6 | ||||
| -rw-r--r-- | system/lvm2/APKBUILD | 4 | ||||
| -rw-r--r-- | system/s6-linux-init/APKBUILD | 6 | ||||
| -rw-r--r-- | system/utmps/APKBUILD | 4 | ||||
| -rw-r--r-- | user/qt5-qtbase/APKBUILD | 6 | ||||
| -rw-r--r-- | user/qt5-qtbase/big-endian-scroll-wheel.patch | 43 | ||||
| -rw-r--r-- | user/qt5-qtbase/qt-musl-iconv-no-bom.patch | 2 |
8 files changed, 57 insertions, 15 deletions
diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index 4b4b6060c..b4e32f6a8 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -11,7 +11,6 @@ options="!check" license="GPL-2.0-only" depends="" makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers" -install="$pkgname.post-install" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz devlink-sysinfo.patch" diff --git a/system/iproute2/iproute2.post-install b/system/iproute2/iproute2.post-install deleted file mode 100644 index 36d567ea2..000000000 --- a/system/iproute2/iproute2.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$(readlink /bin/ip)" = "/bin/busybox" ]; then - rm -f /bin/ip -fi -exit 0 diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 842dee2fa..fc491a70a 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -51,6 +51,10 @@ build () { --with-thin=internal \ --enable-dmeventd \ --enable-cmdlib \ + --with-default-dm-run-dir=/run \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-pid-dir=/run \ + --with-default-run-dir=/run/lvm \ --with-thin-check=/sbin/thin_check \ --with-thin-dump=/sbin/thin_dump \ --with-thin-repair=/sbin/thin_repair \ diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index d1cead76d..9217a7d03 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.0.2.0 -pkgrel=1 +pkgver=1.0.2.1 +pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/$pkgname/" arch="all" @@ -120,7 +120,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843 s6-linux-init-1.0.2.0.tar.gz +sha512sums="65ffd4c7a1457c6ad7397ccf7c4ee92dd04e546e21acf75bbfd49ace5b93eb22bac673185061ad9389449d324b6164577715258ab292825da8973140bc548d92 s6-linux-init-1.0.2.1.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 78d3a176e..50bd13dba 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.0.2.1 +pkgver=0.0.2.2 pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" @@ -76,6 +76,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz +sha512sums="1e7b53e7fcbd15a113aef8001ac77c3646ecd4723eaca77b36400c76ee96dafe919a993603a1fd441f1c9fff08c5924714910d43ae86fbf85971c39b950323c0 utmps-0.0.2.2.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 08e623af5..95f461d64 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -2,7 +2,7 @@ pkgname=qt5-qtbase _pkgname=qtbase-opensource-src pkgver=5.9.7 -pkgrel=0 +pkgrel=1 pkgdesc="Qt 5.9 base components" url="https://www.qt.io/" arch="all" @@ -22,6 +22,7 @@ makedepends="$depends_dev " subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz + big-endian-scroll-wheel.patch link-to-execinfo.patch qt-musl-iconv-no-bom.patch " @@ -173,5 +174,6 @@ x11() { } sha512sums="7121837501b810f31863fbb3a6ea7189d3e38789ff25eb49b639a69b73913761c8cba18b65046519693d2f5c8755c2197feff1df1ec3d88676d00c649a326e1e qtbase-opensource-src-5.9.7.tar.xz +0f5b3d93bd1543f4e28e3dfe4a77db4759f2e3afbeb6f6b2c3aa76bf106ed585984ea228b2233bc53afeb3f51c557e3545b18a74096d2cf129364a1f6c4ef090 big-endian-scroll-wheel.patch ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch -7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444 qt-musl-iconv-no-bom.patch" +dca65670df25a8e391d4c62b8967f4377cbd193a3053d8e8e288452ea197f418fe3f6d9d5e48dc333a44aeadec68e3d4380b3672a07ef6baf7aa3eed96ba96e3 qt-musl-iconv-no-bom.patch" diff --git a/user/qt5-qtbase/big-endian-scroll-wheel.patch b/user/qt5-qtbase/big-endian-scroll-wheel.patch new file mode 100644 index 000000000..3fbb8aec7 --- /dev/null +++ b/user/qt5-qtbase/big-endian-scroll-wheel.patch @@ -0,0 +1,43 @@ +--- qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.old 2018-10-16 08:37:05.000000000 +0000 ++++ qtbase-opensource-src-5.9.7/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp 2019-08-03 03:58:05.875790720 +0000 +@@ -43,6 +43,7 @@ + #include "qxcbwindow.h" + #include "qtouchdevice.h" + #include "QtCore/qmetaobject.h" ++#include "QtCore/qendian.h" + #include <qpa/qwindowsysteminterface_p.h> + #include <QDebug> + #include <cmath> +@@ -106,6 +107,7 @@ + XIEventMask xiEventMask; + bitMask = XI_HierarchyChangedMask; + bitMask |= XI_DeviceChangedMask; ++ bitMask = qToLittleEndian(bitMask); + xiEventMask.deviceid = XIAllDevices; + xiEventMask.mask_len = sizeof(bitMask); + xiEventMask.mask = xiBitMask; +@@ -327,7 +329,8 @@ + } + XIEventMask mask; + mask.mask_len = sizeof(bitMask); ++ bitMask = qToLittleEndian(bitMask); + mask.mask = xiBitMask; + // When xi2MouseEvents() is true (the default), pointer emulation for touch and tablet + // events will get disabled. This is preferable, as Qt Quick handles touch events + // directly, while for other applications QtGui synthesizes mouse events. +@@ -353,6 +356,7 @@ + tabletBitMask = XI_PropertyEventMask; + if (!pointerSelected) + tabletBitMask |= XI_ButtonPressMask | XI_ButtonReleaseMask | XI_MotionMask; ++ tabletBitMask = qToLittleEndian(tabletBitMask); + for (int i = 0; i < m_tabletData.count(); ++i) { + int deviceId = m_tabletData.at(i).deviceId; + tabletDevices.insert(deviceId); +@@ -374,6 +378,7 @@ + + scrollBitMask = XI_MotionMask; + scrollBitMask |= XI_ButtonReleaseMask; ++ scrollBitMask = qToLittleEndian(scrollBitMask); + int i=0; + for (const ScrollingDevice& scrollingDevice : qAsConst(m_scrollingDevices)) { + if (tabletDevices.contains(scrollingDevice.deviceId)) diff --git a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch index 8bf35ec1e..be2afc714 100644 --- a/user/qt5-qtbase/qt-musl-iconv-no-bom.patch +++ b/user/qt5-qtbase/qt-musl-iconv-no-bom.patch @@ -1,6 +1,6 @@ --- qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-01-18 15:20:58.000000000 +0100 +++ qtbase/src/corelib/codecs/qiconvcodec.cpp 2017-02-21 14:33:32.423808603 +0100 -@@ -64,7 +64,7 @@ +@@ -63,7 +63,7 @@ #elif defined(Q_OS_AIX) # define NO_BOM # define UTF16 "UCS-2" |