From bfd5e4e1e24764a83761c8895bcd74a90a667c19 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Apr 2020 14:52:40 +0200 Subject: [PATCH] TQt: Make `-qt-style-motif` mandatory. Otherwise TQt/TDE will have problems. Signed-off-by: Chris --- dev-tqt/tqt/tqt-14.0.6.ebuild | 5 +++-- dev-tqt/tqt/tqt-9999.ebuild | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild index 3618a8b6..2d6585b9 100644 --- a/dev-tqt/tqt/tqt-14.0.6.ebuild +++ b/dev-tqt/tqt/tqt-14.0.6.ebuild @@ -163,7 +163,7 @@ src_configure() { addwrite "${HOME}/.qt" # Common options - myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod" + myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod -qt-style-motif" myconf+=" $(echo -{qt-imgfmt-,system-lib}{jpeg,png}) -qt-gif -system-zlib" myconf+=" -platform ${PLATFORM} -xplatform ${PLATFORM}" myconf+=" -xft -xrender -xshape -xkb -xcursor -prefix ${TQTBASE}" @@ -185,7 +185,8 @@ src_configure() { use nis && myconf+=" -nis" || myconf+=" -no-nis" use opengl && myconf+=" -enable-module=opengl -no-dlopen-opengl" || myconf+=" -disable-opengl" use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" - use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motif -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motif -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" + # Don't build styles, except requested (Motif is mandatory for TDE) + use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild index c4232b30..59cca30b 100644 --- a/dev-tqt/tqt/tqt-9999.ebuild +++ b/dev-tqt/tqt/tqt-9999.ebuild @@ -159,7 +159,7 @@ src_configure() { addwrite "${HOME}/.qt" # Common options - myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod" + myconf=" -sm -thread -stl -no-verbose -largefile -no-pch -inputmethod -qt-style-motif" myconf+=" $(echo -{qt-imgfmt-,system-lib}{jpeg,png}) -qt-gif -system-zlib" myconf+=" -platform ${PLATFORM} -xplatform ${PLATFORM}" myconf+=" -xft -xrender -xshape -xkb -xcursor -prefix ${TQTBASE}" @@ -188,8 +188,9 @@ src_configure() { use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" - - use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motif -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motif -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" + + # Don't build styles, except requested (Motif is mandatory for TDE) + use styles && myconf+=" -plugin-style-cde -plugin-style-compact -plugin-style-motifplus -plugin-style-platinum -plugin-style-sgi -plugin-style-windows" || myconf+=" -no-style-cde -no-style-compact -no-style-motifplus -no-style-platinum -no-style-sgi -no-style-windows" export YACC='byacc -d' tc-export CC CXX