diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2021-09-20 17:08:32 +0200 |
---|---|---|
committer | TDE Gitea <gitea@mirror.git.trinitydesktop.org> | 2021-09-29 06:38:40 +0000 |
commit | 018f946ee70600993c60a74046f417ca05bdb41b (patch) | |
tree | 37829ad4f8af4005172148ee78ab38b67328cecb /arch/tde-core/tde-tdebase | |
parent | 2bcda9ee7da7582ee0e550a71b9f865cac76dce2 (diff) | |
download | tde-packaging-018f946ee70600993c60a74046f417ca05bdb41b.tar.gz tde-packaging-018f946ee70600993c60a74046f417ca05bdb41b.zip |
ArchLinux: Take a newer state of pkgbuilds from Michael Manley
Clean old long-term not maintained pkgbuilds.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'arch/tde-core/tde-tdebase')
-rw-r--r-- | arch/tde-core/tde-tdebase/PKGBUILD | 182 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/agent-shutdown.sh | 13 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/agent-startup.sh | 19 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/arch-kdeshutdown.png | bin | 0 -> 14505 bytes | |||
-rw-r--r-- | arch/tde-core/tde-tdebase/config_fix.patch | 13 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/kdm-default-face.png | bin | 0 -> 4324 bytes | |||
-rw-r--r-- | arch/tde-core/tde-tdebase/rpcfix.patch | 21 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/stat.patch | 12 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/tdm-trinity | 40 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/tdm.service | 9 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/trinity-tdebase.install | 21 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/trinity.desktop | 8 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/xsession.patch | 28 |
13 files changed, 366 insertions, 0 deletions
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD new file mode 100644 index 000000000..65a175e8b --- /dev/null +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -0,0 +1,182 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname='tde-tdebase' +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment base components" +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/tdebase' +license=('GPL') +provides=('tdebase') +groups=('tde-core') +# depends=('hal' +depends=('libraw1394' + 'libxtst' + 'libxss' + 'lm_sensors' + 'tde-tdelibs' + 'tde-dbus-tqt' + 'tde-dbus-1-tqt' + 'ttf-dejavu' + 'ttf-freefont' + 'xorg-server' + 'xorg-xinit' + 'htdig' + 'openssl-1.0') +makedepends=('autoconf' + 'cmake' + 'imake' + 'pkgconfig' + 'libxkbfile' + 'smbclient' + 'rpcsvc-proto' + 'xorg-bdftopcf' + 'xscreensaver') +optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' + 'pciutils: PCI bus configuration space access library and tools' + 'samba: file sharing over SMB' + 'tde-extra: (meta-package) extra utilities and applications for TDE' + 'tde-multimedia: (meta-package) multimedia applications, k3b, rosegarden, etc..' + 'tde-complete: (meta-package) install all of TDE' + 'tde-avahi-tqt: Trinity Avahi-TQt implementation' + 'tde-libcaldav: A client library adding support for the CalDAV protocol' + 'tde-libcarddav: A client library adding support for the CardDAV protocol' + 'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)' + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'xscreensaver: Screen saver and locker for the X Window System') +confilicts=('trinity-kdebase ''kdemod3-kdebase') +replaces=('trinity-tdebase') +options=('staticlibs' 'libtool' '!strip') +install='trinity-tdebase.install' + +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdebase-R${pkgver}.tar.bz2" + 'arch-kdeshutdown.png' + 'kdm-default-face.png' + 'agent-shutdown.sh' + 'agent-startup.sh' + 'tdm-trinity' + 'trinity.desktop' + 'tdm.service' + 'xsession.patch' + 'stat.patch' + 'rpcfix.patch' + 'config_fix.patch') + +md5sums=('aed6cd45278faa17b9a448b34cbb5127' + '2dac928c6177b9fa0f4e751d7dddc62e' + '81eb97f16b66a2152e592358727a30c7' + '18e8d01124b19f7df2937c06e177bf7f' + 'c963ef6e37c9051119972a58c67f05fb' + 'bb4c25e560fa719e8e8f49ef80bd1c99' + '091f4e1045867bbbc15bf323731aae82' + 'e0ddb96fc86bd081ce691744a68d2f9a' + 'a761787a4d2f917389ced194552addca' + '9ed22bf950f1b8c722aad0078e270774' + '409bccfb0632c4eda71130e744676b9d' + 'b75b47ff872e80ef2853389237665e9f') + +build() { + cd ${srcdir}/${pkgname#*-} + + msg "Patching to use new rpc/rpc.h include path" + patch -p1 -i ${srcdir}/rpcfix.patch + + msg "Patching to not use linux/stat.h" + patch -p1 -i ${srcdir}/stat.patch + + msg "Patching CMakeLists.txt to fix config bug" + patch -p1 -i ${srcdir}/config_fix.patch + + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ../build + cd ../build + + msg "Starting cmake..." + + export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig + + cmake ${srcdir}/tdebase \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DWITH_SASL=ON \ + -DWITH_LDAP=ON \ + -DWITH_SAMBA=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XFIXES=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_XEXT=ON \ + -DWITH_XTEST=ON \ + -DWITH_OPENGL=ON \ + -DWITH_XSCREENSAVER=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBRAW1394=ON \ + -DWITH_PAM=ON \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_ARTS=ON \ + -DWITH_I8K=ON \ + -DWITH_SENSORS=ON \ + -DWITH_HAL=OFF \ + -DWITH_TDEHWLIB=ON \ + -DWITH_UPOWER=ON \ + -DBUILD_ALL=ON \ + -DWITH_GCC_VISIBILITY=ON + + make $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd $srcdir/build + make -j1 DESTDIR="$pkgdir" install + + # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions) + install -d -m755 ${pkgdir}/usr/share/xsessions + install -m755 ${srcdir}/trinity.desktop ${pkgdir}/usr/share/xsessions/trinity.desktop + + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen. + + patch -N ${pkgdir}${TDEDIR}/share/config/tdm/Xsession < ${srcdir}/xsession.patch + + ## we will need systemd service files created + install -D -m644 "${srcdir}"/tdm.service \ + "${pkgdir}"/usr/lib/systemd/system/tdm.service + + # 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/tdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/tdm/pics/users/arch-kdm.png + + # create the starttrinity link + # do we need this? wouldn't be better to rename startkde script + # to starttrinity? (renamed to starttde) Create for compatibility sake. + ln -sf $TDEDIR/bin/starttde ${pkgdir}$TDEDIR/bin/starttrinity + + # install mkpamserv script, so we can auto-generate pam.d configs in post_install() + install -D -m755 ${srcdir}/tdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv + + # 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 +} diff --git a/arch/tde-core/tde-tdebase/agent-shutdown.sh b/arch/tde-core/tde-tdebase/agent-shutdown.sh new file mode 100644 index 000000000..71b056af3 --- /dev/null +++ b/arch/tde-core/tde-tdebase/agent-shutdown.sh @@ -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 diff --git a/arch/tde-core/tde-tdebase/agent-startup.sh b/arch/tde-core/tde-tdebase/agent-startup.sh new file mode 100644 index 000000000..88d1373a1 --- /dev/null +++ b/arch/tde-core/tde-tdebase/agent-startup.sh @@ -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 diff --git a/arch/tde-core/tde-tdebase/arch-kdeshutdown.png b/arch/tde-core/tde-tdebase/arch-kdeshutdown.png Binary files differnew file mode 100644 index 000000000..48a933b81 --- /dev/null +++ b/arch/tde-core/tde-tdebase/arch-kdeshutdown.png diff --git a/arch/tde-core/tde-tdebase/config_fix.patch b/arch/tde-core/tde-tdebase/config_fix.patch new file mode 100644 index 000000000..27b379ff8 --- /dev/null +++ b/arch/tde-core/tde-tdebase/config_fix.patch @@ -0,0 +1,13 @@ +diff -Naur tdebase-orig/tdm/kfrontend/CMakeLists.txt tdebase/tdm/kfrontend/CMakeLists.txt +--- tdebase-orig/tdm/kfrontend/CMakeLists.txt 2018-08-25 10:01:35.000000000 +0000 ++++ tdebase/tdm/kfrontend/CMakeLists.txt 2019-01-30 19:27:06.000000000 +0000 +@@ -48,7 +48,7 @@ + + ##### tdm_config (executable) ################### + +-set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) ++set_property( SOURCE tdm_config.c tdm_greet.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) + + tde_add_executable( tdm_config + SOURCES tdm_config.c + diff --git a/arch/tde-core/tde-tdebase/kdm-default-face.png b/arch/tde-core/tde-tdebase/kdm-default-face.png Binary files differnew file mode 100644 index 000000000..be0fc08df --- /dev/null +++ b/arch/tde-core/tde-tdebase/kdm-default-face.png diff --git a/arch/tde-core/tde-tdebase/rpcfix.patch b/arch/tde-core/tde-tdebase/rpcfix.patch new file mode 100644 index 000000000..58aeb558b --- /dev/null +++ b/arch/tde-core/tde-tdebase/rpcfix.patch @@ -0,0 +1,21 @@ +--- tdebase-orig/CMakeLists.txt 2016-11-06 21:13:18.000000000 -0800 ++++ tdebase/CMakeLists.txt 2018-06-11 20:56:07.988765200 -0700 +@@ -23,6 +23,8 @@ + + ##### include essential cmake modules ########### + ++include_directories( /usr/include/tirpc ) # FIX For ArchLinux ++ + include( FindPkgConfig ) + include( CheckIncludeFile ) + include( CheckIncludeFiles ) +--- tdebase-orig/tdeioslave/nfs/CMakeLists.txt 2016-11-06 21:13:18.000000000 -0800 ++++ tdebase/tdeioslave/nfs/CMakeLists.txt 2018-06-11 21:22:40.661414000 -0700 +@@ -41,6 +41,6 @@ + + tde_add_kpart( ${target} AUTOMOC + SOURCES tdeio_nfs.cpp mount_xdr.c nfs_prot_xdr.c +- LINK tdeio-shared ++ LINK tdeio-shared tirpc + DESTINATION ${PLUGIN_INSTALL_DIR} + ) diff --git a/arch/tde-core/tde-tdebase/stat.patch b/arch/tde-core/tde-tdebase/stat.patch new file mode 100644 index 000000000..c873edd84 --- /dev/null +++ b/arch/tde-core/tde-tdebase/stat.patch @@ -0,0 +1,12 @@ +diff -Naur tdebase-orig/kdesktop/lock/lockprocess.cc tdebase/kdesktop/lock/lockprocess.cc +--- tdebase-orig/kdesktop/lock/lockprocess.cc 2018-08-25 10:01:35.000000000 +0000 ++++ tdebase/kdesktop/lock/lockprocess.cc 2019-01-22 23:24:54.000000000 +0000 +@@ -80,7 +80,7 @@ + #include <kcrash.h> + + #ifdef __linux__ ++//#include <linux/stat.h> +-#include <linux/stat.h> + #endif + #include <pthread.h> + diff --git a/arch/tde-core/tde-tdebase/tdm-trinity b/arch/tde-core/tde-tdebase/tdm-trinity new file mode 100644 index 000000000..9f425b809 --- /dev/null +++ b/arch/tde-core/tde-tdebase/tdm-trinity @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /opt/trinity/bin/tdm` +case "$1" in + start) + #Check for running tdm, start when not running + stat_busy "Starting TDE Desktop Manager (tdm)" + [ -z "$PID" ] && /opt/trinity/bin/tdm &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/tdm.pid + add_daemon tdm-trinity + stat_done + fi + ;; + stop) + stat_busy "Stopping TDE Desktop Manager (tdm)" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon tdm-trinity + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/arch/tde-core/tde-tdebase/tdm.service b/arch/tde-core/tde-tdebase/tdm.service new file mode 100644 index 000000000..181f6cf1d --- /dev/null +++ b/arch/tde-core/tde-tdebase/tdm.service @@ -0,0 +1,9 @@ +[Unit] +Description=TDE Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/opt/trinity/bin/tdm + +[Install] +Alias=display-manager.service diff --git a/arch/tde-core/tde-tdebase/trinity-tdebase.install b/arch/tde-core/tde-tdebase/trinity-tdebase.install new file mode 100644 index 000000000..8bdaa12ef --- /dev/null +++ b/arch/tde-core/tde-tdebase/trinity-tdebase.install @@ -0,0 +1,21 @@ +post_install() { + ldconfig &> /dev/null + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh + [ -x "${TDEDIR}/bin/mkpamserv" ] && "${TDEDIR}/bin/mkpamserv" trinity || \ + echo "Warning: unable to run mkpamserv trinity, you will need to manually confirure pam" + echo "Please remember that you can change your kdesu backend from su to sudo" + echo "by adding following lines to your ~/.tde/share/kdesurc or to the" + echo "$TDEDIR/share/config/kdesurc:" + echo "[super-user-command]" + echo "super-user-command=sudo" +} + +post_upgrade() { + post_install +} + +post_remove() { + ldconfig &> /dev/null + rm /etc/pam.d/trinity +} + diff --git a/arch/tde-core/tde-tdebase/trinity.desktop b/arch/tde-core/tde-tdebase/trinity.desktop new file mode 100644 index 000000000..6594afb2d --- /dev/null +++ b/arch/tde-core/tde-tdebase/trinity.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Exec=/opt/trinity/bin/starttde +TryExec=/opt/trinity/bin/starttde +Name=Trinity +Comment=The Trinity Desktop Environment (TDE). A powerful Open Source graphical desktop environment. + diff --git a/arch/tde-core/tde-tdebase/xsession.patch b/arch/tde-core/tde-tdebase/xsession.patch new file mode 100644 index 000000000..8084fda40 --- /dev/null +++ b/arch/tde-core/tde-tdebase/xsession.patch @@ -0,0 +1,28 @@ +--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100 ++++ /opt/trinity/share/config/tdm/Xsession 2011-09-24 14:52:28.000000000 +0200 +@@ -43,4 +43,24 @@ + ;; + esac + # invoke global X session script +-. /etc/X11/Xsession ++ ++ ++ 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 /opt/trinity/bin/starttde ++ ;; ++ *) ++ eval exec "$session" ++ ;; ++ esac ++ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." ++ |