Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemdbump.git;a=commitdiff;h=60a96851282d52e1b1070cdce555d3bac7203cf5
commit 60a96851282d52e1b1070cdce555d3bac7203cf5 Author: DeX77 <[email protected]> Date: Sun Nov 1 11:53:15 2015 +0100 xinit-1.3.4-2-x86_64 * enable xinitrc file diff --git a/source/x11/xinit/FrugalBuild b/source/x11/xinit/FrugalBuild index ae66595..3697321 100644 --- a/source/x11/xinit/FrugalBuild +++ b/source/x11/xinit/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xinit pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="X Window System initializer" url="http://xorg.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-apps') @@ -11,12 +11,18 @@ archs=('i686' 'x86_64' 'arm') depends=('xterm>=243' 'libx11>=1.2.1' 'twm>=1.0.4' 'xclock>=1.0.3-2') makedepends=('inputproto>=2.0') Finclude xorg -sha1sums=('de3469080d73ced1f7d7a1803e813bc6ea352072') +source=("${source[@]}" \ + dbus_unset.patch \ + fix_ipv6_localhost.patch ) +sha1sums=('de3469080d73ced1f7d7a1803e813bc6ea352072' \ + '7c45a0869851f994cb80b57df2f0b454dff82b6c' \ + '85c144a24137b43163655bdb840e8c2e834298c3') build() { + Fcd + Fsed 'XSLASHGLOB.sh' 'XSLASHGLOB' xinitrc.cpp Fbuild - Fmv /etc/X11/xinit/xinitrc{,.twm} - chmod +x $Fdestdir/etc/X11/xinit/xinitrc.twm || Fdie + Ffileschmod etc/X11/xinit/xinitrc +x } # optimization OK diff --git a/source/x11/xinit/dbus_unset.patch b/source/x11/xinit/dbus_unset.patch new file mode 100644 index 0000000..91f2d70 --- /dev/null +++ b/source/x11/xinit/dbus_unset.patch @@ -0,0 +1,11 @@ +diff -u -r xinit-1.3.4/startx.cpp xinit-1.3.4-dbus/startx.cpp +--- xinit-1.3.4/startx.cpp 2015-09-21 17:07:29.732240308 +0200 ++++ xinit-1.3.4-dbus/startx.cpp 2015-09-21 17:07:59.255424644 +0200 +@@ -11,7 +11,6 @@ + XCOMM Site administrators are STRONGLY urged to write nicer versions. + XCOMM + +-unset DBUS_SESSION_BUS_ADDRESS + unset SESSION_MANAGER + + #ifdef __APPLE__ diff --git a/source/x11/xinit/fix_ipv6_localhost.patch b/source/x11/xinit/fix_ipv6_localhost.patch new file mode 100644 index 0000000..4596122 --- /dev/null +++ b/source/x11/xinit/fix_ipv6_localhost.patch @@ -0,0 +1,16 @@ +Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx +diff -u xinit.orig/startx.cpp xinit/startx.cpp +--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400 ++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400 +@@ -290,9 +290,9 @@ + XCOMM now add the same credentials to the client authority file + XCOMM if '$displayname' already exists do not overwrite it as another + XCOMM server man need it. Add them to the '$xserverauthfile' instead. +- for displayname in $authdisplay $hostname$authdisplay; do ++ for displayname in $authdisplay $hostname/unix$authdisplay; do + authcookie=`XAUTH list "$displayname" @@ +- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; ++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null; + if [ "z${authcookie}" = "z" ] ; then + XAUTH -q << EOF + add $displayname . $mcookie _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
