SlavekB
/
tde-packaging-slackware
mirror of https://github.com/Ray-V/tde-slackbuilds.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed tqca-tls patch, updated tdebase.SlackBuild for /usr

Browse Source
pull/25/head
Ray-V 6 years ago
parent 9fe3e836bc
commit a520925753
8 changed files with 46 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
Core/tdebase/config/Xsession
Unescape View File

@ -78,7 +78,7 @@ case $session in
exec $HOME/.xsession
;;
default)
exec ${INSTALL_TDE}/bin/starttde
exec $INSTALL_TDE/bin/starttde
;;
*)
eval exec "$session"

14
Core/tdebase/doinst.sh
Unescape View File

@ -28,28 +28,28 @@ config etc/trinity/tdm/backgroundrc.new
# Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
chroot . /usr/bin/update-desktop-database $INSTALL_TDE/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 ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/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 ${INSTALL_TDE}/share/mime >/dev/null 2>&1
chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
fi
# update PATH
# upgradepkg runs this twice, so even though $TQTDIR/bin will be
# a new PATH, it needs to be tested for the second run
if ! grep ${INSTALL_TDE}/bin /etc/profile
if ! grep $INSTALL_TDE/bin /etc/profile
then
echo "PATH=\$PATH:${INSTALL_TDE}/bin:$TQTDIR/bin" >> /etc/profile
echo "PATH=\$PATH:$INSTALL_TDE/bin:$TQTDIR/bin" >> /etc/profile
else
if ! grep $TQTDIR/bin /etc/profile
then
@ -59,9 +59,9 @@ fi
# update MANPATH
if ! grep ${INSTALL_TDE}/man /etc/profile
if ! grep $INSTALL_TDE/man /etc/profile
then
echo "export MANPATH=\$MANPATH:${INSTALL_TDE}/man" >> /etc/profile
echo "export MANPATH=\$MANPATH:$INSTALL_TDE/man" >> /etc/profile
fi

4
Core/tdebase/profile.d/tde.csh
Unescape View File

@ -1,10 +1,10 @@
#!/bin/csh
# TDE additions:
if ( ! $?TDEDIR ) then
setenv TDEDIR ${INSTALL_TDE}
setenv TDEDIR $INSTALL_TDE
endif
if ( $?XDG_CONFIG_DIRS ) then
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/trinity/xdg
setenv XDG_CONFIG_DIRS $XDG_CONFIG_DIRS:/etc/trinity/xdg
else
setenv XDG_CONFIG_DIRS /etc/xdg:/etc/trinity/xdg
endif

2
Core/tdebase/profile.d/tde.sh
Unescape View File

@ -1,6 +1,6 @@
#!/bin/sh
# TDE additions:
TDEDIR=${INSTALL_TDE}
TDEDIR=$INSTALL_TDE
export TDEDIR
if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/trinity/xdg

4
Core/tdebase/rc.4.local
Unescape View File

@ -1,9 +1,9 @@
#! /bin/sh
# Start TDM:
if [ -x ${INSTALL_TDE}/bin/tdm ]; then
if [ -x $INSTALL_TDE/bin/tdm ]; then
echo "Using TDM (Trinity Login Manager)."
echo
# log_cleanup "/var/log/tdm.log"
exec ${INSTALL_TDE}/bin/tdm -nodaemon -error /var/log/tdm.log
exec $INSTALL_TDE/bin/tdm -nodaemon -error /var/log/tdm.log
fi

62
Core/tdebase/tdebase.SlackBuild
Unescape View File

