When trying to emerge xorg-server-9999 from overlay, I have: * GIT update --> * repository: git://anongit.freedesktop.org/git/xorg/xserver * at the commit: d7c98c1c81ae272f66edb05fde20f4c616604add * branch: master * storage directory: "/usr/portage/distfiles/git-src/xorg-server" * Failed Patch: 1.8.0-no-hardcoded-etc.patch ! * ( /var/lib/layman/x11/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch ) That's because the Makefile.am doesn't match anymore the one in the patch: from the live: xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) xorgconfd_DATA = 10-evdev.conf from the patch: -xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) +xorgconfddir = $(sysconfdir)/$(XF86CONFIGDIR) xorgconfd_DATA = 10-evdev.conf Reproducible: Always
BTW, I applied a the following simple patch and emerge tested it, don't know if it's correct: diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index f871089..b7d26a1 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -102,7 +102,6 @@ EPATCH_SUFFIX="patch" PATCHES=( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-disable-acpi.patch - "${FILESDIR}"/1.8.0-no-hardcoded-etc.patch ) pkg_setup() {
Our patch differ from upstream changes and should be adjusted and still applied because their path handling is really weird.
Is this bug still relevant or may we close it ?
(In reply to comment #3) > Is this bug still relevant or may we close it ? > Ran into this bug today - I did the following to 'fix': Edit the patch in the overlay: # nano /usr/local/portage/layman/x11/x11-base/xorg-server/files/1.8.0-no-hardcoded-etc.patch Replace the following line: -xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) With: -xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) Save changes, then run: ebuild /usr/local/portage/layman/x11/x11-base/xorg-server/xorg-server-9999.ebuild digest Then try merging again. Hope this helps anyone
Looks like Tómaš fixed this a couple weeks ago. Closing
