Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 650156 - x11-apps/xinit-1.4.0 Failed Patch: xinit-1.3.4-startx-current-vt.patch
Summary: x11-apps/xinit-1.4.0 Failed Patch: xinit-1.3.4-startx-current-vt.patch
Status: RESOLVED DUPLICATE of bug 650066
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo X packagers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-03-10 23:54 UTC by MrSnivvel
Modified: 2018-03-11 15:22 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
xinit-1.3.4-startx-current-vt.patch.out (xinit-1.3.4-startx-current-vt.patch.out,3.46 KB, text/x-maxima-out)
2018-03-11 04:18 UTC, MrSnivvel
Details
Corrected patch for xinit-1.3.4-startx-current-vt.patch (xinit-1.3.4-startx-current-vt.patch,807 bytes, patch)
2018-03-11 04:48 UTC, MrSnivvel
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description MrSnivvel 2018-03-10 23:54:03 UTC
* Package:    x11-apps/xinit-1.4.0
 * Repository: gentoo
 * Maintainer: x11@gentoo.org
 * USE:        abi_x86_64 amd64 elibc_glibc kernel_linux minimal userland_GNU
 * FEATURES:   preserve-libs sandbox splitdebug userpriv usersandbox
 * Applying xinit-1.3.3-gentoo-customizations.patch ...
 [ ok ]
 * Applying xinit-1.3.4-startx-current-vt.patch ...

 * Failed Patch: xinit-1.3.4-startx-current-vt.patch !
 *  ( /var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/x11-apps/xinit-1.4.0/temp/xinit-1.3.4-startx-current-vt.patch.out

 * ERROR: x11-apps/xinit-1.4.0::gentoo failed (prepare phase):
 *   Failed Patch: xinit-1.3.4-startx-current-vt.patch!
 * 
 * Call stack:
 *     ebuild.sh, line  124:  Called src_prepare
 *   environment, line 2737:  Called xorg-2_src_prepare
 *   environment, line 3640:  Called autotools-utils_src_prepare
 *   environment, line  687:  Called epatch '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.3-gentoo-customizations.patch' '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'
 *   environment, line 1148:  Called epatch '/var/tmp/portage/x11-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'
 *   environment, line 1327:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
Comment 1 MrSnivvel 2018-03-10 23:54:26 UTC
Portage 2.3.24 (python 3.6.4-final-0, default/linux/amd64/17.0/systemd, gcc-7.3.0, glibc-2.26-r6, 4.15.8-gentoo x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-4.15.8-gentoo-x86_64-Intel-R-_Xeon-R-_CPU_X5650_@_2.67GHz-with-gentoo-2.4.1
KiB Mem:    55685484 total,  45682692 free
KiB Swap:    3906556 total,   3906556 free
Timestamp of repository gentoo: Sat, 10 Mar 2018 05:00:01 +0000
Head commit of repository gentoo: 4a0281d5425b04e56df5d9ce2614c46bde1c4771
sh bash 4.4_p19
ld GNU ld (Gentoo 2.29.1 p3) 2.29.1
app-shells/bash:          4.4_p19::gentoo
dev-java/java-config:     2.2.0-r3::gentoo
dev-lang/perl:            5.26.9999::gentoo
dev-lang/python:          2.7.14-r1::gentoo, 3.6.4::gentoo
dev-util/cmake:           3.10.1::gentoo
dev-util/pkgconfig:       0.29.2::gentoo
sys-apps/baselayout:      2.4.1-r2::gentoo
sys-apps/openrc:          0.34.11::gentoo
sys-apps/sandbox:         2.13::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69-r4::gentoo
sys-devel/automake:       1.11.6-r3::gentoo, 1.12.6-r1::gentoo, 1.13.4-r1::gentoo, 1.14.1-r1::gentoo, 1.15.1-r1::gentoo, 1.16-r1::gentoo
sys-devel/binutils:       2.29.1-r1::gentoo, 2.30::gentoo
sys-devel/gcc:            6.4.0::gentoo, 7.2.0::gentoo, 7.3.0::gentoo
sys-devel/gcc-config:     1.9.1::gentoo
sys-devel/libtool:        2.4.6-r4::gentoo
sys-devel/make:           4.2.1-r2::gentoo
sys-kernel/linux-headers: 4.15::gentoo (virtual/os-headers)
sys-libs/glibc:           2.26-r6::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-extra-opts: 
    sync-rsync-verify-metamanifest: no

Local-Grotto
    location: /usr/local/portage
    masters: gentoo
    priority: 0

andy
    location: /var/lib/layman/andy
    masters: gentoo
    priority: 50

cg
    location: /var/lib/layman/cg
    masters: gentoo
    priority: 50

games-overlay
    location: /var/lib/layman/games-overlay
    masters: gentoo
    priority: 50

steam-overlay
    location: /var/lib/layman/steam-overlay
    masters: gentoo
    priority: 50

stuff
    location: /var/lib/layman/stuff
    sync-uri: https://github.com/istitov/stuff.git
    masters: gentoo
    priority: 50

sunrise
    location: /var/lib/layman/sunrise
    masters: gentoo
    priority: 50

x11
    location: /var/lib/layman/x11
    masters: gentoo
    priority: 50

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -mtune=native -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/gnupg/qualified.txt /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php7.0/ext-active/ /etc/php/apache2-php7.1/ext-active/ /etc/php/apache2-php7.2/ext-active/ /etc/php/cgi-php7.0/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/cgi-php7.2/ext-active/ /etc/php/cli-php7.0/ext-active/ /etc/php/cli-php7.1/ext-active/ /etc/php/cli-php7.2/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-march=native -mtune=native -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync multilib-strict news parallel-fetch preserve-libs protect-owned sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://distfiles.gentoo.org"
LANG="en_US.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="en en_US en_us"
MAKEOPTS="-j28"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X account acl aio alsa amd64 ao apache2 archive asio audit aura bash-completion berkdb bzip2 caps cddb cg cgmanager cinder clang cleartype cli client cluster corefonts cpudetection crypt cuda curl custom-cflags custom-optimization cxx d3d9 dbus declarative dhcp-tools dri dri3 drm eds evdev examples extensions extra extraengine faac ffmpeg fontconfig fortran fpm fuse gallium games gbm gcj gd gdbm gegl gimp glamor glance gnome gnome-keyring gnutls gold gphoto2 graphics gstaudio gstreamer gstvideo gtk gtk3 hbci hidpi horizon http humanities icedtea7 iconv inotify introspection ipv6 jabber javascript jemalloc jingle jpeg keystone lame libcaca libcanberra libkms libnotify libsecret llvm-shared-libs logrotate lxc lzma lzo mad md5sum meanwhile metapost mmap mms mmx mmxext modules monitor mp3 mp4 mpeg mtp multilib music mysql mysqli mysqlnd ncat ncurses ndiff networkmanager neutron nftables nls nova nping nptl nsplugin numa nvenc offensive ofx ogg omega omxil opcache opencl openexr opengl openmp opus osmesa pam pcap pcre pdo pgo pipelight pkcs11 playlist pm-utils png postgres postproc prelink projectm pstricks publishers pulseaudio qos qrcode qt5 r600-llvm-compiler readline rfc3779 rtmp s3tc science sctp seccomp secure-delete shout smbtav2 soap sockets source speex sphinx spice ssh ssl staging stats streaming svc swift system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite systemd systemtap sysv-utils tcpd terminal tex4ht texi2html themes theora threads tiff tokudb tools tor-hardening truetype type1 udev udisks unicode usbredir utils uvm uxa vaapi vala vdpau vim-syntax virtualbox visio vorbis vpx vte webp widevine x264 x265 xa xattr xcb xcomposite xetex xinerama xml xmlreader xmlrpc xmlwriter xmpp xorg xpm xrandr xscreensaver xslt xvfb xvmc zenmap zip zlib zsh-completion" ABI_X86="64 32" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_core authn_dbm authn_file authz_core authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir env expires ext_filter file_cache filter headers include info log_config logio mime mime_magic negotiation proxy proxy_balancer proxy_connect proxy_fdpass proxy_fcgi proxy_http proxy_scgi proxy_wstunnel ratelimit rewrite setenvif slotmem_shm socache_shmcb speling status unique_id unixd userdir usertrack vhost_alias" APACHE2_MPMS="event" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" CURL_SSL="openssl" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="emu efi-64 pc" INPUT_DEVICES="libinput keyboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" NGINX_MODULES_HTTP="access auth_basic autoindex browser charset empty_gif fastcgi geo gzip limit_conn limit_req map memcached proxy referer rewrite scgi split_clients ssi upstream_ip_hash userid uwsgi gunzip gzip_static metrics mp4 naxsi security realip stub_status pcre-jit" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-0 php7-1" POSTGRES_TARGETS="postgres9_5" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" QEMU_USER_TARGETS="i386 x86_64" RUBY_TARGETS="ruby22 ruby23" USERLAND="GNU" VIDEO_CARDS="nvidia" XFCE_PLUGINS="brightness clock power trash" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 2 MrSnivvel 2018-03-11 04:18:07 UTC
Created attachment 523394 [details]
xinit-1.3.4-startx-current-vt.patch.out

***** xinit-1.3.4-startx-current-vt.patch *****
PWD: /var/tmp/portage/x11-apps/xinit-1.4.0/work/xinit-1.4.0
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.6
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-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'

===============================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ur a/startx.cpp b/startx.cpp
|--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
|+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
--------------------------
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-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'

===============================================
checking file startx.cpp
Hunk #1 FAILED at 188.
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-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'

===============================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ur a/startx.cpp b/startx.cpp
|--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
|+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
--------------------------
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-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'

===============================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ur a/startx.cpp b/startx.cpp
|--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
|+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
--------------------------
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-apps/xinit-1.4.0/files/xinit-1.3.4-startx-current-vt.patch'

===============================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ur a/startx.cpp b/startx.cpp
|--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
|+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored

patch program exited with status 1
Comment 3 MrSnivvel 2018-03-11 04:48:22 UTC
Created attachment 523400 [details, diff]
Corrected patch for xinit-1.3.4-startx-current-vt.patch

diff --git a/startx.cpp b/startx.cpp
index dbc4cae..63fe2a1 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -200,17 +200,6 @@ XCOMM process server arguments
 if [ x"$server" = x ]; then
     server=$defaultserver
 
-#ifdef __linux__
-    XCOMM When starting the defaultserver start X on the current tty to avoid
-    XCOMM the startx session being seen as inactive:
-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
-    tty=$(tty)
-    if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-        vtarg="vt$tty_num -keeptty"
-    fi
-#endif
-
     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
     if [ x"$serverargs" = x -a x"$display" = x ]; then
 	if [ -f "$userserverrc" ]; then
Comment 4 Mike Gilbert gentoo-dev 2018-03-11 15:22:14 UTC

*** This bug has been marked as a duplicate of bug 650066 ***