From e708abaeed67999c6b46b74f9684f436ad19b3e9 Mon Sep 17 00:00:00 2001 From: sulincix Date: Sun, 5 Feb 2023 20:29:40 +0000 Subject: [PATCH] xinit fix --- dev/python/py3-pygments/ympbuild | 26 +++++++++++++++ dev/util/gtk-doc/ympbuild | 2 +- x11/apps/xinit/Xsession | 55 ++++++++++++++++++++++++++++++++ x11/apps/xinit/xinit.sysconf | 5 +++ x11/apps/xinit/xinitrc | 51 +++++++++++++++++++++++++++++ x11/apps/xinit/xserverrc | 2 ++ x11/apps/xinit/ympbuild | 26 +++++++++++---- 7 files changed, 160 insertions(+), 7 deletions(-) create mode 100644 dev/python/py3-pygments/ympbuild create mode 100644 x11/apps/xinit/Xsession create mode 100644 x11/apps/xinit/xinit.sysconf create mode 100644 x11/apps/xinit/xinitrc create mode 100644 x11/apps/xinit/xserverrc diff --git a/dev/python/py3-pygments/ympbuild b/dev/python/py3-pygments/ympbuild new file mode 100644 index 00000000..cebb3f29 --- /dev/null +++ b/dev/python/py3-pygments/ympbuild @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +name='py3-pygments' +release='1' +version='2.14.0' +url='https://pypi.org/project/Pygments' +description='Pygments is a syntax highlighting package written in Python.' +email='aliriza.keskin@pardus.org.tr' +maintainer='aliriza' +license=('GPLv3') +source=('https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71/Pygments-2.14.0.tar.gz') +depends=(python) +makedepends=() +md5sums=('447be4afb076c8325a7dc659aff5b931') +group=(dev.python) +uses=() +arch=('x86_64') + +cd Pygments-$version + +build(){ + python3 setup.py build +} + +package(){ + python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build +} diff --git a/dev/util/gtk-doc/ympbuild b/dev/util/gtk-doc/ympbuild index 35da66c9..cbabaf88 100644 --- a/dev/util/gtk-doc/ympbuild +++ b/dev/util/gtk-doc/ympbuild @@ -8,7 +8,7 @@ email='bayramk@gmail.com' maintainer='bk' license=('GPLv3') source=("https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/1.33.2/gtk-doc-$version.tar.gz") -depends=(itstool) +depends=(itstool py3-pygments) makedepends=() md5sums=('9d1196925cb053fba6b5559a8a6e22be') group=(dev.util) diff --git a/x11/apps/xinit/Xsession b/x11/apps/xinit/Xsession new file mode 100644 index 00000000..6b9403fd --- /dev/null +++ b/x11/apps/xinit/Xsession @@ -0,0 +1,55 @@ +#!/bin/sh +# +# X session wrapper + +echo "Running X session wrapper" + +# Load profile +for file in /etc/profile "$HOME/.profile" /etc/xprofile "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + +# Load resources +for file in /etc/X11/Xresources "$HOME/.Xresources"; do + if [ -f "$file" ]; then + echo "Loading resource: $file" + xrdb -nocpp -merge "$file" + fi +done + +# Load keymaps +use_xkbmap=false +for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do + if [ -f "$file" ]; then + echo "Loading keymap: $file" + setxkbmap `cat "$file"` && use_xkbmap=true + fi +done + +# Load xmodmap if not using XKB +if ! $use_xkbmap; then + for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do + if [ -f "$file" ]; then + echo "Loading modmap: $file" + xmodmap "$file" + fi + done +fi + +# Run all system xinitrc shell scripts. +xinitdir="/etc/X11/xinit/xinitrc.d" +if [ -d "$xinitdir" ]; then + for script in $xinitdir/*; do + echo "Loading xinit script $script" + if [ -x "$script" -a ! -d "$script" ]; then + . "$script" + fi + done +fi + +echo "X session wrapper complete, running session $@" + +exec $@ diff --git a/x11/apps/xinit/xinit.sysconf b/x11/apps/xinit/xinit.sysconf new file mode 100644 index 00000000..46180e00 --- /dev/null +++ b/x11/apps/xinit/xinit.sysconf @@ -0,0 +1,5 @@ +#!/bin/sh +if [ -f /var/lib/ymp/sysconf/xinit/postinstall.done ] ; then + mkdir -p /etc/X11/xinit/xinitrc.d /etc/skel/ + touch /var/lib/ymp/sysconf/xinit/postinstall.done +fi \ No newline at end of file diff --git a/x11/apps/xinit/xinitrc b/x11/apps/xinit/xinitrc new file mode 100644 index 00000000..0c4f8944 --- /dev/null +++ b/x11/apps/xinit/xinitrc @@ -0,0 +1,51 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +xinitdir=/etc/X11 +sysresources=$xinitdir/Xresources +sysmodmap=$xinitdir/Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# First try ~/.xinitrc +if [ -f "$HOME/.xinitrc" ]; then + XINITRC="$HOME/.xinitrc" + if [ -x $XINITRC ]; then + # if the x bit is set on .xinitrc + # it means the xinitrc is not a + # shell script but something else + exec $XINITRC "$@" + else + exec /bin/sh "$HOME/.xinitrc" "$@" + fi +fi + +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?* ; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +for p in startxfce4 startfluxbox xfce4-terminal \ + mrxvt urxvt st xterm; do + command -v "$p" >/dev/null && exec "$p" +done diff --git a/x11/apps/xinit/xserverrc b/x11/apps/xinit/xserverrc new file mode 100644 index 00000000..b4de2528 --- /dev/null +++ b/x11/apps/xinit/xserverrc @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/X -nolisten tcp "$@" diff --git a/x11/apps/xinit/ympbuild b/x11/apps/xinit/ympbuild index a2b734bb..6feb2729 100644 --- a/x11/apps/xinit/ympbuild +++ b/x11/apps/xinit/ympbuild @@ -7,10 +7,19 @@ description='X Window System initializer xinit' email='bayramk@gmail.com' maintainer='bk' license=('GPLv3') -source=("https://gitlab.freedesktop.org/xorg/app/xinit/-/archive/xinit-$version/xinit-xinit-1.4.2.tar.gz") +source=("https://gitlab.freedesktop.org/xorg/app/xinit/-/archive/xinit-$version/xinit-xinit-1.4.2.tar.gz" + "xinitrc" + "xserverrc" + "Xsession" + "xinit.sysconf" +) depends=(xorg-macros xorgproto libX11) makedepends=() -md5sums=('0855364c1c869679300d55e9dd57e2aa') +md5sums=('0855364c1c869679300d55e9dd57e2aa' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') group=(x11.apps) uses=() arch=('x86_64') @@ -18,16 +27,21 @@ arch=('x86_64') cd $name-$name-$version setup(){ - ./autogen.sh + autoreconf -vfi ./configure --prefix=/usr \ - --libdir=/usr/lib64/ + --libdir=/usr/lib64/ \ + -sysconfdir=/etc } build(){ - make -j`nproc` + make $jobs } package(){ - make install -j`nproc` + make install $jobs + install -m755 -D ../xinitrc "$DESTDIR"/etc/X11/xinit/xinitrc + install -m755 -D ../Xsession "$DESTDIR"/etc/X11/xinit/Xsession + install -m755 ../xserverrc "$DESTDIR"/etc/X11/xinit/xserverrc + install -m755 -D ../xinit.sysconf "$DESTDIR"/etc/sysconf.d/xinit }