From fe5a5b96e8920196238a55b8c39e5f31adfc88a6 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Wed, 18 Jan 2023 20:40:40 +0100 Subject: dev-tcltk/tdom: clang6 Closes: https://bugs.gentoo.org/884415 Signed-off-by: Alfredo Tupone --- dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch | 11 ++++ dev-tcltk/tdom/tdom-0.9.2-r1.ebuild | 83 ++++++++++++++++++++++++++++ dev-tcltk/tdom/tdom-0.9.2.ebuild | 82 --------------------------- 3 files changed, 94 insertions(+), 82 deletions(-) create mode 100644 dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch create mode 100644 dev-tcltk/tdom/tdom-0.9.2-r1.ebuild delete mode 100644 dev-tcltk/tdom/tdom-0.9.2.ebuild (limited to 'dev-tcltk/tdom') diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch b/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch new file mode 100644 index 000000000000..4bf5e3b2486e --- /dev/null +++ b/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch @@ -0,0 +1,11 @@ +--- a/generic/tdomDecls.h 2023-01-18 20:37:24.944545544 +0100 ++++ b/generic/tdomDecls.h 2023-01-18 20:37:36.574361814 +0100 +@@ -87,7 +87,7 @@ + int (*xML_GetIdAttributeIndex) (XML_Parser parser); /* 15 */ + domNode * (*tcldom_getNodeFromName) (Tcl_Interp *interp, char *nodeName, char **errMsg); /* 16 */ + domDocument * (*tcldom_getDocumentFromName) (Tcl_Interp *interp, char *docName, char **errMsg); /* 17 */ +- SchemaData * (*tdomGetSchemadata) (void); /* 18 */ ++ SchemaData * (*tdomGetSchemadata) (Tcl_Interp *interp); /* 18 */ + } TdomStubs; + + extern const TdomStubs *tdomStubsPtr; diff --git a/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild b/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild new file mode 100644 index 000000000000..0b92c7636533 --- /dev/null +++ b/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +MY_P="tDOM-${PV}" + +DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl" +HOMEPAGE="https://core.tcl.tk/tdom/" +SRC_URI="http://tdom.org/downloads/${P}-src.tgz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="threads" + +DEPEND=" + dev-lang/tcl:0= + dev-libs/expat" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${P}-src + +PATCHES=( + "${FILESDIR}"/${P}-useCC.patch + "${FILESDIR}"/${P}-nothreads.patch + "${FILESDIR}"/${P}-clang6.patch +) + +src_prepare() { + append-libs -lm + sed \ + -e 's:-O2::g' \ + -e 's:-pipe::g' \ + -e 's:-fomit-frame-pointer::g' \ + -e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \ + -i tclconfig/tcl.m4 || die + mv extensions/tnc/configure.{in,ac} || die + mv extensions/example/configure.{in,ac} || die + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable threads) + --enable-shared + --with-tcl="${EPREFIX}"/usr/$(get_libdir) + ) + + cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \ + --disable-tdomalloc --with-expat + cd "${S}"/extensions/tdomhtml && econf + cd "${S}"/extensions/tnc && econf ${myeconfargs} +} + +src_compile() { + local dir + + for dir in "${S}"/unix "${S}"/extensions/tnc; do + pushd ${dir} > /dev/null + emake + popd > /dev/null + done +} + +src_test() { + cd unix && default +} + +src_install() { + local dir + + dodoc CHANGES ChangeLog README* + + for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do + pushd ${dir} > /dev/null + emake DESTDIR="${D}" install + popd > /dev/null + done +} diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild deleted file mode 100644 index cebbb3e19ed9..000000000000 --- a/dev-tcltk/tdom/tdom-0.9.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -MY_P="tDOM-${PV}" - -DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl" -HOMEPAGE="https://core.tcl.tk/tdom/" -SRC_URI="http://tdom.org/downloads/${P}-src.tgz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="threads" - -DEPEND=" - dev-lang/tcl:0= - dev-libs/expat" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${P}-src - -PATCHES=( - "${FILESDIR}"/${P}-useCC.patch - "${FILESDIR}"/${P}-nothreads.patch -) - -src_prepare() { - append-libs -lm - sed \ - -e 's:-O2::g' \ - -e 's:-pipe::g' \ - -e 's:-fomit-frame-pointer::g' \ - -e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \ - -i tclconfig/tcl.m4 || die - mv extensions/tnc/configure.{in,ac} || die - mv extensions/example/configure.{in,ac} || die - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable threads) - --enable-shared - --with-tcl="${EPREFIX}"/usr/$(get_libdir) - ) - - cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \ - --disable-tdomalloc --with-expat - cd "${S}"/extensions/tdomhtml && econf - cd "${S}"/extensions/tnc && econf ${myeconfargs} -} - -src_compile() { - local dir - - for dir in "${S}"/unix "${S}"/extensions/tnc; do - pushd ${dir} > /dev/null - emake - popd > /dev/null - done -} - -src_test() { - cd unix && default -} - -src_install() { - local dir - - dodoc CHANGES ChangeLog README* - - for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do - pushd ${dir} > /dev/null - emake DESTDIR="${D}" install - popd > /dev/null - done -} -- cgit v1.2.3-65-gdbad