pull/1/head
Thorn Inurcide 9 years ago
parent 0e38106ffd
commit 9c8f85a00a

@ -0,0 +1,87 @@
#! /bin/sh
# Xsession - run as user
# Merged in parts of the old Xsession to load defaults from
# Xresources and Xmodmap files, 2006-02-09 volkerdi
session=$1
# This section is borrowed from the old X11 Xsession file:
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
sysresources=/usr/lib/X11/xinit/.Xresources
sysmodmap=/usr/lib/X11/xinit/.Xmodmap
# merge in defaults and keymaps
if [ -r $sysresources ]; then
/usr/bin/xrdb -merge $sysresources
fi
if [ -r $sysmodmap ]; then
/usr/bin/xmodmap $sysmodmap
fi
if [ -r $userresources ]; then
/usr/bin/xrdb -merge $userresources
fi
if [ -r $usermodmap ]; then
/usr/bin/xmodmap $usermodmap
fi
# Note that the respective logout scripts are not sourced.
case $SHELL in
*/bash)
[ -z "$BASH" ] && exec $SHELL $0 "$@"
set +o posix
[ -f /etc/profile ] && . /etc/profile
if [ -f $HOME/.bash_profile ]; then
. $HOME/.bash_profile
elif [ -f $HOME/.bash_login ]; then
. $HOME/.bash_login
elif [ -f $HOME/.profile ]; then
. $HOME/.profile
fi
;;
*/zsh)
[ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
emulate -R zsh
[ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
zhome=${ZDOTDIR:-$HOME}
# zshenv is always sourced automatically.
[ -f $zdir/zprofile ] && . $zdir/zprofile
[ -f $zhome/.zprofile ] && . $zhome/.zprofile
[ -f $zdir/zlogin ] && . $zdir/zlogin
[ -f $zhome/.zlogin ] && . $zhome/.zlogin
;;
*/csh|*/tcsh)
# [t]cshrc is always sourced automatically.
# Note that sourcing csh.login after .cshrc is non-standard.
xsess_tmp=`mktemp`
$SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export >! $xsess_tmp"
. $xsess_tmp
rm -f $xsess_tmp
;;
*) # Plain sh, ksh, and anything we don't know.
[ -f /etc/profile ] && . /etc/profile
[ -f $HOME/.profile ] && . $HOME/.profile
;;
esac
[ -f /etc/xprofile ] && . /etc/xprofile
[ -f $HOME/.xprofile ] && . $HOME/.xprofile
case $session in
"")
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
;;
failsafe)
exec xterm -geometry 80x24-0-0
;;
custom)
exec $HOME/.xsession
;;
default)
exec /usr/bin/startkde
;;
*)
eval exec "$session"
;;
esac
exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."

@ -0,0 +1,18 @@
[Desktop0]
BackgroundMode=Flat
BlendBalance=100
BlendMode=NoBlending
ChangeInterval=60
Color1=0,0,200
Color2=192,192,192
CurrentWallpaper=0
LastChange=0
MinOptimizationDepth=1
MultiWallpaperMode=NoMulti
Pattern=fish
Program=
ReverseBlending=false
UseSHM=false
Wallpaper=default_blue.jpg
WallpaperList=
WallpaperMode=Scaled

