[gentoo-commits] repo/gentoo:master commit in: app-editors/ted/files/, app-editors/ted/

[gentoo-commits] repo/gentoo:master commit in: app-editors/ted/files/, app-editors/ted/

[Lars Wendler]

commit:     6f1ba19dd674e07ba66074a31ef28ef06d685dd3
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 21:14:08 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 21:27:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1ba19d

app-editors/ted: Fixed compilation with freetype-2.6.1 (bug #562536).

Also fixed some QA warnings due to missing slot dependencies.

Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-editors/ted/files/ted-2.23-freetype261.patch | 11 +++++++++++
 app-editors/ted/ted-2.23.ebuild                  | 11 ++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app-editors/ted/files/ted-2.23-freetype261.patch b/app-editors/ted/files/ted-2.23-freetype261.patch
new file mode 100644
index 0000000..7e185b3
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-freetype261.patch
@@ -0,0 +1,11 @@
+--- Ted-2.23/appFrame/appFontConfig.c
++++ Ted-2.23/appFrame/appFontConfig.c
+@@ -889,7 +889,7 @@
+ 
+     static const n2s xftn2s[]=
+     {
+-#   include <freetype/fterrdef.h>
++#   include FT_ERROR_DEFINITIONS_H
+     };
+ 
+     for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )

diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild
index 5e52aff..549fad7 100644
--- a/app-editors/ted/ted-2.23.ebuild
+++ b/app-editors/ted/ted-2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2
-	media-libs/tiff
-	virtual/jpeg
-	media-libs/libpng
+	media-libs/tiff:=
+	virtual/jpeg:=
+	media-libs/libpng:=
 	x11-libs/libXft
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/Ted-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
+	epatch "${FILESDIR}"/${P}-make.patch \
+		"${FILESDIR}"/${P}-freetype261.patch
 
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \

[gentoo-commits] repo/gentoo:master commit in: app-editors/ted/files/, app-editors/ted/

[Joonas Niilola]

commit:     4440adba07f9f93560e288f0dff4a0490fa62fea
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Apr  3 10:20:45 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 07:16:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4440adba

app-editors/ted: use Motif toolkit by default

Use Motif instead of Gtk-2, which is alternatively
supported as a GUI.
Bugday 2021-04-03

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20241
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...e-Motif-toolkit-instead-of-GTK-by-default.patch | 26 ++++++++++++++++++++++
 app-editors/ted/ted-2.23-r1.ebuild                 |  9 ++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
new file mode 100644
index 00000000000..362c3b22186
--- /dev/null
+++ b/app-editors/ted/files/ted-2.23-use-Motif-toolkit-instead-of-GTK-by-default.patch
@@ -0,0 +1,26 @@
+From 4368f7bab3a79b4322c1c19fdb99634e10f823ad Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 3 Apr 2021 11:36:06 +0200
+Subject: [PATCH] use Motif toolkit instead of GTK by default
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 08224f9..f6ced83 100644
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@
+ ####	P.S.	I admit that this makefile is more like a shell script.
+ ####
+ 
+-CONFIGURE_OPTIONS=--with-GTK
++CONFIGURE_OPTIONS=--with-MOTIF
+ 
+ compile:	tedlibs		\
+ 		Ted/Ted		\
+-- 
+2.31.1
+

diff --git a/app-editors/ted/ted-2.23-r1.ebuild b/app-editors/ted/ted-2.23-r1.ebuild
index d223c7a9fcd..b3584d9589e 100644
--- a/app-editors/ted/ted-2.23-r1.ebuild
+++ b/app-editors/ted/ted-2.23-r1.ebuild
@@ -23,9 +23,9 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg
 	virtual/libiconv
-	x11-libs/gtk+:2
 	x11-libs/libXft
 	x11-libs/libXpm
+	x11-libs/motif
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-0002-fix-unrecognized-option-with-GTK.patch
 	"${FILESDIR}"/${P}-0003-avoid-compressing-man-page.patch
 	"${FILESDIR}"/${P}-freetype261.patch
+	"${FILESDIR}"/${P}-use-Motif-toolkit-instead-of-GTK-by-default.patch
 )
 
 src_prepare() {
@@ -66,10 +67,14 @@ src_configure() {
 	tc-export AR CC RANLIB
 
 	local dir
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
+	for dir in appUtil textEncoding utilPs bitmap docFont docBase docBuf ind drawMeta docRtf docEdit docLayout docHtml; do
 		cd "${S}"/${dir}
 		econf --cache-file=../config.cache
 	done
+	for dir in appFrame; do
+		cd "${S}"/${dir}
+		econf --cache-file=../config.cache --with-MOTIF
+	done
 }
 
 src_compile() {