kdebase: minor fixups, dropped _prefix in favor to TDEDIR

- added things pulled from kdemod3 (agent-{startup,shutdown},arch logo for system shutdown dialog)
	- added mkpamsrv script install
	- added install file
	- added pam.d rules post-install generation
	- pulled minor fixups form kdmod3
	- fixed problem with missin default avatar in kdm
pull/3/head
Pawel "l0ner" Soltys 13 years ago
parent 6764ed9d5c
commit 6ba49b7883

@ -10,11 +10,8 @@ license=('GPL')
groups=('trinity-base') groups=('trinity-base')
pkgdesc="Trinity Desktop Enviroment base components" pkgdesc="Trinity Desktop Enviroment base components"
depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal' depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal'
'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth'
'xorg-iceauth'
'libxtst') 'libxtst')
#'trinity-dbus-1-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1'
# 'libltdl' # 'libltdl'
# 'openexr' # 'openexr'
# 'libxkbfile' # 'libxkbfile'
@ -26,28 +23,43 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
'xorg-fonts-75dpi: X.org 75dpi fonts collection') 'xorg-fonts-75dpi: X.org 75dpi fonts collection')
confilicts=('kdemod3-kdebase') confilicts=('kdemod3-kdebase')
options=('libtool') options=('libtool')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'docpath.patch' 'dbusfix.patch' 'kdm-trinity' 'trinity.desktop' 'Xsession.patch') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
'docpath.patch'
'dbusfix.patch'
'kdm-trinity'
'trinity.desktop'
'Xsession.patch'
'arch-kdeshutdown.png'
'kdm-default-face.png'
'agent-shutdown.sh'
'agent-startup.sh')
md5sums=('d1f7e1f94eeb46b981fe1ba144179840' md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
'fc9cdbe6779bb3860e222dafa744c94e' 'fc9cdbe6779bb3860e222dafa744c94e'
'c9ce810c281002440a6de8cfd8735d07' 'c9ce810c281002440a6de8cfd8735d07'
'376d85d213cf3c04cb0912e5cccd68bd' '376d85d213cf3c04cb0912e5cccd68bd'
'1418e45fea5a9738544cbd264c36373b' '1418e45fea5a9738544cbd264c36373b'
'895f5d7351aa73ba1f57b0ad27081d69') '895f5d7351aa73ba1f57b0ad27081d69'
'bb3004513d703d6b72ce70aa240af3a3'
_prefix="/opt/trinity" 'e6afdd7ca60c4c59b851135785347e75'
'18e8d01124b19f7df2937c06e177bf7f'
'c963ef6e37c9051119972a58c67f05fb')
install='trinity-kdebase.install'
build() { build() {
cd $srcdir cd $srcdir
msg "Setting PATH, CMAKE and Trinity Environment variables" msg "Setting PATH, CMAKE and Trinity Environment variables"
. /etc/profile.d/qt3.sh # Source the QT and TDE profile
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
[ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
export CMAKE_INCLUDE_PATH=${_prefix}/include/dbus-1-tqt/:${_prefix}/include/dbus-1.0/:${_prefix}/include:${_prefix}/include/libkrandr #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < dbusfix.patch patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < dbusfix.patch
# change doc installation path, we need this to build i18n packages.
patch -N -d ${srcdir} -p0 < docpath.patch patch -N -d ${srcdir} -p0 < docpath.patch
msg "Creating out-of-source build directory: ${srcdir}/build" msg "Creating out-of-source build directory: ${srcdir}/build"
@ -56,7 +68,7 @@ build() {
msg "Starting cmake..." msg "Starting cmake..."
cmake ${srcdir}/kdebase --debug-output \ cmake ${srcdir}/kdebase --debug-output \
-DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \ -DQT_VERSION=3 \
-DSYSCONF_INSTALL_DIR=/etc \ -DSYSCONF_INSTALL_DIR=/etc \
@ -86,39 +98,49 @@ package() {
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
# create/install desktop # install X11 session file
install -d -m755 ${pkgdir}/etc/X11/sessions install -d -m755 ${pkgdir}/etc/X11/sessions
# echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop
# echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#echo "Exec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#echo "TryExec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
#chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop
# install desktop
#[[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop"
install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
# set kdm directory # update the Xsession file, this resolves problem with kdm dropping back
#_kdmdir=${_prefix}/share/config/kdm # to the login screen
#[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
# install kdmrc
#[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir}
# update the Xsession file
# [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir}
patch -N ${pkgdir}${_prefix}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
# create the starttrinity link # create the starttrinity link
[[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin # do we need this? wouldn't be better to rename startkde script
cd ${pkgdir}/usr/bin # to starttrinity? Well, whathever.
ln -sf /opt/trinity/bin/startkde starttrinity ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
# iinstall kdm rc.d script # install kdm rc.d script. We need this to start kdm from rc.d
install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
# install mkpamserv script, so we can auto-generate pam.d configs in post_install()
install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
# dbus config file. I don't know if we need this, since directory listed
# in the config file doens't exist. Maybe this should be provided by dbus bindings?
# No, after riconsidering I'm not gonna provide it unless it's required.
# Add image for default user avatar. This removes kdm complains about missing
# default avatar from kdm.log
install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
# Install nice arch logo to use in the shutdown dialog
install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
# add startup/shutdown agents for ssh and gpg-agent
install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh
install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh
# fix kde icons for gnome by creating symlinks
mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
cd ${pkgdir}$TDEDIR/share/icons/gnome/
for i in *; do
cd $i
ln -sf ../../crystalsvg/$i/apps/ apps
cd ..
done
} }

@ -0,0 +1,13 @@
#!/bin/sh
#
# This file is executed at kde shutdown.
# Uncomment the following lines to kill the agents
# that were started at session startup.
if [ "${GPG_AGENT_INFO}" ]; then
kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
fi
#
if [ "${SSH_AGENT_PID}" ]; then
ssh-agent -k
fi

@ -0,0 +1,19 @@
# Agents startup file
#
# This file is sourced at kde startup, so that
# the environment variables set here are available
# throughout the session.
# Uncomment the following lines to start gpg-agent
# and/or ssh-agent at kde startup.
# If you do so, do not forget to uncomment the respective
# lines in KDEDIR/shutdown/agent-shutdown.sh to
# properly kill the agents when the session ends.
if [ -x /usr/bin/gpg-agent ]; then
eval "$(/usr/bin/gpg-agent --daemon)"
fi
#
if [ -x /usr/bin/ssh-agent ]; then
eval "$(/usr/bin/ssh-agent -s)"
fi

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

@ -0,0 +1,14 @@
post_install() {
ldconfig &> /dev/null
mkpamserv trinity
}
post_upgrade() {
post_install
}
post_remove() {
ldconfig &> /dev/null
rm /etc/pam.d/trinity
}
Loading…
Cancel
Save