Various requested fixes

pull/53/head
E. Liddell 4 years ago committed by Chris
parent 1261b037e9
commit d4bfee7720

@ -1,4 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -48,7 +49,7 @@ TQTBASE="/usr/tqt3"
S="${WORKDIR}/tqt3-trinity-${PV}"
pkg_setup() {
export QTDIR="${S}"
export TQTDIR="${S}"
CXX=$(tc-getCXX)
if [[ ${CXX/g++/} != ${CXX} ]]; then
@ -89,9 +90,6 @@ src_prepare() {
find "${S}"/mkspecs -name qmake.conf | xargs \
sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' || die
# set c/xxflags and ldflags
strip-flags
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-e 's:QMAKE_CFLAGS\t\t=.*:QMAKE_CFLAGS =:' \
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
@ -129,7 +127,6 @@ src_configure() {
# during emerge as it makes TQt much happier.
addwrite "${TQTBASE}/etc/settings"
addwrite "${HOME}/.qt"
addwrite "${HOME}/.tqt"
# Common options
myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod"
@ -172,6 +169,10 @@ src_compile() {
# Compile TQt plugins (if any selected)
emake sub-plugins || die
# Point to libs for the tools to build fine too
export DYLD_LIBRARY_PATH="${S}/lib:${DYLD_LIBRARY_PATH}"
export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
# Compile TQDesigner (TQuic is needed by tdelibs), TQAssistant and friends (msg2tqm, qembed..)
emake sub-tools || die

@ -1,13 +1,22 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
inherit trinity-meta-2
DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
IUSE="+hwlib"
KEYWORDS="~amd64 ~x86"
RDEPEND="sys-devel/gdb"
src_configure() {
mycmakeargs=(
-DWITH_TDEHWLIB="$(usex hwlib)"
)
trinity-meta-2_src_configure
}

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -17,6 +16,7 @@ DEPEND="${RDEPEND}"
src_configure() {
mycmakeargs=(
-DWITH_PAM="$(usex pam)"
-DKCHECKPASS_PAM_SERVICE=tde
)
trinity-meta-2_src_configure

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -10,7 +9,7 @@ inherit trinity-meta-2
DESCRIPTION="The Trinity Control Center"
KEYWORDS="~amd64 ~x86"
IUSE="samba logitech-mouse ieee1394 +xrandr +hwlib +xrandr"
IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr "
DEPEND="x11-libs/libX11
x11-libs/libXrender
@ -18,7 +17,6 @@ DEPEND="x11-libs/libX11
samba? ( net-fs/samba )
logitech-mouse? ( virtual/libusb:0 )
ieee1394? ( sys-libs/libraw1394 )
xrandr? ( x11-libs/libXrandr )
=trinity-base/tdelibs-${PV}[xrandr?]
=trinity-base/libkonq-${PV}
=trinity-base/kicker-${PV}"
@ -29,7 +27,8 @@ RDEPEND="${DEPEND}
=trinity-base/tdebase-data-${PV}
=trinity-base/tdesu-${PV}
=trinity-base/khelpcenter-${PV}
=trinity-base/khotkeys-${PV}"
=trinity-base/khotkeys-${PV}
svg? ( =media-libs/libart_lgpl-${PV} )"
TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
@ -43,6 +42,7 @@ src_configure() {
-DWITH_LIBRAW1394="$(usex ieee1394)"
-DWITH_XRANDR="$(usex xrandr)"
-DWITH_TDEHWLIB="$(usex hwlib)"
-DWITH_LIBART="$(usex svg)"
-DXSCREENSAVER_DIR="/usr/$(get_libdir)/misc/xscreensaver"
)

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -13,5 +12,5 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
=trinity-base/tdebase-tdeioslaves-${PV}
www-misc/htdig"
|| ( www-misc/htdig www-misc/hldig )"

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -10,7 +9,6 @@ inherit trinity-meta-2
DESCRIPTION="kicker applet for Trinity and X clipboard management"
KEYWORDS="~amd64 ~x86"
DEPEND="x11-libs/libXfixes"
RDEPEND="${RDEPEND}"
src_configure() {
mycmakeargs=(

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -10,7 +9,7 @@ inherit trinity-meta-2
DESCRIPTION="A network enabled task manager/system monitor"
KEYWORDS="~amd64 ~x86"
IUSE=" dell-laptop lm_sensors"
IUSE="dell-laptop lm_sensors"
DEPEND="lm_sensors? ( sys-apps/lm-sensors )"
RDEPEND="${DEPEND}"

@ -1,6 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -10,23 +10,18 @@ TSM_EXTRACT="tdeioslave"
DESCRIPTION="Generic Trinity TDEIOslaves"
KEYWORDS="~amd64 ~x86"
IUSE="samba ldap sasl openexr +tdehw"
IUSE="samba ldap sasl openexr +hwlib"
DEPEND="x11-libs/libXcursor
net-libs/rpcsvc-proto
openexr? ( >=media-libs/openexr-1.2.2-r2 )
openexr? ( media-libs/openexr )
samba? ( net-fs/samba )
ldap? ( net-nds/openldap )
sasl? ( dev-libs/cyrus-sasl )"
RDEPEND="${DEPEND}"
# CHECKME: optional dependencies
#DEPEND="
# >=dev-libs/cyrus-sasl-2
# x11-apps/xhost
RDEPEND="${DEPEND}
virtual/ssh
trinity-base/tdeeject:${SLOT}"
=trinity-base/tdeeject-${PV}"
src_configure() {
mycmakeargs=(
@ -35,7 +30,7 @@ src_configure() {
-DWITH_LDAP="$(usex ldap)"
-DWITH_SASL="$(usex sasl)"
-DWITH_OPENEXR="$(usex openexr)"
-DWITH_TDEHWLIB="$(usex tdehw)"
-DWITH_TDEHWLIB="$(usex hwlib)"
)
trinity-meta-2_src_configure

@ -19,9 +19,10 @@ SLOT="${TRINITY_VER}"
# NOTE: Building without tdehwlib segfaults, but you can try and report.
IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +idn
networkmanager openexr pcsc-lite spell sudo tiff utempter elficons +ssl pkcs11 kernel_linux
IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +idn +shm elogind
networkmanager openexr pcsc-lite aspell sudo tiff utempter elficons +ssl pkcs11 kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
KEYWORDS="~amd64 ~x86"
MY_DEPEND="=dev-tqt/tqtinterface-${PV}
@ -39,6 +40,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
)
shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre )
svg? ( =media-libs/libart_lgpl-${PV} )
@ -49,7 +51,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
jpeg2k? ( media-libs/jasper )
lua? ( dev-lang/lua:* )
openexr? ( media-libs/openexr )
spell? ( app-dicts/aspell-en app-text/aspell )
aspell? ( app-dicts/aspell-en app-text/aspell )
sudo? ( app-admin/sudo )
tiff? ( media-libs/tiff:= )
utempter? ( sys-libs/libutempter )
@ -62,29 +64,38 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
DEPEND+=" ${MY_DEPEND}"
RDEPEND+=" ${MY_DEPEND}
hwlib? (
acct-group/plugdev
!udevil? ( !udisks? ( !old_udisks? ( sys-apps/pmount ) ) )
pcsc-lite? ( sys-apps/pcsc-lite )
pkcs11? ( dev-libs/pkcs11-helper )
cryptsetup? ( sys-fs/cryptsetup )
networkmanager? ( net-misc/networkmanager )
consolekit? ( sys-auth/consolekit )
upower? ( sys-power/upower )
systemd? ( sys-apps/systemd:= )
systemd? ( sys-apps/systemd )
elogind? ( sys-auth/elogind )
old_udisks? ( sys-fs/udisks:0 )
udisks? ( sys-fs/udisks:2 )
udevil? ( sys-apps/udevil )
)"
src_configure() {
local enable_logind="OFF"
if use systemd || use elogind; then
enable_logind="ON"
fi
mycmakeargs=(
-DTDE_MALLOC="$(usex malloc)"
-DTDE_MALLOC_FULL="$(usex malloc)"
-DTDE_MALLOC_DEBUG="$(usex debug)"
-DWITH_LIBIDN=ON
-DWITH_MITSHM=ON
-DWITH_HSPELL=OFF
-DWITH_HAL=OFF
-DWITH_DEVKITPOWER=OFF
-DWITH_OLD_XDG_STD=OFF
-DWITH_KDE4_MENU_SUFFIX=OFF
-DWITH_LIBIDN="$(usex idn)"
-DWITH_MITSHM="$(usex shm)"
-DWITH_PCRE="$(usex pcre)"
-DWITH_LIBART="$(usex svg)"
-DWITH_SSL="$(usex ssl)"
@ -94,21 +105,26 @@ src_configure() {
-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
-DWITH_UDISKS="$(usex old_udisks)"
-DWITH_UDISKS2="$(usex udisks)"
-DWITH_UDEVIL="$(usex udevil)"
-DWITH_ALSA="$(usex alsa)"
-DWITH_AVAHI="$(usex avahi)"
-DWITH_CRYPTSETUP="$(usex cryptsetup)"
-DWITH_CUPS="$(usex cups)"
-DWITH_INOTIFY="$(usex kernel_linux)"
-DWITH_JASPER="$(usex jpeg2k)"
-DWITH_LUA="$(usex lua)"
-DWITH_LZMA="$(usex lzma)"
-DWITH_OPENEXR="$(usex openexr)"
-DWITH_ASPELL="$(usex spell)"
-DWITH_PCSC="$(usex pcsc-lite)"
-DWITH_ASPELL="$(usex aspell)"
-DWITH_GAMIN="$(usex fam)"
-DWITH_TIFF="$(usex tiff)"
-DWITH_UTEMPTER="$(usex utempter)"
-DUTEMPTER_HELPER="/usr/sbin/utempter"
-DWITH_UPOWER="$(usex upower)"
-DWITH_PKCS="$(usex pkcs11)"
-DWITH_CONSOLEKIT="$(usex consolekit)"
-DWITH_LOGINDPOWER="$(usex systemd)"
-DWITH_LOGINDPOWER="${enable_logind}"
-DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)"
-DWITH_XCOMPOSITE="$(usex xcomposite)"
-DWITH_XRANDR="$(usex xrandr)"
@ -168,11 +184,11 @@ pkg_postinst () {
einfo "It can be overriden on a user-level by adding:"
einfo " [super-user-command]"
einfo " super-user-command=su"
einfo "to the kdeglobals config file which is should be usually"
einfo "to the kdeglobals config file, which is usually"
einfo "located in the ~/.trinity/share/config/ directory."
fi
if use malloc; then
einfo "You have build TDE with it's own malloc implementation."
einfo "You have build TDE with its own malloc implementation."
einfo "That might result in better memory use for you when using TDE."
einfo "But it could also result in a slightly different performance."
einfo "With Gentoo you are free to choose what works better for you."
@ -181,9 +197,13 @@ pkg_postinst () {
if ! use hwlib; then
for flag in consolekit networkmanager upower systemd old_udisks udisks udevil; do
use $flag && \
ewarn "USE=\"$flag\" is passed, but it doesn't change anything due to" && \
ewarn "$flag support in ${P} take effect only if the TDE hwlib is enabled."
ewarn "USE=\"$flag\" is passed, but it doesn't change anything because" && \
ewarn "$flag support in ${P} takes effect only if the TDE hwlib is enabled."
done
fi
if use hwlib; then
einfo "Please add your user to the plugdev group to be able"
einfo "to use the features of the TDE hwlibdaemons like suspend."
fi
}

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -28,7 +27,7 @@ pkg_postinst () {
einfo "It can be overriden on a user-level by adding:"
einfo " [super-user-command]"
einfo " super-user-command=su"
einfo "to the kdeglobal config file which is should be usually"
einfo "to the kdeglobals config file which is should be usually"
einfo "located in the ~/.trinity/share/config/ directory."
fi

@ -1,7 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="7"
TRINITY_MODULE_NAME="tdebase"
@ -9,13 +8,13 @@ inherit trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM"
IUSE="pam xdmcp xcomposite sak +xrandr"
IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg"
KEYWORDS="~amd64 ~x86"
DEPEND="pam? ( trinity-base/tdebase-pam )
xdmcp? ( x11-libs/libXdmcp )
xcomposite? ( x11-libs/libXcomposite )
xrandr? ( x11-libs/libXrandr )
svg? ( =media-libs/libart_lgpl-${PV} )
=trinity-base/tdelibs-${PV}[xrandr?]
sys-apps/dbus
x11-libs/libXtst
@ -35,11 +34,12 @@ pkg_setup() {
src_configure() {
mycmakeargs=(
-DWITH_XTEST=ON
-DWITH_LIBART=ON
-DWITH_LIBART="$(usex svg)"
-DWITH_SHADOW=ON
-DWITH_XCOMPOSITE="$(usex xcomposite)"
-DWITH_XDMCP="$(usex xdmcp)"
-DWITH_XRANDR="$(usex xrandr)"
-DWITH_TDEHWLIB="$(usex hwlib)"
-DWITH_PAM="$(usex pam)"
-DTDM_PAM_SERVICE=tde
)

Loading…
Cancel
Save