@ -0,0 +1,44 @@
# Save old config files:
if [ ! -L etc/X11/tdm ]; then
if [ -d etc/X11/tdm ]; then
mkdir -p etc/tde/tdm
cp -a etc/X11/tdm/* etc/tde/tdm
rm -rf etc/X11/tdm
( cd etc/X11 ; ln -sf /etc/tde/tdm tdm )
fi
elif [ ! -e etc/X11/tdm ]; then
mkdir -p etc/X11
( cd etc/X11 ; ln -sf /etc/tde/tdm tdm )
fi
#!/bin/sh
config() {
NEW="$1"
OLD="`dirname $NEW`/`basename $NEW .new`"
# If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
rm $NEW
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
config etc/tde/tdm/tdmrc.new
config etc/tde/tdm/backgroundrc.new
# Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
fi
# Update hicolor theme cache:
if [ -d usr/share/icons/hicolor ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
fi
fi
# Update the mime database:
if [ -x usr/bin/update-mime-database ]; then
chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi

@ -182,28 +182,6 @@ cd build-${PRGNAM}
make DESTDIR=$PKG install || exit 1 make DESTDIR=$PKG install || exit 1
cd - cd -
# Add this to the doinst.sh:
mkdir -p $PKG/install
cat <<EOINS >> $PKG/install/doinst.sh
# Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
fi
# Update hicolor theme cache:
if [ -d usr/share/icons/hicolor ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
fi
fi
# Update the mime database:
if [ -x usr/bin/update-mime-database ]; then
chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
EOINS
# Move the TDM files someplace FHS compliant: # Move the TDM files someplace FHS compliant:
mkdir -p $PKG/etc/tde mkdir -p $PKG/etc/tde
mv $PKG/usr/share/config/tdm $PKG/etc/tde mv $PKG/usr/share/config/tdm $PKG/etc/tde
@ -228,8 +206,20 @@ cat $SRCDIR/profile.d/tde.sh > $PKG/etc/profile.d/tde.sh
cat $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh cat $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh
chmod 755 $PKG/etc/profile.d/tde.sh $PKG/etc/profile.d/tde.csh chmod 755 $PKG/etc/profile.d/tde.sh $PKG/etc/profile.d/tde.csh
# Setup config files for TDM:
$PKG/usr/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/tdm
# Not allowing root to login at the console is just plain silly. If they have physical access to
# the machine, what's the point of trying to stop this? Even the tdmrc file says this is supposed
# to be the default.
cat $PKG/usr/share/config/tdm/tdmrc | perl -pi -e 's|AllowRootLogin=false|AllowRootLogin=true|' > $PKG/usr/share/config/tdm/tdmrc.new
rm -f $PKG/usr/share/config/tdm/tdmrc
cp -a $PKG/usr/share/config/tdm/Xsession $PKG/usr/share/config/tdm/Xsession.orig
cat $SRCDIR/config/Xsession > $PKG/usr/share/config/tdm/Xsession
mv $PKG/usr/share/config/tdm/backgroundrc $PKG/usr/share/config/tdm/backgroundrc.new
mkdir -p $PKG/install mkdir -p $PKG/install
cat $SRCDIR/slack-desc > $PKG/install/slack-desc cat $SRCDIR/slack-desc > $PKG/install/slack-desc
cat $SRCDIR/doinst.sh > $PKG/install/doinst.sh
cd $PKG cd $PKG
makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}

@ -1,9 +1,6 @@
1. After the first time you reboot after using TDE, you should open xwmconfig and reselect it. Your computer might freeze Not all mimetypes are detected. Files without extensions and things like slack-desc
otherwise =[ << though this may just be isolated to my computer (It hates GNU/Linux) D= have no default assosiations.
Anyone know fix? Besides just manually doing this in the settings after installing.
2. I briefly tried tdm and it wouldn't start any desktop environment. I mainly use runlevel 3 so I won't be looking into
this =[
3. If you are multilib pass ARCH=x86_64 to the build-*.sh scripts. Should compile on Multilib now
THE BUG REPORTS FOR EVERYTHING IF YOU'RE INTERESTED
https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL

@ -1,12 +1,12 @@
THIS WILL MOST LIKELY INTERFERE WITH KDE THIS WILL MOST LIKELY INTERFERE WITH KDE
The build order is listed in each folder. Build the 3rdparty-deps first, then Deps,
then the Core.
3rdparty-deps are required with how I have these built. You can view the very short list 3rdparty-deps are required with how I have these built. You can view the very short list
in the folder and get them from SBo for now. Well krb5 you can probably do without. in the folder and get them from SBo for now. Well krb5 you can probably do without.
Maybe avahi as well if you feel like editing the build scripts. Maybe avahi as well if you feel like editing the build scripts.
The build order is listed in each folder. Build the 3rdparty-deps first, then Deps,
then the Core.
Has build scripts that automate the build process Has build scripts that automate the build process
I'm running Slackware Current. So these are untested on Stable. I'm running Slackware Current. So these are untested on Stable.

Loading…
Cancel
Save