From 0a7dd5542ef268f12ebddb49e67a63cc63023a5f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 21 Sep 2020 18:37:22 +0200 Subject: [PATCH] dev-tqt/tqt: Add missing IUSE metadata, fix DESCRIPTION, typos, whitespace Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner --- dev-tqt/tqt/metadata.xml | 7 +++++++ dev-tqt/tqt/tqt-14.0.6.ebuild | 22 +++++++++++----------- dev-tqt/tqt/tqt-14.0.7.ebuild | 22 +++++++++++----------- dev-tqt/tqt/tqt-9999.ebuild | 20 ++++++++++---------- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dev-tqt/tqt/metadata.xml b/dev-tqt/tqt/metadata.xml index 6e9f5e4a..38f8d7ec 100644 --- a/dev-tqt/tqt/metadata.xml +++ b/dev-tqt/tqt/metadata.xml @@ -5,4 +5,11 @@ fatzer2@gmail.com Alexander Golubev + + Enable support for dev-libs/glib-based mainloop + Makes Trinity symbols hidden by default + Enable binary incompatible version of immodule for Qt + Enable build of styles + Enable tablet support + diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild index dfcda95c..cc959fd5 100644 --- a/dev-tqt/tqt/tqt-14.0.6.ebuild +++ b/dev-tqt/tqt/tqt-14.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 @@ -10,7 +10,7 @@ inherit eutils toolchain-funcs RESTRICT="mirror" SRCTYPE="free" -DESCRIPTION="Trinity's Qt3 toolkit fork - a comprehensive C++ application development framework." +DESCRIPTION="Trinity's Qt3 fork - a comprehensive C++ application development framework" HOMEPAGE="https://trinitydesktop.org/" SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/R${PV}/main/dependencies/tqt3-trinity-${PV}.tar.xz" @@ -60,7 +60,7 @@ S="${WORKDIR}/tqt3-trinity-${PV}" pkg_setup() { if use imext; then ewarn - ewarn "You are going to compile binary imcompatible immodule for TQt. This means" + ewarn "You are going to compile binary incompatible immodule for TQt. This means" ewarn "you have to recompile everything depending on TQt after you install it." ewarn "Be aware." ewarn @@ -121,14 +121,14 @@ src_prepare() { -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ -e "s:\.*=.*:QMAKE_STRIP=:" \ "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - + # Remove obsolete X11 and OpenGL searchpaths find "${S}"/mkspecs -name qmake.conf | xargs \ sed -i -e 's:QMAKE_INCDIR_X11\t=.*:QMAKE_INCDIR_X11\t=:' \ -e 's:QMAKE_LIBDIR_X11\t=.*:QMAKE_LIBDIR_X11\t=:' \ -e 's:QMAKE_INCDIR_OPENGL\t=.*:QMAKE_INCDIR_OPENGL\t=:' \ -e 's:QMAKE_LIBDIR_OPENGL\t=.*:QMAKE_LIBDIR_OPENGL\t=:' || die - + if use hiddenvisibility; then sed -i -e 's:QMAKE_CFLAGS =:QMAKE_CFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden:' \ "${S}/mkspecs/${PLATFORM}/qmake.conf" || die @@ -174,12 +174,12 @@ src_configure() { # Optional options use cups && myconf+=" -cups" || myconf+=" -no-cups" use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" use fontconfig && myconf+=" -lfontconfig" - use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" - use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" + use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" + use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" use nas && myconf+=" -system-nas-sound" || myconf+=" -no-nas-sound" use nis && myconf+=" -nis" || myconf+=" -no-nis" @@ -206,7 +206,7 @@ src_compile() { # Compile TQt plugins (if any selected) emake sub-plugins - + # 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}" diff --git a/dev-tqt/tqt/tqt-14.0.7.ebuild b/dev-tqt/tqt/tqt-14.0.7.ebuild index dfcda95c..cc959fd5 100644 --- a/dev-tqt/tqt/tqt-14.0.7.ebuild +++ b/dev-tqt/tqt/tqt-14.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 @@ -10,7 +10,7 @@ inherit eutils toolchain-funcs RESTRICT="mirror" SRCTYPE="free" -DESCRIPTION="Trinity's Qt3 toolkit fork - a comprehensive C++ application development framework." +DESCRIPTION="Trinity's Qt3 fork - a comprehensive C++ application development framework" HOMEPAGE="https://trinitydesktop.org/" SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/R${PV}/main/dependencies/tqt3-trinity-${PV}.tar.xz" @@ -60,7 +60,7 @@ S="${WORKDIR}/tqt3-trinity-${PV}" pkg_setup() { if use imext; then ewarn - ewarn "You are going to compile binary imcompatible immodule for TQt. This means" + ewarn "You are going to compile binary incompatible immodule for TQt. This means" ewarn "you have to recompile everything depending on TQt after you install it." ewarn "Be aware." ewarn @@ -121,14 +121,14 @@ src_prepare() { -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ -e "s:\.*=.*:QMAKE_STRIP=:" \ "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - + # Remove obsolete X11 and OpenGL searchpaths find "${S}"/mkspecs -name qmake.conf | xargs \ sed -i -e 's:QMAKE_INCDIR_X11\t=.*:QMAKE_INCDIR_X11\t=:' \ -e 's:QMAKE_LIBDIR_X11\t=.*:QMAKE_LIBDIR_X11\t=:' \ -e 's:QMAKE_INCDIR_OPENGL\t=.*:QMAKE_INCDIR_OPENGL\t=:' \ -e 's:QMAKE_LIBDIR_OPENGL\t=.*:QMAKE_LIBDIR_OPENGL\t=:' || die - + if use hiddenvisibility; then sed -i -e 's:QMAKE_CFLAGS =:QMAKE_CFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden:' \ "${S}/mkspecs/${PLATFORM}/qmake.conf" || die @@ -174,12 +174,12 @@ src_configure() { # Optional options use cups && myconf+=" -cups" || myconf+=" -no-cups" use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" use fontconfig && myconf+=" -lfontconfig" - use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" - use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" + use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" + use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" use nas && myconf+=" -system-nas-sound" || myconf+=" -no-nas-sound" use nis && myconf+=" -nis" || myconf+=" -no-nis" @@ -206,7 +206,7 @@ src_compile() { # Compile TQt plugins (if any selected) emake sub-plugins - + # 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}" diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild index 8c4d1e8c..8ab23715 100644 --- a/dev-tqt/tqt/tqt-9999.ebuild +++ b/dev-tqt/tqt/tqt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 @@ -10,7 +10,7 @@ inherit eutils git-r3 toolchain-funcs RESTRICT="mirror" SRCTYPE="free" -DESCRIPTION="Trinity's Qt3 toolkit fork - a comprehensive C++ application development framework." +DESCRIPTION="Trinity's Qt3 fork - a comprehensive C++ application development framework" HOMEPAGE="https://trinitydesktop.org/" EGIT_REPO_URI="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3" @@ -56,7 +56,7 @@ TQTBASE="/usr/tqt3" pkg_setup() { if use imext; then ewarn - ewarn "You are going to compile binary imcompatible immodule for TQt. This means" + ewarn "You are going to compile binary incompatible immodule for TQt. This means" ewarn "you have to recompile everything depending on TQt after you install it." ewarn "Be aware." ewarn @@ -117,7 +117,7 @@ src_prepare() { -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ -e "s:\.*=.*:QMAKE_STRIP=:" \ "${S}/mkspecs/${PLATFORM}/qmake.conf" || die - + # Remove obsolete X11 and OpenGL searchpaths find "${S}"/mkspecs -name qmake.conf | xargs \ sed -i -e 's:QMAKE_INCDIR_X11\t=.*:QMAKE_INCDIR_X11\t=:' \ @@ -171,12 +171,12 @@ src_configure() { use nas && myconf+=" -system-nas-sound" || myconf+=" -no-nas-sound" use nis && myconf+=" -nis" || myconf+=" -no-nis" use xrandr && myconf+=" -xrandr" || myconf+=" -no-xrandr" - use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" + use mng && myconf+=" -qt-imgfmt-mng -system-libmng" || myconf+=" -no-imgfmt-mng" use cups && myconf+=" -cups" || myconf+=" -no-cups" use opengl && myconf+=" -enable-module=opengl -no-dlopen-opengl" || myconf+=" -disable-opengl" - use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" - use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" - use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" + use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" + use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" + use glib && myconf+=" -glibmainloop" || myconf+=" -no-glibmainloop" use fontconfig && myconf+=" -lfontconfig" use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" @@ -188,7 +188,7 @@ src_configure() { use imext && myconf+=" -inputmethod-ext" || myconf+=" -no-inputmethod-ext" use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" - + # 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" @@ -205,7 +205,7 @@ src_compile() { # Compile TQt plugins (if any selected) emake sub-plugins - + # 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}"