@ -44,17 +44,17 @@ chown_fn
cd_builddir_fn
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=${COMPILER} \
-DCMAKE_CXX_COMPILER=${COMPILER_CXX} \
-DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \
-DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
-DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \
-DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \
-DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_OPENEXR="ON" \
-DWITH_XCOMPOSITE="ON" \
-DWITH_XCURSOR="ON" \
@ -87,50 +87,50 @@ strip_fn
# Add xinitrc:
mkdir -p $PKG/etc/X11/xinit
sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" < $SRCDIR/xinitrc.tde > $PKG/etc/X11/xinit/xinitrc.tde
sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/xinitrc.tde > $PKG/etc/X11/xinit/xinitrc.tde
chmod 755 $PKG/etc/X11/xinit/xinitrc.tde
(cd $PKG/etc/X11/xinit/
ln -sf xinitrc.tde xinitrc)
mkdir -p $PKG/etc/profile.d
sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" < $SRCDIR/profile.d/tde.sh > $PKG/etc/profile.d/tde.sh
sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" < $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh
sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/profile.d/tde.sh > $PKG/etc/profile.d/tde.sh
sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh
chmod 755 $PKG/etc/profile.d/tde.{,c}sh
# Add some configuration files / scripts needed by TDE.
mkdir -p ${PKG}/etc/trinity
mv ${PKG}/${INSTALL_TDE}/share/config/tdm ${PKG}/etc/trinity/tdm
( cd ${PKG}/${INSTALL_TDE}/share/config ; ln -sf /etc/trinity/tdm tdm )
mkdir -p $PKG/etc/trinity
mv $PKG/$INSTALL_TDE/share/config/tdm $PKG/etc/trinity/tdm
( cd $PKG/$INSTALL_TDE/share/config ; ln -sf /etc/trinity/tdm tdm )
# Add rc.4.local to give TDM priority over rc.4 X11 session manager options
# Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option
mkdir ${PKG}/etc/rc.d
sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.local
mkdir $PKG/etc/rc.d
sed "s|\$INSTALL_TDE|$INSTALL_TDE|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.local
chmod 755 $PKG/etc/rc.d/rc.4.local
# Set sane permissions for the include files.
if [ -d ${PKG}/${INSTALL_TDE}/include ]; then
find ${PKG}/${INSTALL_TDE}/include -type f -exec chmod 0644 {} \;
if [ -d $PKG/$INSTALL_TDE/include ]; then
find $PKG/$INSTALL_TDE/include -type f -exec chmod 0644 {} \;
fi
# Ensure correct login manager session file is available.
mkdir -p ${PKG}/usr/share/apps/tdm/sessions
cp ${PKG}/${INSTALL_TDE}/share/apps/tdm/sessions/tde.desktop ${PKG}/usr/share/apps/tdm/sessions/
mkdir -p $PKG/usr/share/apps/tdm/sessions
cp $PKG/$INSTALL_TDE/share/apps/tdm/sessions/tde.desktop $PKG/usr/share/apps/tdm/sessions/ || true
# Setup config files for TDM:
${PKG}/${INSTALL_TDE}/bin/gentdmconf --no-old --no-old-scripts --no-backup --in ${PKG}/etc/trinity/tdm
$PKG/$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG/etc/trinity/tdm
## set correct paths for config files
sed -i 's|/opt/trinity/share/config/tdm/|/etc/trinity/tdm/|' ${PKG}/etc/trinity/tdm/tdmrc
sed -i 's|/opt/trinity/share/config/tdm/|/etc/trinity/tdm/|' $PKG/etc/trinity/tdm/tdmrc
# Allow root to login
sed 's|AllowRootLogin=false|AllowRootLogin=true|' ${PKG}/etc/trinity/tdm/tdmrc > ${PKG}/etc/trinity/tdm/tdmrc.new
sed 's|AllowRootLogin=false|AllowRootLogin=true|' $PKG/etc/trinity/tdm/tdmrc > $PKG/etc/trinity/tdm/tdmrc.new
## Remove tdmrc which has AllowRootLogin=false set and would be used for a new installation
## The installed tdmrc will be created by doinst.sh from tdmrc.new if it doesn't exist
rm ${PKG}/etc/trinity/tdm/tdmrc
mv ${PKG}/etc/trinity/tdm/Xsession ${PKG}/etc/trinity/tdm/Xsession.orig
cat ${SRCDIR}/config/Xsession | sed "s|\${INSTALL_TDE}|${INSTALL_TDE}|" > ${PKG}/etc/trinity/tdm/Xsession
mv ${PKG}/etc/trinity/tdm/backgroundrc ${PKG}/etc/trinity/tdm/backgroundrc.new
if [[ -r ${PKG}/${INSTALL_TDE}/etc/trinity/tdm/README ]]; then
sed -i "s|${TMP}/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" ${PKG}/${INSTALL_TDE}/etc/trinity/tdm/README
rm $PKG/etc/trinity/tdm/tdmrc
mv $PKG/etc/trinity/tdm/Xsession $PKG/etc/trinity/tdm/Xsession.orig
cat $SRCDIR/config/Xsession | sed "s|\$INSTALL_TDE|$INSTALL_TDE|" > $PKG/etc/trinity/tdm/Xsession
mv $PKG/etc/trinity/tdm/backgroundrc $PKG/etc/trinity/tdm/backgroundrc.new
if [[ -r $PKG/$INSTALL_TDE/etc/trinity/tdm/README ]]; then
sed -i "s|$TMP/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" $PKG/$INSTALL_TDE/etc/trinity/tdm/README
fi
mkdir_install_fn
@ -157,7 +157,7 @@ $PRGNAM:
$PRGNAM: Home: https://www.trinitydesktop.org/index.php
" > $PKG/install/slack-desc
sed -e "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" -e "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh
sed -e "s|\$INSTALL_TDE|$INSTALL_TDE|g" -e "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh
[[ $RUNLEVEL == 4 ]] && {
echo "
## set default runlevel to 4 for tdm

4
Core/tdebase/xinitrc.tde
Unescape View File

@ -22,8 +22,8 @@ if [ -f $usermodmap ]; then
fi
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
exec ck-launch-session dbus-launch --exit-with-session ${INSTALL_TDE}/bin/starttde
exec ck-launch-session dbus-launch --exit-with-session $INSTALL_TDE/bin/starttde
else
exec dbus-launch --exit-with-session ${INSTALL_TDE}/bin/starttde
exec dbus-launch --exit-with-session $INSTALL_TDE/bin/starttde
fi

17
Deps/tqca-tls/tqca-tls.SlackBuild
Unescape View File

@ -51,23 +51,6 @@ CFLAGS=$SLKCFLAGS \
## it may pick up the wrong march/mtune flags, or none at all - use SET_march as set up in BUILD-TDE.sh
sed -i "s|-march=.*-mtune=[a-z,0-9,-]*||;s|fvisibility-inlines-hidden|& $SET_march|" Makefile
## allow building with clang
echo $'
--- Makefile
+++ Makefile
@@ -12,2 +12,2 @@
-CC = gcc
-CXX = g++
+CC = $(COMPILER)
+CXX = $(COMPILER_CXX)
@@ -21 +21 @@
-LINK = g++
+LINK = $(COMPILER_CXX)
' | while read line
do
patch -p0
done
make $NUMJOBS || exit 1
mkdir -p $PKG$TQTDIR-$VERSION/plugins/crypto/

Write Preview
Loading…
Cancel
Save