635e9da391
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
--- a/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
|
|
+++ b/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
|
|
@@ -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>
|
|
@@ -66,6 +67,7 @@
|
|
xiEventMask.mask = XCB_INPUT_XI_EVENT_MASK_HIERARCHY;
|
|
xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_DEVICE_CHANGED;
|
|
xiEventMask.mask |= XCB_INPUT_XI_EVENT_MASK_PROPERTY;
|
|
+ xiEventMask.mask = qToLittleEndian(xiEventMask.mask);
|
|
xcb_input_xi_select_events(xcb_connection(), rootWindow(), 1, &xiEventMask.header);
|
|
}
|
|
|
|
@@ -90,7 +92,7 @@
|
|
qt_xcb_input_event_mask_t mask;
|
|
mask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
|
|
mask.header.mask_len = 1;
|
|
- mask.mask = bitMask;
|
|
+ mask.mask = qToLittleEndian(bitMask);
|
|
xcb_void_cookie_t cookie =
|
|
xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &mask.header);
|
|
xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
|
|
@@ -359,7 +361,7 @@
|
|
qt_xcb_input_event_mask_t xiMask;
|
|
xiMask.header.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
|
|
xiMask.header.mask_len = 1;
|
|
- xiMask.mask = mask;
|
|
+ xiMask.mask = qToLittleEndian(mask);
|
|
|
|
xcb_void_cookie_t cookie =
|
|
xcb_input_xi_select_events_checked(xcb_connection(), window, 1, &xiMask.header);
|
|
@@ -386,7 +388,7 @@
|
|
tabletDevices.insert(deviceId);
|
|
xiEventMask[i].header.deviceid = deviceId;
|
|
xiEventMask[i].header.mask_len = 1;
|
|
- xiEventMask[i].mask = mask;
|
|
+ xiEventMask[i].mask = qToLittleEndian(mask);
|
|
}
|
|
xcb_input_xi_select_events(xcb_connection(), window, nrTablets, &(xiEventMask.data()->header));
|
|
}
|
|
@@ -402,7 +404,7 @@
|
|
#endif
|
|
xiEventMask[i].header.deviceid = scrollingDevice.deviceId;
|
|
xiEventMask[i].header.mask_len = 1;
|
|
- xiEventMask[i].mask = mask;
|
|
+ xiEventMask[i].mask = qToLittleEndian(mask);
|
|
i++;
|
|
}
|
|
xcb_input_xi_select_events(xcb_connection(), window, i, &(xiEventMask.data()->header));
|