Created attachment 497712 [details] emerge --info Tried updating this morning and =x11-base/xorg-server-1.19.4 fails to emerge due to a failed patch.... # cat /var/tmp/portage/x11-base/xorg-server-1.19.4/temp/xorg-server-1.18-sysmacros.patch.out ***** xorg-server-1.18-sysmacros.patch ***** PWD: /var/tmp/portage/x11-base/xorg-server-1.19.4/work/xorg-server-1.19.4 PATCH TOOL: patch -> /usr/bin/patch VERSION INFO: GNU patch 2.7.5 Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. Copyright (C) 1988 Larry Wall License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Larry Wall and Paul Eggert ============================================ PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch --dry-run -f < '/var/tmp/portage/x11-base/xorg-server-1.19.4/files/xorg-server-1.18-sysmacros.patch' ============================================ can't find file to patch at input line 24 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> |Date: Sat, 16 Apr 2016 13:04:59 +0200 |Subject: [PATCH] Include sys/sysmacros.h for major(3) |MIME-Version: 1.0 |Content-Type: text/plain; charset=UTF-8 |Content-Transfer-Encoding: 8bit | |GNU major(3) manual page prescribes <sys/types.h>, but that does not work with |sys-libs/glibc-2.23-r1. | |https://bugs.gentoo.org/show_bug.cgi?id=580044 |Signed-off-by: Petr Písař <petr.pisar@atlas.cz> |--- | config/udev.c | 1 + | hw/xfree86/common/xf86Xinput.c | 2 ++ | hw/xfree86/os-support/linux/lnx_init.c | 1 + | 3 files changed, 4 insertions(+) | |diff --git a/config/udev.c b/config/udev.c |index 28c2658..62908f4 100644 |--- a/config/udev.c |+++ b/config/udev.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |index c56a2b9..d33c165 100644 |--- a/hw/xfree86/common/xf86Xinput.c |+++ b/hw/xfree86/common/xf86Xinput.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 49 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c |index 1ed213c..6caf531 100644 |--- a/hw/xfree86/os-support/linux/lnx_init.c |+++ b/hw/xfree86/os-support/linux/lnx_init.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ============================================ PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch --dry-run -f < '/var/tmp/portage/x11-base/xorg-server-1.19.4/files/xorg-server-1.18-sysmacros.patch' ============================================ checking file config/udev.c checking file hw/xfree86/common/xf86Xinput.c Hunk #1 succeeded at 89 with fuzz 1 (offset 3 lines). checking file hw/xfree86/os-support/linux/lnx_init.c Hunk #1 FAILED at 38. 1 out of 1 hunk FAILED patch program exited with status 1 ============================================ PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch --dry-run -f < '/var/tmp/portage/x11-base/xorg-server-1.19.4/files/xorg-server-1.18-sysmacros.patch' ============================================ can't find file to patch at input line 24 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> |Date: Sat, 16 Apr 2016 13:04:59 +0200 |Subject: [PATCH] Include sys/sysmacros.h for major(3) |MIME-Version: 1.0 |Content-Type: text/plain; charset=UTF-8 |Content-Transfer-Encoding: 8bit | |GNU major(3) manual page prescribes <sys/types.h>, but that does not work with |sys-libs/glibc-2.23-r1. | |https://bugs.gentoo.org/show_bug.cgi?id=580044 |Signed-off-by: Petr Písař <petr.pisar@atlas.cz> |--- | config/udev.c | 1 + | hw/xfree86/common/xf86Xinput.c | 2 ++ | hw/xfree86/os-support/linux/lnx_init.c | 1 + | 3 files changed, 4 insertions(+) | |diff --git a/config/udev.c b/config/udev.c |index 28c2658..62908f4 100644 |--- a/config/udev.c |+++ b/config/udev.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |index c56a2b9..d33c165 100644 |--- a/hw/xfree86/common/xf86Xinput.c |+++ b/hw/xfree86/common/xf86Xinput.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 49 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c |index 1ed213c..6caf531 100644 |--- a/hw/xfree86/os-support/linux/lnx_init.c |+++ b/hw/xfree86/os-support/linux/lnx_init.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ============================================ PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch --dry-run -f < '/var/tmp/portage/x11-base/xorg-server-1.19.4/files/xorg-server-1.18-sysmacros.patch' ============================================ can't find file to patch at input line 24 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> |Date: Sat, 16 Apr 2016 13:04:59 +0200 |Subject: [PATCH] Include sys/sysmacros.h for major(3) |MIME-Version: 1.0 |Content-Type: text/plain; charset=UTF-8 |Content-Transfer-Encoding: 8bit | |GNU major(3) manual page prescribes <sys/types.h>, but that does not work with |sys-libs/glibc-2.23-r1. | |https://bugs.gentoo.org/show_bug.cgi?id=580044 |Signed-off-by: Petr Písař <petr.pisar@atlas.cz> |--- | config/udev.c | 1 + | hw/xfree86/common/xf86Xinput.c | 2 ++ | hw/xfree86/os-support/linux/lnx_init.c | 1 + | 3 files changed, 4 insertions(+) | |diff --git a/config/udev.c b/config/udev.c |index 28c2658..62908f4 100644 |--- a/config/udev.c |+++ b/config/udev.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |index c56a2b9..d33c165 100644 |--- a/hw/xfree86/common/xf86Xinput.c |+++ b/hw/xfree86/common/xf86Xinput.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 49 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c |index 1ed213c..6caf531 100644 |--- a/hw/xfree86/os-support/linux/lnx_init.c |+++ b/hw/xfree86/os-support/linux/lnx_init.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1 ============================================ PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch --dry-run -f < '/var/tmp/portage/x11-base/xorg-server-1.19.4/files/xorg-server-1.18-sysmacros.patch' ============================================ can't find file to patch at input line 24 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 |From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@atlas.cz> |Date: Sat, 16 Apr 2016 13:04:59 +0200 |Subject: [PATCH] Include sys/sysmacros.h for major(3) |MIME-Version: 1.0 |Content-Type: text/plain; charset=UTF-8 |Content-Transfer-Encoding: 8bit | |GNU major(3) manual page prescribes <sys/types.h>, but that does not work with |sys-libs/glibc-2.23-r1. | |https://bugs.gentoo.org/show_bug.cgi?id=580044 |Signed-off-by: Petr Písař <petr.pisar@atlas.cz> |--- | config/udev.c | 1 + | hw/xfree86/common/xf86Xinput.c | 2 ++ | hw/xfree86/os-support/linux/lnx_init.c | 1 + | 3 files changed, 4 insertions(+) | |diff --git a/config/udev.c b/config/udev.c |index 28c2658..62908f4 100644 |--- a/config/udev.c |+++ b/config/udev.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 36 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |index c56a2b9..d33c165 100644 |--- a/hw/xfree86/common/xf86Xinput.c |+++ b/hw/xfree86/common/xf86Xinput.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 49 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c |index 1ed213c..6caf531 100644 |--- a/hw/xfree86/os-support/linux/lnx_init.c |+++ b/hw/xfree86/os-support/linux/lnx_init.c -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patch program exited with status 1
Same problem here.
Duplicate of bug #633530 (already fixed).
(In reply to Nikolaj Šujskij from comment #2) > Duplicate of bug #633530 (already fixed). Thanks, I did search before submitting, perhaps a mid-air collision. Just synced and merges fine now. *** This bug has been marked as a duplicate of bug 633530 ***
