diff options
author | Slávek Banko <[email protected]> | 2021-09-20 17:08:32 +0200 |
---|---|---|
committer | TDE Gitea <[email protected]> | 2021-09-29 06:38:40 +0000 |
commit | 018f946ee70600993c60a74046f417ca05bdb41b (patch) | |
tree | 37829ad4f8af4005172148ee78ab38b67328cecb /arch/tde-core | |
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 <[email protected]>
Diffstat (limited to 'arch/tde-core')
29 files changed, 1049 insertions, 0 deletions
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD new file mode 100644 index 000000000..1d3fe5e8f --- /dev/null +++ b/arch/tde-core/tde-arts/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-arts +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity ARTS Sound System and libraries" +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/arts' +license=('GPL') +groups=('tde-core') +depends=('alsa-plugins' + 'alsa-tools' + 'alsa-utils' + 'audiofile' + 'glib2' + 'libmad' + 'libogg' + 'libvorbis' + 'pulseaudio-alsa' + 'tde-tqtinterface') +makedepends=('pkgconfig' 'cmake') +optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma' + 'lame: A high quality MPEG Audio Layer III (MP3) encoder' + 'libmp3splt: Library for splitting mp3 and ogg files without decoding' + 'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files' + 'vorbis-tools: Extra tools for Ogg-Vorbis') +provides=('arts') +conflicts=('kdemod3-arts' 'arts') +replaces=('trinity-arts') +options=('staticlibs' 'libtool' '!emptydirs') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/arts-R${pkgver}.tar.bz2") +md5sums=('2632ad0a5045b24a5f01ed1aebcf2fa8') +install='tde-arts.install' + +build() { + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/dependencies/arts/ \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_GCC_VISIBILITY=ON + + msg "Building $pkgname..." + make $NUMJOBS + +} + +package() { + msg "Packaging - $pkgname-$pkgver" + + cd ${srcdir}/build + make -j1 DESTDIR="$pkgdir" install + +} diff --git a/arch/tde-core/tde-arts/tde-arts.install b/arch/tde-core/tde-arts/tde-arts.install new file mode 100644 index 000000000..30e6e407f --- /dev/null +++ b/arch/tde-core/tde-arts/tde-arts.install @@ -0,0 +1,11 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD new file mode 100644 index 000000000..f2a495316 --- /dev/null +++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-avahi-tqt +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity Avahi-TQt" +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/avahi-tqt' +license=('GPL') +groups=('tde-core') +depends=('tde-tqtinterface' 'avahi' 'nss-mdns') +# nss-mdns should probably move to tdelibs depends +makedepends=('pkgconfig') +provides=('avahi-tqt') +replaces=('trinity-avahi-tqt') +options=('staticlibs' 'libtool' '!strip') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/avahi-tqt-R${pkgver}.tar.bz2") +md5sums=('3b296fb5e6131c14dec4f299b0c9d1d6') + +build() { + cd ${srcdir} + + ## adjust pkgconfig path + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/trinity/tqt3/lib/pkgconfig" + + cd ${srcdir}/dependencies/${pkgname#*-} + + msg "Starting configure..." + ./autogen.sh --prefix=${TDEDIR} \ + --sysconfdir=${TDEDIR}/etc \ + --localstatedir=/var + + msg "Building - $pkgname..." + make $NUMJOBS + +} + +package() { + msg "Packaging - $pkgname" + + cd ${srcdir}/dependencies/${pkgname#*-} + make -j1 DESTDIR="${pkgdir}" install +} diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD new file mode 100644 index 000000000..8d1ddf2f2 --- /dev/null +++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-dbus-1-tqt +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT" +arch=('i686' 'x86_64') +url='http://www.trinitydesktop.org' +license=('GPL') +groups=('tde-core' 'tde-base') +depends=('tde-tqtinterface' 'dbus') +makedepends=('pkgconfig' 'cmake') +provides=('dbus-1-tqt') +conflicts=('trinity-dbus-1-tqt') +replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1') +options=('staticlibs' 'libtool' '!strip') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/dbus-1-tqt-R${pkgver}.tar.bz2") +md5sums=('727b960ac3fbb5bf92d53215e70f58a6') +install='trinity-dbus-1-tqt.install' + +build() { + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/dependencies/${pkgname#*-} \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} + + msg "Building - $pkgname..." + make $NUMJOBS + +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + make -j1 DESTDIR="${pkgdir}" install +} diff --git a/arch/tde-core/tde-dbus-1-tqt/trinity-dbus-1-tqt.install b/arch/tde-core/tde-dbus-1-tqt/trinity-dbus-1-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-dbus-1-tqt/trinity-dbus-1-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD new file mode 100644 index 000000000..a220f162e --- /dev/null +++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-dbus-tqt +pkgver=14.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/dbus-tqt' +license=('GPL') +groups=('tde-core') +pkgdesc="Trinity TQt DBus wrapper" +depends=('tde-arts' 'dbus') +makedepends=('pkgconfig' 'cmake') +provides=('dbus-tqt') +options=('staticlibs' 'libtool' '!strip') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/dbus-tqt-R${pkgver}.tar.bz2") +md5sums=('619e65a35e2e750900f1d10931b6698c') +install='trinity-dbus-tqt.install' + +build() { + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/dependencies/${pkgname#*-} \ + -DCMAKE_INSTALL_PREFIX=$TDEDIR + + msg "Building - $pkgname..." + make $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + make -j1 DESTDIR="${pkgdir}" install +} diff --git a/arch/tde-core/tde-dbus-tqt/trinity-dbus-tqt.install b/arch/tde-core/tde-dbus-tqt/trinity-dbus-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-dbus-tqt/trinity-dbus-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD new file mode 100644 index 000000000..a629b72fb --- /dev/null +++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-libart-lgpl +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity Desktop LGPL'd Component" +arch=('i686' 'x86_64') +url="http://scm.trinitydesktop.org/scm/git/libart-lgpl" +license=('LGPL') +groups=('tde-core') +depends=('tde-tqtinterface') +makedepends=() +optdepends=() +provides=('libart-lgpl') +conflicts=() +replaces=() +options=('staticlibs' 'libtool' '!strip') +install= +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/libart-lgpl-R${pkgver}.tar.bz2") +md5sums=('89ee9f3901fdd8622b24e789638818e6') + +build() { + cd $srcdir/dependencies/${pkgname#*-} + ./configure --prefix=${TDEDIR} + make +} + +package() { + cd $srcdir/dependencies/${pkgname#*-} + make -j1 DESTDIR=$pkgdir install +} 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 <[email protected]> +# 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." ++ diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD new file mode 100644 index 000000000..ef0baea06 --- /dev/null +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -0,0 +1,94 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-tdelibs +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity Desktop core libraries and applications" +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/tdelibs' +license=('GPL') +groups=('tde-core') +depends=('aspell' + 'hspell' + 'jasper' + 'libcups' + 'libidn' + 'libutempter' + 'libxcomposite' + 'libxslt' + 'libxtst' + 'openssl-1.0' + 'openexr' + 'pcre' + 'tde-arts' + 'tde-libart-lgpl' + 'xorg-iceauth' + 'xorg-xmessage' + 'xorg-xprop' + 'xorg-xset' + 'xorg-xsetroot' + 'tde-dbus-1-tqt') +makedepends=('pkgconfig' 'cmake') +provides=('tdelibs') +conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3') +replaces=('trinity-kdelibs' 'trinity-tdelibs') +options=('staticlibs' 'libtool' '!makeflags' '!strip') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdelibs-R${pkgver}.tar.bz2") + +md5sums=('03e4bdd2f36d1f5df1427b731a7c75ae') + +install='trinity-tdelibs.install' + +build() { + cd "${srcdir}/tdelibs" + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p build + cd build + + export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig + + msg "Starting cmake..." + cmake ${srcdir}/tdelibs \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=ON \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=ON \ + -DWITH_AVAHI=ON \ + -DWITH_PAM=ON \ + -DWITH_PCRE=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_TDEHWLIB_DAEMONS=ON \ + -DWITH_UPOWER=ON \ + -DWITH_UDISKS2=ON \ + -DWITH_LZMA=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_ASPELL=ON \ + -DWITH_HSPELL=ON + + msg "Building - $pkgname..." + make $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + make -j1 DESTDIR="$pkgdir" install + msg "Removing conflicting images" + rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop +} diff --git a/arch/tde-core/tde-tdelibs/trinity-tdelibs.install b/arch/tde-core/tde-tdelibs/trinity-tdelibs.install new file mode 100644 index 000000000..e2db661ac --- /dev/null +++ b/arch/tde-core/tde-tdelibs/trinity-tdelibs.install @@ -0,0 +1,11 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD new file mode 100644 index 000000000..db87b201d --- /dev/null +++ b/arch/tde-core/tde-tqca-tls/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-tqca-tls +pkgver=14.0.5 +pkgrel=1 +pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)" +arch=('i686' 'x86_64') +url='http://scm.trinitydesktop.org/scm/git/tqca-tls' +license=('GPL') +groups=('tde-core') +depends=('tde-tqtinterface' 'openssl-1.0') +makedepends=('pkgconfig') +provides=('tqca-tls') +conflicts=('trinity-tqca-tls') +replaces=('trinity-tqca-tls') +options=('staticlibs' 'libtool' '!strip') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/tqca-tls-R${pkgver}.tar.bz2") +md5sums=('21dd2d8680bdfccbbb68616682d5e898') + +build() { + cd ${srcdir}/dependencies/${pkgname#*-} + + msg "Starting configure..." + ./configure --qtdir=${QTDIR} --with-openssl-inc=/usr/include/openssl-1.0 \ + --with-openssl-lib=/usr/lib/openssl-1.0 + + msg "Building - $pkgname..." + make || return 1 +} + +package() { + msg "Packaging - $pkgname" + cd ${srcdir}/dependencies/${pkgname#*-} + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD new file mode 100644 index 000000000..c77c32394 --- /dev/null +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -0,0 +1,188 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgbase=tde-tqt3 +pkgname=("$pkgbase" "${pkgbase}-docs") +pkgver=14.0.5 +pkgrel=1 +pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" +arch=('i686' 'x86_64') +url="http://scm.trinitydesktop.org/scm/git/tqt3" +license=('GPL') +groups=('tde-core') +options=('staticlibs' 'libtool' '!emptydirs' '!strip') +makedepends=('libcups' + 'libiodbc' + 'libxi' + 'postgresql-9.6' + 'mariadb' + 'unixodbc' + 'libmng' + 'xorg-xrandr' + 'libxft') +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/tqt3-R${pkgver}.tar.bz2") +md5sums=('26b4a59e1f2c24807658503e5ed6ab27') + +_prefix="/opt/trinity/tqt3" + +build() { + + cd ${srcdir}/dependencies/tqt3 + + # These are probably arch-specific. They were present in old qt3 + # PKGBULD, they were present in kdemod3 PKGBUILD, they are present + # here. + sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + + ## Fix commits 4412d295 and 18696899 that broke tqca-tls building + # by changing mkspecs/linux-g++-64/qmake.conf to include ../lib64. + # Just change all lib64 paths back to lib since Arch doesn't use lib64 + sed -i 's|lib64|lib|g' mkspecs/linux-g++-64/qmake.conf + + # auto license acceptance + sed -i "s|read acceptance|acceptance=yes|" configure + + msg "Setting enviroment variables..." + export QTDIR="${srcdir}/dependencies/tqt3" + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + + if [ "$CARCH" = "x86_64" ]; then + export ARCH="-64" + else unset ARCH + fi + + # Remove useless to us mkspecs + rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + + msg "Starting configure..." + ./configure \ + -prefix ${_prefix} \ + -sysconfdir /etc/tqt \ + -I/usr/include/mysql \ + -I/usr/include/postgresql/server \ + -I/usr/include/libiodbc \ + -I/usr/include/freetype2 \ + -I/usr/include/tirpc \ + -lpq \ + -lmysqlclient \ + -L/usr/lib/mysql \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -plugin-imgfmt-png \ + -plugin-imgfmt-jpeg \ + -plugin-imgfmt-mng \ + -plugin-sql-mysql \ + -plugin-sql-psql \ + -plugin-sql-sqlite \ + -plugin-sql-odbc \ + -platform linux-g++${ARCH} \ + -no-exceptions \ + -thread \ + -dlopen-opengl \ + -no-ipv6 + + # 64bit fixes pulled from extras/qt3 PKGBUILD + # this is Arch-specific + # fix /opt/qt/lib path + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile + + msg "--- \$CARCH is $CARCH ---" + msg "Building - $pkgbase..." + + cd "${QTDIR}" + + # build rest, but without tutorials and examples + # of you want them, remove sub-tools + make sub-tools + +} + +## split package for tqt3 +package_tde-tqt3() { + pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3 - git version" + depends=('libjpeg-turbo' + 'libmng' + 'libmariadbclient' + 'libpng' + 'libxcursor' + 'libxft' + 'libxinerama' + 'libxmu' + 'libxrandr' + 'mesa' + 'postgresql-9.6') + optdepends=('cups: The CUPS Printing System - for printing support' + 'postgresql-9.6: A sophisticated object-relational DBMS - databse support' + 'unixodbc: ODBC API for linux - databse support' + 'mariadb: A fast SQL database server - databse support') + provides=('qt3' 'tqt3') + replaces=('qt3' 'qt3-enhanced' 'trinity-tqt3') + options=('staticlibs' 'libtool' '!emptydirs' '!strip') + groups=('tde-core') + install='tqt3.install' + + msg "Packaging - $pkgname-$pkgver" + cd "${QTDIR}" + + make INSTALL_ROOT="$pkgdir" install + + ## remove doc as it is now in a split package tde-tqt3-doc + rm -r "${pkgdir}${_prefix}/doc" + + # install link the apps provided by qt3 so we don't collide with + # qt4 and can run them. + + # New links providing old package functionality (however 3rd party packages unlikely to build + # unless updated to use new name references. Can drop this if it doesn't work. + ln -sf "${_prefix}/bin/tqassistant" "${pkgdir}${_prefix}/bin/assistant" + ln -sf "${_prefix}/bin/tqdesigner" "${pkgdir}${_prefix}/bin/designer" + ln -sf "${_prefix}/bin/tqlinguist" "${pkgdir}${_prefix}/bin/linguist" + ln -sf "${_prefix}/bin/tqlrelease" "${pkgdir}${_prefix}/bin/lrelease" + ln -sf "${_prefix}/bin/tqlupdate" "${pkgdir}${_prefix}/bin/lupdate" + ln -sf "${_prefix}/bin/tqmoc" "${pkgdir}${_prefix}/bin/moc" + ln -sf "${_prefix}/bin/tqmake" "${pkgdir}${_prefix}/bin/qmake" + ln -sf "${_prefix}/bin/tqtconfig" "${pkgdir}${_prefix}/bin/qtconfig" + ln -sf "${_prefix}/bin/tquic" "${pkgdir}${_prefix}/bin/uic" + + # Build ld.so.conf file + install -d -m755 "${pkgdir}/etc/ld.so.conf.d/" + echo "${_prefix}/lib" >> "${pkgdir}/etc/ld.so.conf.d/${pkgbase#*-}.conf" + + msg "Cleaning package..." + + # remove any link to the compiled libraries present in + # $srcdir, which won't be present in non-building system. + sed -i "s|-L${srcdir}/${pkgbase#*-}/lib ||g" "${pkgdir}${_prefix}"/lib/*.prl + + # missing include "qglobal.h" in include/qtimer.h fix + sed -i 's/define TQTIMER_H/&\n#include "ntqglobal.h"/' "${pkgdir}${_prefix}/include/ntqtimer.h" +} + +## split package for tqt3 documentation +package_tde-tqt3-docs() { + pkgdesc="TQt3 gui toolkit documentation - based on TDE upstream Qt3 - git version" + provides=('tqt3-docs') + groups=('tde-docs') + + msg "Packaging - $pkgname-$pkgver" + + ## install doc pages which are missed by make install + ## convenient for a split package + install -d -m755 "${pkgdir}${_prefix}/doc/" + cp -r "${QTDIR}/doc" "${pkgdir}${_prefix}" +} diff --git a/arch/tde-core/tde-tqt3/tqt3.install b/arch/tde-core/tde-tqt3/tqt3.install new file mode 100644 index 000000000..03e30fa60 --- /dev/null +++ b/arch/tde-core/tde-tqt3/tqt3.install @@ -0,0 +1,16 @@ +post_install() { + ldconfig &> /dev/null + echo "Note that the tools provided by this package (assistant, designer," + echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been" + echo "renamed to tqt3<toolname> to ensure compatibility with Qt4 and should" + echo "be run through new command scheme." +} + +post_upgrade() { + ldconfig &> /dev/null +} + +post_remove() { + ldconfig &> /dev/null +} + diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD new file mode 100644 index 000000000..8d6534b6e --- /dev/null +++ b/arch/tde-core/tde-tqtinterface/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <[email protected]> +# Contributor: Pawel 'l0ner' Soltys <[email protected]> +# Contributor: Calvin Morrison <[email protected]> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +pkgname=tde-tqtinterface +pkgver=14.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://trinity.pearsoncomputing.net" +license=('GPL2') +groups=('tde-core') +pkgdesc="TQt interface for the TDE desktop" +depends=('tde-tqt3' 'glu') +makedepends=('pkgconfig' 'cmake') +provides=('tqtinterface') +conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface') +replaces=('trinity-tqtinterface') +# makeopts=('libtool' '!emptydirs' '!strip') +options=('staticlibs' 'libtool' '!emptydirs' '!strip') + +source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/dependencies/tqtinterface-R${pkgver}.tar.bz2" + 'tqtpc-location.patch') + +md5sums=('b1d086bbcc0cd62dfbb5833ff0af71a2' + 'c15745c944d98cb7c4cb553f0ca421d4') + +install='trinity-tqtinterface.install' + +_prefix=/usr +_tdedir=/opt/trinity + +build() { + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake "../dependencies/tqtinterface" \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DQT_PREFIX_DIR=${QTDIR} \ + -DQT_INCLUDE_DIR=${QTDIR}/include \ + -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ + -DQT_VERSION=3 + + make $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + make -j1 DESTDIR="${pkgdir}" install + + # Create and install ld.so.conf.d file + install -d -m755 $pkgdir/etc/ld.so.conf.d/ + echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf +} diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch new file mode 100644 index 000000000..f256e925c --- /dev/null +++ b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch @@ -0,0 +1,11 @@ +--- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200 ++++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100 +@@ -35,7 +35,7 @@ + tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) + tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) + tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" ) +-tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" ) ++tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" ) + + + ##### tqtinterface sources ###################### diff --git a/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install b/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-tqtinterface/trinity-tqtinterface.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + |