Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xinit and xdm is fixed builddep.

Browse Source
This commit is contained in:
Ertuğrul Erata
2015-07-15 18:20:16 +03:00
parent a5ddc4e64f
commit f1f07fcac9
34 changed files with 1042 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/misc/xinit/actions.py
+21
View File
@@ -0,0 +1,21 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.autoreconf("-vif")
autotools.configure()
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("COPYING", "ChangeLog")
x11/misc/xinit/files/Xresources
+8
View File
@@ -0,0 +1,8 @@
*customization: -color
Xft.dpi: 96
Xft.antialias: true
Xft.hinting: true
Xft.hintstyle: hintmedium
Xft.rgba: rgb
x11/misc/xinit/files/Xsession
+19
View File
@@ -0,0 +1,19 @@
#!/bin/bash
SESSIONDIR=/etc/X11/Xsession.d
STARTUP=
#TODO Create error file (~/.xsession-errors) here
echo "X session started for $LOGNAME at $(date)"
if [ -d $SESSIONDIR ]; then
for file in $SESSIONDIR/*.sh; do
. $file
done
fi
exec -l $SHELL -c "$STARTUP"
# Control should never reach here
exec -l $SHELL -c "xsm"
x11/misc/xinit/files/Xsession.d/Xresources.sh
+11
View File
@@ -0,0 +1,11 @@
SYSRESOURCES=/etc/X11/Xresources
USERRESOURCES=$HOME/.Xresources
if [ -f $SYSRESOURCES ]; then
xrdb -merge $SYSRESOURCES
fi
if [ -f "$USERRESOURCES" ]; then
xrdb -merge "$USERRESOURCES"
fi
x11/misc/xinit/files/Xsession.d/consolekit.sh
+5
View File
@@ -0,0 +1,5 @@
CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
if [ -x "$CK_LAUNCH_SESSION" -a -z "$XDG_SESSION_COOKIE" ]; then
STARTUP="$CK_LAUNCH_SESSION $STARTUP"
fi
x11/misc/xinit/files/Xsession.d/dbus.sh
+3
View File
@@ -0,0 +1,3 @@
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
eval `/usr/bin/dbus-launch --sh-syntax --exit-with-session`
fi
x11/misc/xinit/files/Xsession.d/environment.sh
+9
View File
@@ -0,0 +1,9 @@
[ -e /etc/profile.env ] && . /etc/profile.env
if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
else
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:${PATH}"
fi
export PATH
unset ROOTPATH
x11/misc/xinit/files/Xsession.d/localuser.sh
+6
View File
@@ -0,0 +1,6 @@
if [ -x /usr/bin/xhost -a -x /usr/bin/id ]; then
xhost +si:localuser:`id -un` > /dev/null
fi
xhost +
x11/misc/xinit/files/Xsession.d/ssh-agent.sh
+5
View File
@@ -0,0 +1,5 @@
SSH_AGENT=/usr/bin/ssh-agent
if [ -x "$SSH_AGENT" -a -z "$SSH_AGENT_PID" ]; then
STARTUP="$SSH_AGENT $STARTUP"
fi
x11/misc/xinit/files/Xsession.d/startup.sh
+42
View File
@@ -0,0 +1,42 @@
DEFAULT_DESKTOP=/etc/default/desktop
USER_XSESSION=$HOME/.xsession
SESSION=$DESKTOP_SESSION
STARTUP=
case $1 in
failsafe)
exec -l $SHELL -c "xterm -geometry 80x24-0-0"
;;
custom)
if [ -x "$USER_XSESSION" ]; then
STARTUP="$USER_XSESSION"
fi
;;
default|"")
test -f $DEFAULT_DESKTOP && . $DEFAULT_DESKTOP
if [ -n $SESSION ]; then
desktop_file="/usr/share/xsessions/$SESSION.desktop"
session_script="/etc/X11/Sessions/$SESSION"
if [ -f "$desktop_file" ]; then
STARTUP=`grep "^Exec=" "$desktop_file" | cut -d= -f 2-`
elif [ -x "$session_script" ]; then
STARTUP="$session_script"
fi
fi
;;
*)
STARTUP="$1"
;;
esac
if [ -z "$STARTUP" ]; then
# If STARTUP is still empty, try user script first.
if [ -x "$USER_XSESSION" ]; then
STARTUP="$USER_XSESSION"
else
STARTUP="xsm"
fi
fi
x11/misc/xinit/files/Xsession.d/xdg-runtime-dir.sh
+11
View File
@@ -0,0 +1,11 @@
if test -z "${XDG_RUNTIME_DIR}"; then
export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
if ! test -d "${XDG_RUNTIME_DIR}"; then
mkdir "${XDG_RUNTIME_DIR}"
chmod 0700 "${XDG_RUNTIME_DIR}"
fi
fi
mkdir -p ~/.config
cp weston/weston.ini ~/.config
$EDITOR ~/.config/weston.ini
x11/misc/xinit/files/Xsession.d/xkb.sh
+4
View File
@@ -0,0 +1,4 @@
USER_XKB=$HOME/.xkb
USER_KEYMAP=$USER_XKB/keymap/default
[ -r $USER_KEYMAP ] && xkbcomp -I$USER_XKB $USER_KEYMAP $DISPLAY
x11/misc/xinit/files/unset-session-cookie.patch
+12
View File
@@ -0,0 +1,12 @@
Index: xinit-1.1.1/startx.cpp
===================================================================
--- xinit-1.1.1.orig/startx.cpp
+++ xinit-1.1.1/startx.cpp
@@ -15,6 +15,7 @@ XCOMM $XFree86: xc/programs/xinit/startx
unset DBUS_SESSION_BUS_ADDRESS
unset SESSION_MANAGER
+unset XDG_SESSION_COOKIE
#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
x11/misc/xinit/files/xinitrc
+3
View File
@@ -0,0 +1,3 @@
#!/bin/bash
. /usr/lib/X11/xinit/Xsession
x11/misc/xinit/pspec.xml
+110
View File
@@ -0,0 +1,110 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xinit</Name>
<Homepage>http://www.x.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>app:console</IsA>
<Summary>X Window System session initializer</Summary>
<Description>xinit initializes X Window System server and runs the first client application.</Description>
<Archive sha1sum="de3469080d73ced1f7d7a1803e813bc6ea352072" type="tarbz2">mirrors://xorg/individual/app/xinit-1.3.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>util-macros</Dependency>
<Dependency>xorg-proto</Dependency>
<Dependency>libX11-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch level="1">xinit-1.0.2-client-session.patch</Patch-->
<Patch level="1">unset-session-cookie.patch</Patch>
</Patches>
</Source>
<Package>
<Name>xinit</Name>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>xorg-app</Dependency>
<Dependency>ConsoleKit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/X11/Xresources</Path>
<Path fileType="config">/etc/X11/xinit/xinitrc</Path>
<Path fileType="data">/etc/X11/Xsession.d</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/lib/X11/xinit</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0755" target="/usr/lib/X11/xinit/Xsession">Xsession</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xinitrc">xinitrc</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xresources" >Xresources</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-localuser.sh">Xsession.d/localuser.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xdg-runtime-dir.sh">Xsession.d/xdg-runtime-dir.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-Xresources.sh">Xsession.d/Xresources.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/10-xkb.sh">Xsession.d/xkb.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/20-startup.sh">Xsession.d/startup.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/25-environment.sh">Xsession.d/environment.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/50-dbus.sh">Xsession.d/dbus.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/90-ssh-agent.sh">Xsession.d/ssh-agent.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/90-consolekit.sh">Xsession.d/consolekit.sh</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="7">
<Date>2015-05-10</Date>
<Version>1.3.4</Version>
<Comment>Version Bump</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-07-28</Date>
<Version>1.3.3</Version>
<Comment>add xdg runtime dir fix localuser dir</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-05-16</Date>
<Version>1.3.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-09-12</Date>
<Version>1.3.3</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-08-25</Date>
<Version>1.3.2</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-08-25</Date>
<Version>1.3.2</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-09-26</Date>
<Version>1.3.2</Version>
<Comment>First release</Comment>
<Name>Erdem Artan</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
x11/misc/xinit/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xinit</Name>
<Summary xml:lang="tr">X Pencere Sistemi oturum hazırlayıcı</Summary>
<Description xml:lang="tr">xinit, X Pencere Sistemi sunucusunu hazırlar ve ilk istemci uygulamayı başlatır.</Description>
</Source>
</PISI>