commit: 6db3b38f3685c48906623a77fd152c82d4a92eec Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Aug 4 08:55:39 2022 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Aug 4 08:55:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db3b38f
dev-tcltk/blt: fix lto-type-mismatch Closes: https://bugs.gentoo.org/858260 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/blt/blt-2.5.3-r1.ebuild | 3 ++- dev-tcltk/blt/files/blt-2.5.3-lto.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-tcltk/blt/blt-2.5.3-r1.ebuild b/dev-tcltk/blt/blt-2.5.3-r1.ebuild index 3332aa195afb..76a368e2e4db 100644 --- a/dev-tcltk/blt/blt-2.5.3-r1.ebuild +++ b/dev-tcltk/blt/blt-2.5.3-r1.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc DEPEND=" dev-lang/tk:0= - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" BDEPEND="app-arch/unzip" @@ -55,6 +55,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-darwin.patch "${FILESDIR}"/${P}-gbsd.patch + "${FILESDIR}"/${P}-lto.patch ) src_prepare() { diff --git a/dev-tcltk/blt/files/blt-2.5.3-lto.patch b/dev-tcltk/blt/files/blt-2.5.3-lto.patch new file mode 100644 index 000000000000..9d1543aae9e9 --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.5.3-lto.patch @@ -0,0 +1,18 @@ +--- a/generic/bltObjConfig.c 2022-08-04 10:42:54.705864029 +0200 ++++ b/generic/bltObjConfig.c 2022-08-04 10:44:02.681005365 +0200 +@@ -1803,11 +1803,11 @@ + fprintf(stderr, "Blt_ConfigTypes changed\n"); + } + if (stype == BLT_CONFIG_CUSTOM) { +- extern Blt_CustomOption bltDistanceOption; +- extern Blt_CustomOption bltPositiveDistanceOption; ++ extern Tk_CustomOption bltDistanceOption; ++ extern Tk_CustomOption bltPositiveDistanceOption; + +- if (specPtr->customPtr == &bltDistanceOption || +- specPtr->customPtr == &bltPositiveDistanceOption ++ if (specPtr->customPtr == (Blt_CustomOption *)&bltDistanceOption || ++ specPtr->customPtr == (Blt_CustomOption *)&bltPositiveDistanceOption + ) { + stype = BLT_CONFIG_PIXELS; + }
