diff options
| author |   stefson <herrtimson@yahoo.de> | 2018-02-04 11:34:54 +0100 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2018-02-07 07:19:22 -0500 |
| commit | e1b6c26ad078a85dc8e15054169176c96406955f (patch) | |
| tree | 1112172b059acf9a01eeeb7f988cb3f5cdc2b82a | |
| parent | x11-base/xorg-server: rebump (diff) | |
| download | musl-e1b6c26a.tar.gz musl-e1b6c26a.tar.bz2 musl-e1b6c26a.zip | |
x11-base/xorg-server: fix for #646390
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch | 13 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.6.ebuild | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch new file mode 100644 index 00000000..94c319a9 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.19.6-fix-NULL-value-detection.patch @@ -0,0 +1,13 @@ +diff --git a/config/udev.c b/config/udev.c +index e198e8609..3a73189e2 100644 +--- a/config/udev.c ++++ b/config/udev.c +@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device) + #endif + + value = udev_device_get_property_value(udev_device, "ID_INPUT"); +- if (value && !strcmp(value, "0")) { ++ if (!value || !strcmp(value, "0")) { + LogMessageVerb(X_INFO, 10, + "config/udev: ignoring device %s without " + "property ID_INPUT set\n", path); diff --git a/x11-base/xorg-server/xorg-server-1.19.6.ebuild b/x11-base/xorg-server/xorg-server-1.19.6.ebuild index 22e41525..6d816a8f 100644 --- a/x11-base/xorg-server/xorg-server-1.19.6.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.6.ebuild @@ -146,6 +146,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 "${FILESDIR}"/${PN}-1.17.4-arm-musl.patch + # see https://bugs.gentoo.org/646390 + "${FILESDIR}"/${PN}-1.19.6-fix-NULL-value-detection.patch ) pkg_pretend() { |