* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/
@ 2020-12-24 16:08 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2020-12-24 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 250380cdb85131d3aa4d4961c594ba78b5af9be4
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 16:07:27 2020 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 16:08:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=250380cd
dev-tcltk/tclxml: undefine bool
Closes: https://bugs.gentoo.org/760159
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch | 26 ++++++++++++++++++++++++++
dev-tcltk/tclxml/tclxml-3.2.7.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
new file mode 100644
index 00000000000..8d29180f082
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
@@ -0,0 +1,26 @@
+--- a/tclxml.c 2020-12-24 16:58:20.051675497 +0100
++++ b/tclxml.c 2020-12-24 16:58:49.586185021 +0100
+@@ -20,6 +20,10 @@
+ #include <tclxslt/tclxslt.h>
+ #include <string.h>
+
++#ifdef bool
++#undef bool
++#endif
++
+ int Tcldom_libxml2_Init ( Tcl_Interp *interp );
+
+ #define TCL_DOES_STUBS \
+--- a/tclxslt-libxslt.c 2020-12-24 16:59:07.004895777 +0100
++++ b/tclxslt-libxslt.c 2020-12-24 16:59:46.280243657 +0100
+@@ -20,6 +20,10 @@
+ #include <libxslt/imports.h>
+ #include <libxslt/security.h>
+
++#ifdef bool
++#undef bool
++#endif
++
+ #undef TCL_STORAGE_CLASS
+ #define TCL_STORAGE_CLASS DLLEXPORT
+
diff --git a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
index af6d475303e..454695c0e26 100644
--- a/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.2.7.ebuild
@@ -28,6 +28,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
+ "${FILESDIR}"/${P}-bool.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/
@ 2021-04-19 7:58 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-19 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 53d962557a79cc4cc70e297d116ce9deb1515e36
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 09:14:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 07:53:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d96255
dev-tcltk/tclxml: Drop 3.2-r2, EAPI5--
Closes: https://bugs.gentoo.org/766671
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-tcltk/tclxml/Manifest | 1 -
.../tclxml/files/tclxml-3.2-format-security.patch | 16 -------
dev-tcltk/tclxml/tclxml-3.2-r2.ebuild | 51 ----------------------
3 files changed, 68 deletions(-)
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 929aa2bbe67..3f7f335c52b 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,2 +1 @@
DIST tclxml-3.2.7.tar.gz 313751 BLAKE2B 43983d2d6c2f339fa320c4748f889db49fbe9cfff15219e898fdfe5a9a7d6526a2b40b7697fdca6f5272bdfb52cbe68af53ced711ad5d476dc2c5e31898c00ba SHA512 23cb17466f777538088998fa4cce55531708bba517d45cb8b4281401779c418f8532376e4aefcf4bb5f3674ee5bab2e0db25ab2a69c153d3e5820c509edf12ae
-DIST tclxml-3.2.tar.gz 757594 BLAKE2B 6ddadb6add6ccba0db55e704ddffafe1c0f22740d27a5c49bf9c8fd00e1592aed46fd1cef49155101ac1544de8559f0d808731c598cf2189ff84a681bbf870e6 SHA512 5e7d45063c1a311d49ecc42f664bf7d88862fc19a46b64f52d038e2adfcc5b6964ae74d61b40bcf8eb4e1440f849339095fd8712bd39f0cb57e279acea58a3da
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch b/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
deleted file mode 100644
index 2d13c6575ea..00000000000
--- a/dev-tcltk/tclxml/files/tclxml-3.2-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tclxslt-libxslt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tclxslt-libxslt.c b/tclxslt-libxslt.c
-index d943bf7..d18f645 100644
---- a/tclxslt-libxslt.c
-+++ b/tclxslt-libxslt.c
-@@ -1506,7 +1506,7 @@ TclXSLTExtFunction(xpathCtxt, nargs)
- obj = TclXSLT_ConvertTclObjToXPathObj(extinfo->interp, resultPtr);
- valuePush(xpathCtxt, obj);
- } else {
-- xmlGenericError(xmlGenericErrorContext,
-+ xmlGenericError(xmlGenericErrorContext, "%s",
- Tcl_GetStringFromObj(resultPtr, NULL));
- /* Need to define a new error code - this is the closest in meaning */
- xpathCtxt->error = XPATH_UNKNOWN_FUNC_ERROR;
diff --git a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild b/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
deleted file mode 100644
index ee76cfe18e7..00000000000
--- a/dev-tcltk/tclxml/tclxml-3.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib
-
-DESCRIPTION="Pure Tcl implementation of an XML parser"
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="debug threads"
-
-DEPEND="
- >=dev-lang/tcl-8.2:0
- >=dev-libs/libxml2-2.6.9
- dev-libs/libxslt
- >=dev-tcltk/tcllib-1.2
- dev-libs/expat"
-# test? ( dev-tcltk/tclparser )
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-fix-implicit-declarations.patch \
- "${FILESDIR}"/${P}-format-security.patch
-}
-
-src_configure() {
- local myconf=""
-
- use threads && myconf="${myconf} --enable-threads"
-
- econf ${myconf} \
- --with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
- --with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
- --with-tclinclude="${EPREFIX}"/usr/include \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable amd64 64bit) \
- $(use_enable debug symbols)
-}
-
-src_install() {
- default
- dohtml doc/*.html
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/
@ 2024-02-24 20:14 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2024-02-24 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 5d7adf81044dbe3e035815dc85fa1127fa811970
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 20:13:15 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 20:14:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7adf81
dev-tcltk/tclxml: fix incompatible function pointer
Closes: https://bugs.gentoo.org/924861
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../tclxml/files/tclxml-3.3.1-funcPointer.patch | 38 ++++++++++++++++++++++
dev-tcltk/tclxml/tclxml-3.3.1-r1.ebuild | 3 +-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tclxml/files/tclxml-3.3.1-funcPointer.patch b/dev-tcltk/tclxml/files/tclxml-3.3.1-funcPointer.patch
new file mode 100644
index 000000000000..3f641b490883
--- /dev/null
+++ b/dev-tcltk/tclxml/files/tclxml-3.3.1-funcPointer.patch
@@ -0,0 +1,38 @@
+From c1bc95aadd5334adf9c6d17ce918abf98af14c6f Mon Sep 17 00:00:00 2001
+From: Alfredo Tupone <tupone@gentoo.org>
+Date: Sat, 24 Feb 2024 20:38:49 +0100
+Subject: [PATCH] fix -Wincompatible-pointer-types
+
+---
+ docObj.c | 4 +---
+ include/tclxml-libxml2/tclxml-libxml2Decls.h | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/docObj.c b/docObj.c
+index 20a1bd4..c4d5bf9 100644
+--- a/docObj.c
++++ b/docObj.c
+@@ -1852,9 +1852,7 @@ ErrorCodeToString(code)
+ }
+
+ void
+-TclXML_libxml2_ErrorHandler (ctx, error)
+- void *ctx; /* ignore - depends on context */
+- xmlErrorPtr error;
++TclXML_libxml2_ErrorHandler (void *ctx, const xmlError *error)
+ {
+ ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+ Tcl_Obj *objPtr;
+diff --git a/include/tclxml-libxml2/tclxml-libxml2Decls.h b/include/tclxml-libxml2/tclxml-libxml2Decls.h
+index 3faa5f7..9ad6555 100644
+--- a/include/tclxml-libxml2/tclxml-libxml2Decls.h
++++ b/include/tclxml-libxml2/tclxml-libxml2Decls.h
+@@ -55,7 +55,7 @@ EXTERN void TclXML_libxml2_DocKeep _ANSI_ARGS_((Tcl_Obj * objPtr,
+ TclXML_libxml2_DocumentHandling keep));
+ /* 10 */
+ EXTERN void TclXML_libxml2_ErrorHandler _ANSI_ARGS_((void * ctx,
+- xmlErrorPtr error));
++ const xmlError *error));
+ /* 11 */
+ EXTERN void TclXML_libxml2_ResetError _ANSI_ARGS_((
+ Tcl_Interp * interp));
diff --git a/dev-tcltk/tclxml/tclxml-3.3.1-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.3.1-r1.ebuild
index c6aed4cf1018..2091c6704dab 100644
--- a/dev-tcltk/tclxml/tclxml-3.3.1-r1.ebuild
+++ b/dev-tcltk/tclxml/tclxml-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,6 +29,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
+ "${FILESDIR}"/${P}-funcPointer.patch
)
S="${WORKDIR}"/${MYP}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/
@ 2024-11-01 0:03 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-11-01 0:03 UTC (permalink / raw
To: gentoo-commits
commit: aac4d06dd344afaacbd169360e3c9b197bc88dfe
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 23:58:55 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 23:58:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac4d06d
dev-tcltk/tclxml: drop 3.2.7-r1
Bug: https://bugs.gentoo.org/924861
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-tcltk/tclxml/Manifest | 1 -
dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch | 26 ---------------
dev-tcltk/tclxml/tclxml-3.2.7-r1.ebuild | 44 --------------------------
3 files changed, 71 deletions(-)
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index 0e19de9f7d01..0a786ea1decb 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,2 +1 @@
DIST TclXML-3.3.1.tar.gz 681802 BLAKE2B e29bcdb2ef79aa1d1f41ff1338981c0c2d0592fbd146daad102552b2609ab844b12d5de5807a9a26400860783b94df7b754d4ef96a5ab377732dcefaae3c0c21 SHA512 8ee9e36fc8cb9a68da5f810442b5b6fa8d020ef772b9ee98d7c3e429c41ec158451c8994ec5800636db8b33f39a2df7e37c6b64a20a24f7fe4e72e0bba3f2ff3
-DIST tclxml-3.2.7.tar.gz 313751 BLAKE2B 43983d2d6c2f339fa320c4748f889db49fbe9cfff15219e898fdfe5a9a7d6526a2b40b7697fdca6f5272bdfb52cbe68af53ced711ad5d476dc2c5e31898c00ba SHA512 23cb17466f777538088998fa4cce55531708bba517d45cb8b4281401779c418f8532376e4aefcf4bb5f3674ee5bab2e0db25ab2a69c153d3e5820c509edf12ae
diff --git a/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch b/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
deleted file mode 100644
index 8d29180f0826..000000000000
--- a/dev-tcltk/tclxml/files/tclxml-3.2.7-bool.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/tclxml.c 2020-12-24 16:58:20.051675497 +0100
-+++ b/tclxml.c 2020-12-24 16:58:49.586185021 +0100
-@@ -20,6 +20,10 @@
- #include <tclxslt/tclxslt.h>
- #include <string.h>
-
-+#ifdef bool
-+#undef bool
-+#endif
-+
- int Tcldom_libxml2_Init ( Tcl_Interp *interp );
-
- #define TCL_DOES_STUBS \
---- a/tclxslt-libxslt.c 2020-12-24 16:59:07.004895777 +0100
-+++ b/tclxslt-libxslt.c 2020-12-24 16:59:46.280243657 +0100
-@@ -20,6 +20,10 @@
- #include <libxslt/imports.h>
- #include <libxslt/security.h>
-
-+#ifdef bool
-+#undef bool
-+#endif
-+
- #undef TCL_STORAGE_CLASS
- #define TCL_STORAGE_CLASS DLLEXPORT
-
diff --git a/dev-tcltk/tclxml/tclxml-3.2.7-r1.ebuild b/dev-tcltk/tclxml/tclxml-3.2.7-r1.ebuild
deleted file mode 100644
index 5c4a298b68e7..000000000000
--- a/dev-tcltk/tclxml/tclxml-3.2.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Pure Tcl implementation of an XML parser"
-HOMEPAGE="http://tclxml.sourceforge.net/"
-SRC_URI="https://github.com/wjoye/${PN}/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="debug threads"
-
-DEPEND="
- >=dev-lang/tcl-8.2:=
- >=dev-libs/libxml2-2.6.9
- dev-libs/libxslt
- >=dev-tcltk/tcllib-1.2
- dev-libs/expat"
-# test? ( dev-tcltk/tclparser )
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
- "${FILESDIR}"/${P}-bool.patch
-)
-
-src_configure() {
- local myconf=""
-
- use threads && myconf="${myconf} --enable-threads"
-
- econf ${myconf} \
- --with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
- --with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
- --with-tclinclude="${EPREFIX}"/usr/include \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable amd64 64bit) \
- $(use_enable debug symbols)
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-01 0:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-01 0:03 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tclxml/, dev-tcltk/tclxml/files/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-02-24 20:14 Alfredo Tupone
2021-04-19 7:58 Andreas Sturmlechner
2020-12-24 16:08 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox