* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2019-11-04 8:12 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2019-11-04 8:12 UTC (permalink / raw
To: gentoo-commits
commit: 6bf3dc8251e79a674c8fc399004d05611f4508b3
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 08:11:56 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 08:11:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf3dc82
dev-tcltk/tdom: fix installation
Closes: https://bugs.gentoo.org/699262
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch | 55 -----------------------------
dev-tcltk/tdom/files/tdom-0.9.1.patch | 58 -------------------------------
dev-tcltk/tdom/tdom-0.9.1.ebuild | 6 ----
3 files changed, 119 deletions(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch b/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch
deleted file mode 100644
index 36d844d74cb..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/extensions/tnc/Makefile.in 2018-10-31 21:18:18.701695694 +0100
-+++ b/extensions/tnc/Makefile.in 2018-10-31 21:19:25.621555122 +0100
-@@ -372,25 +372,25 @@
- #========================================================================
-
- install-lib-binaries: binaries
-- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
-+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
- @list='$(lib_BINARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- if test "x$$stub" = "xstub"; then \
-- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- else \
-- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- fi; \
- ext=`echo $$p|sed -e "s/.*\.//"`; \
- if test "x$$ext" = "xdll"; then \
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- if test -f $$lib; then \
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- fi; \
- fi; \
- fi; \
-@@ -398,13 +398,13 @@
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- destp=`basename $$p`; \
-- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
-+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \
- fi; \
- done
- @if test "x$(SHARED_BUILD)" = "x1"; then \
-- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
-- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
-+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \
-+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \
- fi
-
- #========================================================================
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1.patch b/dev-tcltk/tdom/files/tdom-0.9.1.patch
deleted file mode 100644
index 00d3df2a306..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/Makefile.in 2018-10-31 21:12:16.856861967 +0100
-+++ b/Makefile.in 2018-10-31 21:15:26.611628532 +0100
-@@ -326,7 +326,7 @@
-
- pkgIndex.tcl-hand:
- @(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
-- "load [list [file join $$dir $(PKG_LIB_FILE)]];\
-+ "load $(PKG_LIB_FILE);\
- source [list [file join $$dir tdom.tcl]]"'\
- ) > pkgIndex.tcl
-
-@@ -422,7 +422,7 @@
- #========================================================================
-
- install-lib-binaries: binaries
-- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
-+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
- @list='$(lib_BINARIES)'; for p in $$list; do \
- if test -f $$p; then \
- if test "x$$stub" = "xstub"; then \
-@@ -432,15 +432,15 @@
- echo " $(RANLIB) $$p"; \
- $(RANLIB) $$p; \
- fi; \
-- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- ext=`echo $$p|sed -e "s/.*\.//"`; \
- if test "x$$ext" = "xdll"; then \
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- if test -f $$lib; then \
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- fi; \
- fi; \
- fi; \
-@@ -450,13 +450,13 @@
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- destp=`basename $$p`; \
-- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
-+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \
- fi; \
- done
- @if test "x$(SHARED_BUILD)" = "x1"; then \
-- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
-- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
-+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \
-+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \
- fi
-
- #========================================================================
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 9f39b444266..f670708e8b2 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -21,12 +21,6 @@ DEPEND="
dev-libs/expat"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/"${P}.patch
- "${FILESDIR}/"${P}-tnc.patch
- "${FILESDIR}/"${PN}-0.8.3-soname.patch
-)
-
src_prepare() {
append-libs -lm
sed \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2019-12-07 21:15 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2019-12-07 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 2d60d6fa3e66bfcfbf7c945bea0236c3f58e3066
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 21:14:38 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 21:14:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d60d6fa
dev-tcltk/tdom: use CC during configure test
Closes: https://bugs.gentoo.org/702234
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch | 28 ++++++++++++++++++++++++++++
dev-tcltk/tdom/tdom-0.9.1.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
new file mode 100644
index 00000000000..918c944b6f6
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2019-12-07 22:00:18.094712146 +0100
++++ b/tclconfig/tcl.m4 2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+- hold_cc=$CC; CC="$TCL_CC"
+ AC_TRY_COMPILE(,[
+ #ifdef _WIN32
+ #error win32
+@@ -446,7 +445,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ]
+ )
+- CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.in 2019-12-07 22:06:56.954496437 +0100
++++ b/configure.in 2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 4f20b7f4760..67ca7a61e0a 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
dev-libs/expat"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
src_prepare() {
append-libs -lm
sed \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2021-04-19 7:58 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-04-19 7:58 UTC (permalink / raw
To: gentoo-commits
commit: fe157520e9af5c1b5e1fc008cdb26f174ccd0e24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 09:15:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 07:54:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe157520
dev-tcltk/tdom: Drop 0.8.3-r4, EAPI5--
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-tcltk/tdom/Manifest | 1 -
dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch | 73 -----------------------
dev-tcltk/tdom/files/tdom-0.8.2.patch | 52 ----------------
dev-tcltk/tdom/files/tdom-0.8.3-expat.patch | 84 --------------------------
dev-tcltk/tdom/files/tdom-0.8.3-soname.patch | 26 --------
dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch | 21 -------
dev-tcltk/tdom/tdom-0.8.3-r4.ebuild | 89 ----------------------------
7 files changed, 346 deletions(-)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index da4d8a71d02..a2049669de4 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,2 +1 @@
-DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
deleted file mode 100644
index 7fa200b9ee3..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -355,29 +355,30 @@
- #========================================================================
-
- install-lib-binaries: binaries
-- @mkdir -p $(DESTDIR)$(pkglibdir)
-+ @mkdir -p $(DESTDIR)$(libdir)
- @list='$(lib_BINARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- if test "x$$stub" = "xstub"; then \
-- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- else \
-- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- fi; \
- ext=`echo $$p|sed -e "s/.*\.//"`; \
- if test "x$$ext" = "xdll"; then \
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- if test -f $$lib; then \
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- fi; \
- fi; \
- fi; \
- done
-+ @mkdir -p $(DESTDIR)$(pkglibdir)
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- destp=`basename $$p`; \
---- extensions/tnc/configure.in
-+++ extensions/tnc/configure.in
-@@ -89,7 +89,7 @@
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
- TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
- else
-- TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
-+ TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
- fi
-
- #--------------------------------------------------------------------
---- extensions/tnc/pkgIndex.tcl.in
-+++ extensions/tnc/pkgIndex.tcl.in
-@@ -2,4 +2,4 @@
-
- package ifneeded tnc @PACKAGE_VERSION@ \
- "package require tdom; \
-- [list load [file join $dir @PKG_LIB_FILE@] tnc]"
-+ [list load @PKG_LIB_FILE@ tnc]"
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -160,7 +160,7 @@ DEFS = @DEFS@ $(PKG_CFLAGS)
- CONFIG_CLEAN_FILES = Makefile
-
- CPPFLAGS = @CPPFLAGS@
--LIBS = @PKG_LIBS@ @LIBS@
-+LIBS = @PKG_LIBS@ @LIBS@ -L../../unix/
- AR = @AR@
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2.patch b/dev-tcltk/tdom/files/tdom-0.8.2.patch
deleted file mode 100644
index 73af7c60e14..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- Makefile.in
-+++ Makefile.in
-@@ -307,7 +307,7 @@
-
- pkgIndex.tcl-hand:
- @(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
-- "load [list [file join $$dir $(PKG_LIB_FILE)]];\
-+ "load $(PKG_LIB_FILE);\
- source [list [file join $$dir tdom.tcl]]"'\
- ) > pkgIndex.tcl
-
-@@ -385,29 +385,30 @@
- #========================================================================
-
- install-lib-binaries: binaries
-- @mkdir -p $(DESTDIR)$(pkglibdir)
-+ @mkdir -p $(DESTDIR)$(libdir)
- @list='$(lib_BINARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- if test "x$$stub" = "xstub"; then \
-- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- else \
-- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- fi; \
- ext=`echo $$p|sed -e "s/.*\.//"`; \
- if test "x$$ext" = "xdll"; then \
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- if test -f $$lib; then \
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- fi; \
- fi; \
- fi; \
- done
-+ @mkdir -p $(DESTDIR)$(pkglibdir)
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- destp=`basename $$p`; \
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
deleted file mode 100644
index 818850bd8ee..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 8e634f2..d9999cf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -72,6 +72,7 @@ AC_CHECK_FUNCS(memmove bcopy)
- #--------------------------------------------------------------------
-
- TDOM_PATH_AOLSERVER
-+TDOM_PATH_EXPAT
-
- #-----------------------------------------------------------------------
- # __CHANGE__
-@@ -83,10 +84,7 @@ TDOM_PATH_AOLSERVER
- # and PKG_TCL_SOURCES.
- #-----------------------------------------------------------------------
-
--TEA_ADD_SOURCES([expat/xmlrole.c \
-- expat/xmltok.c \
-- expat/xmlparse.c \
-- generic/xmlsimple.c \
-+TEA_ADD_SOURCES([generic/xmlsimple.c \
- generic/utf8conv.c \
- generic/dom.c \
- generic/domhtml.c \
-@@ -99,7 +97,7 @@ TEA_ADD_SOURCES([expat/xmlrole.c \
- generic/tclexpat.c \
- generic/tdomStubInit.c])
- TEA_ADD_HEADERS([generic/tdom.h])
--TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
-+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
- TEA_ADD_LIBS([${AOL_LIBS}])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
-diff --git a/tdom.m4 b/tdom.m4
-index f5ecd98..fcab883 100644
---- a/tdom.m4
-+++ b/tdom.m4
-@@ -216,6 +216,46 @@ AC_DEFUN(TDOM_PATH_AOLSERVER, [
- fi
- ])
-
-+
-+AC_DEFUN(TDOM_PATH_EXPAT, [
-+ AC_MSG_CHECKING([for expat])
-+ AC_ARG_WITH(expat,
-+ AC_HELP_STRING([--with-expat],
-+ [directory with expat installation]), , [with_expat=no])
-+
-+ AC_CACHE_VAL(ac_cv_c_expat,[
-+ case $with_expat in
-+ no) ;;
-+ yes)
-+ for f in /usr/local /usr; do
-+ if test -f "$f/include/expat.h" ; then
-+ ac_cv_c_expat=`(cd $f; pwd)`
-+ break
-+ fi
-+ done
-+ ;;
-+ *)
-+ if test -f "$with_expat/include/expat.h"; then
-+ ac_cv_c_expat=`(cd $with_expat; pwd)`
-+ else
-+ AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
-+ fi
-+ esac
-+ ])
-+ if test x"${ac_cv_c_expat}" = x ; then
-+ AC_MSG_RESULT([using local copy])
-+ TEA_ADD_SOURCES([expat/xmlrole.c \
-+ expat/xmltok.c \
-+ expat/xmlparse.c])
-+ TEA_ADD_INCLUDES([-I${srcdir}/expat])
-+ else
-+ AC_MSG_RESULT([${ac_cv_c_expat}])
-+ TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
-+ TEA_ADD_LIBS([-lexpat])
-+ fi
-+])
-+
-+
- #------------------------------------------------------------------------
- # TDOM_PATH_CONFIG --
- #
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
deleted file mode 100644
index f742f6e7f5a..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d995328..5c17e11 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -108,7 +108,7 @@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
- CFLAGS_WARNING = @CFLAGS_WARNING@
- CLEANFILES = @CLEANFILES@
- EXEEXT = @EXEEXT@
--LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -Wl,-soname,libtdom$(PACKAGE_VERSION).so
- MAKE_LIB = @MAKE_LIB@
- MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
-diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
-index f8a332c..01e0ef0 100644
---- a/extensions/tnc/Makefile.in
-+++ b/extensions/tnc/Makefile.in
-@@ -98,7 +98,7 @@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
- CFLAGS_WARNING = @CFLAGS_WARNING@
- CLEANFILES = @CLEANFILES@
- EXEEXT = @EXEEXT@
--LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
- MAKE_LIB = @MAKE_LIB@
- MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
deleted file mode 100644
index 5a805931ca3..00000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- generic/tcldom.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/generic/tcldom.c b/generic/tcldom.c
-index 91d98c9..0f024b3 100644
---- a/generic/tcldom.c
-+++ b/generic/tcldom.c
-@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked (
- ret = Tcl_EvalObj(interp, objv[2]);
- if (ret == TCL_ERROR) {
- char msg[64 + TCL_INTEGER_SPACE];
-+ #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
- sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
- Tcl_GetString(objv[1]), interp->errorLine);
-+ #else
-+ sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
-+ Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
-+ #endif
- Tcl_AddErrorInfo(interp, msg);
- }
-
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
deleted file mode 100644
index 735ee6d3da3..00000000000
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch flag-o-matic multilib toolchain-funcs
-
-MY_P="tDOM-${PV}"
-
-DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
-HOMEPAGE="https://tdom.github.com/"
-#SRC_URI="https://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs threads"
-
-DEPEND="
- dev-lang/tcl:0=
- dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.2.patch
- "${FILESDIR}"/${P}-soname.patch
- "${FILESDIR}"/${P}-expat.patch
- "${FILESDIR}"/${PN}-0.8.2-tnc.patch
- "${FILESDIR}"/${P}-tcl8.6.patch
-)
-
-src_prepare() {
- tc-export AR
- 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 {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
-
- epatch "${PATCHES[@]}"
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable threads)
- --enable-shared
- --disable-tdomalloc
- --with-expat
- --with-tcl="${EPREFIX}"/usr/$(get_libdir)
- )
-
- cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
- cd "${S}"/extensions/tdomhtml && econf ${myeconfargs}
- 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_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
-
- if ! use static-libs; then
- einfo "Removing static libs ..."
- rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2021-10-25 19:57 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2021-10-25 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 5f35ff2c2e9870c41acfb456aa857ab5805af455
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 19:57:07 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 19:57:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f35ff2c
dev-tcltk/tdom: bump 0.9.2
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/Manifest | 1 +
dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch | 28 ++++++++++
dev-tcltk/tdom/tdom-0.9.2.ebuild | 82 +++++++++++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index a2049669de4..086daff6deb 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1 +1,2 @@
DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
+DIST tdom-0.9.2-src.tgz 1215099 BLAKE2B 1d720043ee4acc27d3fad138baced96b291c2e39dc1535fb1927a9968e07324d5e0e0bb0c71d8e5678b8c6f4bb69fb09ce05ac9447712422af0d91c9e06c163e SHA512 ba6611db866f3afffd112887cf6b0f250273f29ab4ed8e29de89405b997a0f7569216f86206040462aba9a4b8548c346bc72945cf7d617cf45a644fa8ded7121
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
new file mode 100644
index 00000000000..cdfdcb8bf81
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2019-12-07 22:00:18.094712146 +0100
++++ b/tclconfig/tcl.m4 2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+- hold_cc=$CC; CC="$TCL_CC"
+ AC_TRY_COMPILE(,[
+ #ifdef _WIN32
+ #error win32
+@@ -446,7 +445,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ]
+ )
+- CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.ac 2019-12-07 22:06:56.954496437 +0100
++++ b/configure.ac 2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
new file mode 100644
index 00000000000..c8dbe69542c
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.9.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 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="static-libs threads"
+
+DEPEND="
+ dev-lang/tcl:0=
+ dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}-src
+
+PATCHES=( "${FILESDIR}"/${P}-useCC.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 {.,extensions/tnc}/configure tclconfig/tcl.m4 || 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
+
+ if ! use static-libs; then
+ einfo "Removing static libs ..."
+ rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2021-12-31 20:25 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2021-12-31 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 63b754832e7537ac7bc657caabc1ae32e457c2b6
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 20:25:41 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 20:25:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b75483
dev-tcltk/tdom: fix build with tcl unthreaded
Closes: https://bugs.gentoo.org/821598
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch | 11 +++++++++++
dev-tcltk/tdom/tdom-0.9.2.ebuild | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
new file mode 100644
index 000000000000..b24c9821f0d4
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
@@ -0,0 +1,11 @@
+--- a/generic/tdomDecls.h 2021-12-31 20:52:18.070370435 +0100
++++ b/generic/tdomDecls.h 2021-12-31 20:53:45.892045820 +0100
+@@ -63,7 +63,7 @@
+ EXTERN domDocument * tcldom_getDocumentFromName(Tcl_Interp *interp,
+ char *docName, char **errMsg);
+ /* 18 */
+-EXTERN SchemaData * tdomGetSchemadata(void);
++EXTERN SchemaData * tdomGetSchemadata(Tcl_Interp *interp);
+
+ typedef struct TdomStubs {
+ int magic;
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
index c8dbe69542c7..29ad01876f00 100644
--- a/dev-tcltk/tdom/tdom-0.9.2.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.2.ebuild
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/${P}-src
-PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-useCC.patch
+ "${FILESDIR}"/${P}-nothreads.patch
+)
src_prepare() {
append-libs -lm
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2024-02-26 7:48 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2024-02-26 7:48 UTC (permalink / raw
To: gentoo-commits
commit: 8e78b4f5cfe5ff2be4a246c0620a79408404071b
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 07:47:34 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 07:48:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e78b4f5
dev-tcltk/tdom: fix for new expat
Closes: https://bugs.gentoo.org/924859
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.3-expat.patch | 10 ++++++++++
dev-tcltk/tdom/tdom-0.9.3.ebuild | 5 ++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch
new file mode 100644
index 000000000000..a55fa4b22c14
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch
@@ -0,0 +1,10 @@
+--- a/generic/dom.h 2024-02-26 08:37:08.464473295 +0100
++++ b/generic/dom.h 2024-02-26 08:43:19.859997138 +0100
+@@ -37,6 +37,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#define XML_GE 1
+ #include <expat.h>
+ #include <domalloc.h>
+
diff --git a/dev-tcltk/tdom/tdom-0.9.3.ebuild b/dev-tcltk/tdom/tdom-0.9.3.ebuild
index 4fce30a261a6..86d97afcb2ba 100644
--- a/dev-tcltk/tdom/tdom-0.9.3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.3.ebuild
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-useCC.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.2-useCC.patch
+ "${FILESDIR}"/${P}-expat.patch
+)
QA_CONFIG_IMPL_DECL_SKIP=(
stat64 arc4random_buf arc4random # used to test for Large File Support
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2024-10-29 17:23 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2024-10-29 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 16baae0250870f34c3ad3c35ecbab86f530009a9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 17:22:56 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 17:22:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16baae02
dev-tcltk/tdom: drop 0.9.2-r1
Bug: https://bugs.gentoo.org/884415
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-tcltk/tdom/Manifest | 1 -
dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch | 11 ----
dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch | 22 -------
dev-tcltk/tdom/tdom-0.9.2-r1.ebuild | 83 -------------------------
4 files changed, 117 deletions(-)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index c5acd1147881..47dc39f63ce2 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,2 +1 @@
-DIST tdom-0.9.2-src.tgz 1215099 BLAKE2B 1d720043ee4acc27d3fad138baced96b291c2e39dc1535fb1927a9968e07324d5e0e0bb0c71d8e5678b8c6f4bb69fb09ce05ac9447712422af0d91c9e06c163e SHA512 ba6611db866f3afffd112887cf6b0f250273f29ab4ed8e29de89405b997a0f7569216f86206040462aba9a4b8548c346bc72945cf7d617cf45a644fa8ded7121
DIST tdom-0.9.3-src.tgz 1319804 BLAKE2B 8b4c50407eaf28c002ec8399d44881b91bef346dca75370c27e06266a5fa90900528a01fc8310d8a250f551e3a627d0d2965a2e85ef8a9132010f7718e5549ce SHA512 71a589465f84721f222b6312f51ee564d11d88a82000a0e5cc1dab4653bffd57347a39936590b62a580e9df59d7266ff3ae4295fe91ff4b9e58f012e80b0cb3e
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch b/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch
deleted file mode 100644
index 4bf5e3b2486e..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/tdom-0.9.2-nothreads.patch b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
deleted file mode 100644
index a0a691fdce60..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/generic/tdomDecls.h 2021-12-31 20:52:18.070370435 +0100
-+++ b/generic/tdomDecls.h 2021-12-31 20:53:45.892045820 +0100
-@@ -63,7 +63,7 @@
- EXTERN domDocument * tcldom_getDocumentFromName(Tcl_Interp *interp,
- char *docName, char **errMsg);
- /* 18 */
--EXTERN SchemaData * tdomGetSchemadata(void);
-+EXTERN SchemaData * tdomGetSchemadata(Tcl_Interp *interp);
-
- typedef struct TdomStubs {
- int magic;
---- a/generic/schema.c 2021-12-31 23:19:47.869682736 +0100
-+++ b/generic/schema.c 2021-12-31 23:20:14.474255669 +0100
-@@ -419,7 +419,7 @@
- }
- #else
- SchemaData *
--tdomGetSchemadata (void)
-+tdomGetSchemadata (Tcl_Interp *interp)
- {
- return GETASI;
- }
diff --git a/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild b/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild
deleted file mode 100644
index fab0aebae09e..000000000000
--- a/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 ~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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2024-11-05 20:11 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2024-11-05 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 2612e90a3af55867f1c3003e3f4d8e4a12a062cb
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 20:10:58 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 20:11:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2612e90a
dev-tcltk/tdom: add 0.9.5
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/Manifest | 1 +
dev-tcltk/tdom/files/tdom-0.9.4-useCC.patch | 28 ++++++++++
dev-tcltk/tdom/tdom-0.9.5.ebuild | 85 +++++++++++++++++++++++++++++
3 files changed, 114 insertions(+)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 47dc39f63ce2..b81e0a19949f 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1 +1,2 @@
DIST tdom-0.9.3-src.tgz 1319804 BLAKE2B 8b4c50407eaf28c002ec8399d44881b91bef346dca75370c27e06266a5fa90900528a01fc8310d8a250f551e3a627d0d2965a2e85ef8a9132010f7718e5549ce SHA512 71a589465f84721f222b6312f51ee564d11d88a82000a0e5cc1dab4653bffd57347a39936590b62a580e9df59d7266ff3ae4295fe91ff4b9e58f012e80b0cb3e
+DIST tdom-0.9.5-src.tgz 1512934 BLAKE2B 4e706d5378f2421fc21742327fe40ac106488c7523f33e90261d05c3969797fa35d7e5f785346c9a83fa6aadeff53a9e11a710d4ce32c38db332018b9e997c49 SHA512 84b35ec00744d04f184638b95d6b34f008087f48852a8734ce17c491f6d4c5f1208a8dcc041b5a3bf0253af41ab91677ab2b2d978d00807c687585e41c909979
diff --git a/dev-tcltk/tdom/files/tdom-0.9.4-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.4-useCC.patch
new file mode 100644
index 000000000000..18af36b7792b
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.4-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2024-11-05 20:59:09.219230897 +0100
++++ b/tclconfig/tcl.m4 2024-11-05 21:01:32.642430617 +0100
+@@ -423,7 +423,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+- hold_cc=$CC; CC="$TCL_CC"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+ #ifdef _WIN32
+ #error win32
+@@ -436,7 +435,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
+ ])
+- CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.ac 2024-11-05 21:02:53.670413146 +0100
++++ b/configure.ac 2024-11-05 21:03:19.630087072 +0100
+@@ -30,6 +30,7 @@
+ TEA_INIT()
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.5.ebuild b/dev-tcltk/tdom/tdom-0.9.5.ebuild
new file mode 100644
index 000000000000..6afb469b02ac
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.9.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+S="${WORKDIR}"/${P}-src
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
+
+DEPEND="
+ dev-lang/tcl:0=
+ dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.4-useCC.patch
+ "${FILESDIR}"/${PN}-0.9.3-expat.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ opendir64 rewinddir64 closedir64 stat64 # used to test for Large File Support
+ arc4random_buf arc4random # used for BSD
+)
+
+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
+ 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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
@ 2025-03-05 7:07 Alfredo Tupone
0 siblings, 0 replies; 9+ messages in thread
From: Alfredo Tupone @ 2025-03-05 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 5a8478e41908a50e1c0e7529a87f31b50a083050
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 4 01:40:37 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar 5 07:07:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8478e4
dev-tcltk/tdom: fix c23
Bug: https://bugs.gentoo.org/943934
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.5-fix-c23.patch | 515 ++++++++++++++++++++++++++
dev-tcltk/tdom/tdom-0.9.5.ebuild | 3 +-
2 files changed, 517 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.5-fix-c23.patch b/dev-tcltk/tdom/files/tdom-0.9.5-fix-c23.patch
new file mode 100644
index 000000000000..ad8a5af4d40b
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.5-fix-c23.patch
@@ -0,0 +1,515 @@
+https://bugs.gentoo.org/943934
+https://core.tcl-lang.org/tdom/info/2db2c391674a7cc3
+
+Amended to remove https://core.tcl-lang.org/tdom/info/8a8dee52e5eb58d4
+
+--- a/generic/datatypes.c
++++ b/generic/datatypes.c
+@@ -225,11 +225,11 @@
+ void *constraintData,
+ char *text
+ )
+ {
+ tclTCData *tcdata = constraintData;
+- int result, bool;
++ int result, boolVal;
+
+ tcdata->evalStub[tcdata->nrArg-1] = Tcl_NewStringObj(text, -1);
+ Tcl_IncrRefCount (tcdata->evalStub[tcdata->nrArg-1]);
+ tcdata->sdata->currentEvals++;
+ result = Tcl_EvalObjv (interp, tcdata->nrArg, tcdata->evalStub,
+@@ -238,15 +238,15 @@
+ Tcl_DecrRefCount (tcdata->evalStub[tcdata->nrArg-1]);
+ if (result != TCL_OK) {
+ tcdata->sdata->evalError = 1;
+ return 0;
+ }
+- result = Tcl_GetBooleanFromObj (interp, Tcl_GetObjResult (interp), &bool);
++ result = Tcl_GetBooleanFromObj (interp, Tcl_GetObjResult (interp), &boolVal);
+ if (result != TCL_OK) {
+ return 0;
+ }
+- if (bool) {
++ if (boolVal) {
+ return 1;
+ }
+ return 0;
+ }
+
+
+--- a/generic/dom.c
++++ b/generic/dom.c
+@@ -5489,11 +5489,11 @@
+ int objc,
+ Tcl_Obj *const objv[]
+ )
+ {
+ CHandlerSet *handlerSet;
+- int methodIndex, result, bool;
++ int methodIndex, result, boolVal;
+ tdomCmdReadInfo *info;
+ TclGenExpatInfo *expat;
+ Tcl_Obj *newObjName = NULL;
+
+ static const char *tdomMethods[] = {
+@@ -5601,14 +5601,14 @@
+ Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
+ return TCL_ERROR;
+ }
+ Tcl_SetIntObj (Tcl_GetObjResult (interp), info->storeLineColumn);
+ if (objc == 4) {
+- if (Tcl_GetBooleanFromObj (interp, objv[3], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[3], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- info->storeLineColumn = bool;
++ info->storeLineColumn = boolVal;
+ }
+ info->tdomStatus = 1;
+ break;
+
+ case m_remove:
+@@ -5656,15 +5656,15 @@
+ if (!info) {
+ Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
+ return TCL_ERROR;
+ }
+ Tcl_SetIntObj (Tcl_GetObjResult (interp), info->ignoreWhiteSpaces);
+- if (Tcl_GetBooleanFromObj (interp, objv[3], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[3], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- info->ignoreWhiteSpaces = !bool;
+- handlerSet->ignoreWhiteCDATAs = !bool;
++ info->ignoreWhiteSpaces = !boolVal;
++ handlerSet->ignoreWhiteCDATAs = !boolVal;
+ info->tdomStatus = 1;
+ break;
+
+ case m_keepCDATA:
+ if (objc != 4) {
+@@ -5680,14 +5680,14 @@
+ info = handlerSet->userData;
+ if (!info) {
+ Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
+ return TCL_ERROR;
+ }
+- if (Tcl_GetBooleanFromObj (interp, objv[3], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[3], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- if (bool) {
++ if (boolVal) {
+ handlerSet->startCdataSectionCommand = tdom_startCDATA;
+ handlerSet->endCdataSectionCommand = endCDATA;
+ } else {
+ handlerSet->startCdataSectionCommand = NULL;
+ handlerSet->endCdataSectionCommand = NULL;
+@@ -5709,15 +5709,15 @@
+ info = handlerSet->userData;
+ if (!info) {
+ Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
+ return TCL_ERROR;
+ }
+- if (Tcl_GetBooleanFromObj (interp, objv[3], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[3], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ expat = GetExpatInfo (interp, objv[1]);
+- expat->keepTextStart = bool;
++ expat->keepTextStart = boolVal;
+ expat->cdataStartLine = 0;
+ break;
+
+ case m_ignorexmlns:
+ info = CHandlerSetGetUserData (interp, objv[1], "tdom");
+@@ -5725,17 +5725,17 @@
+ Tcl_SetResult (interp, "parser object isn't tdom enabled.", NULL);
+ return TCL_ERROR;
+ }
+ Tcl_SetIntObj (Tcl_GetObjResult (interp), info->ignorexmlns);
+ if (objc == 4) {
+- if (Tcl_GetBooleanFromObj (interp, objv[3], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[3], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- info->ignorexmlns = bool;
++ info->ignorexmlns = boolVal;
+ }
+ info->tdomStatus = 1;
+ break;
+
+ }
+
+ return TCL_OK;
+ }
+
+--- a/generic/tcldom.c
++++ b/generic/tcldom.c
+@@ -3400,12 +3400,12 @@
+ typedef struct
+ {
+ Tcl_Obj *object;
+ Tcl_Obj *array;
+ Tcl_Obj *null;
+- Tcl_Obj *true;
+- Tcl_Obj *false;
++ Tcl_Obj *trueVal;
++ Tcl_Obj *falseVal;
+ Tcl_Obj *number;
+ Tcl_Obj *string;
+ } asTypedListTypes;
+
+
+@@ -3476,14 +3476,14 @@
+ switch (node->info) {
+ case JSON_NULL:
+ Tcl_ListObjAppendElement (NULL, resultObj, c->null);
+ break;
+ case JSON_TRUE:
+- Tcl_ListObjAppendElement (NULL, resultObj, c->true);
++ Tcl_ListObjAppendElement (NULL, resultObj, c->trueVal);
+ break;
+ case JSON_FALSE:
+- Tcl_ListObjAppendElement (NULL, resultObj, c->false);
++ Tcl_ListObjAppendElement (NULL, resultObj, c->falseVal);
+ break;
+ case JSON_NUMBER:
+ textNode = (domTextNode *)node;
+ if (isJSONNumber (textNode->nodeValue, textNode->valueLength)) {
+ Tcl_ListObjAppendElement(NULL, resultObj, c->number);
+@@ -3520,20 +3520,20 @@
+ }
+
+ c.object = Tcl_NewStringObj ("OBJECT", 6);
+ c.array = Tcl_NewStringObj ("ARRAY", 5);
+ c.null = Tcl_NewStringObj ("NULL", 4);
+- c.true = Tcl_NewStringObj ("TRUE", 4);
+- c.false = Tcl_NewStringObj ("FALSE", 5);
++ c.trueVal = Tcl_NewStringObj ("TRUE", 4);
++ c.falseVal = Tcl_NewStringObj ("FALSE", 5);
+ c.number = Tcl_NewStringObj ("NUMBER", 6);
+ c.string = Tcl_NewStringObj ("STRING", 6);
+
+ Tcl_IncrRefCount (c.object);
+ Tcl_IncrRefCount (c.array);
+ Tcl_IncrRefCount (c.null);
+- Tcl_IncrRefCount (c.true);
+- Tcl_IncrRefCount (c.false);
++ Tcl_IncrRefCount (c.trueVal);
++ Tcl_IncrRefCount (c.falseVal);
+ Tcl_IncrRefCount (c.number);
+ Tcl_IncrRefCount (c.string);
+
+ if (node->nodeType == ELEMENT_NODE
+ && node->info == 0
+@@ -3547,12 +3547,12 @@
+ tcldom_treeAsTypedListWorker (node, &c));
+
+ Tcl_DecrRefCount (c.object);
+ Tcl_DecrRefCount (c.array);
+ Tcl_DecrRefCount (c.null);
+- Tcl_DecrRefCount (c.true);
+- Tcl_DecrRefCount (c.false);
++ Tcl_DecrRefCount (c.trueVal);
++ Tcl_DecrRefCount (c.falseVal);
+ Tcl_DecrRefCount (c.number);
+ Tcl_DecrRefCount (c.string);
+ }
+
+ /*----------------------------------------------------------------------------
+@@ -3600,11 +3600,11 @@
+ Tcl_Obj *const objv[]
+ )
+ {
+ char *channelId, prefix[MAX_PREFIX_LEN];
+ const char *localName;
+- int indent, mode, bool;
++ int indent, mode, boolVal;
+ int outputFlags = 0;
+ int optionIndex, cdataChild;
+ Tcl_Obj *resultPtr, *encString = NULL;
+ Tcl_Channel chan = (Tcl_Channel) NULL;
+ Tcl_HashEntry *h;
+@@ -3716,15 +3716,15 @@
+ if (objc < 4) {
+ SetResult("-doctypeDeclaration must have a boolean value "
+ "as argument");
+ goto cleanup;
+ }
+- if (Tcl_GetBooleanFromObj(interp, objv[3], &bool)
++ if (Tcl_GetBooleanFromObj(interp, objv[3], &boolVal)
+ != TCL_OK) {
+ goto cleanup;
+ }
+- if (bool) outputFlags |= SERIALIZE_DOCTYPE_DECLARATION;
++ if (boolVal) outputFlags |= SERIALIZE_DOCTYPE_DECLARATION;
+ objc -= 2;
+ objv += 2;
+ break;
+
+ case m_xmlDeclaration:
+@@ -3731,15 +3731,15 @@
+ if (objc < 4) {
+ SetResult("-xmlDeclaration must have a boolean value "
+ "as argument");
+ goto cleanup;
+ }
+- if (Tcl_GetBooleanFromObj(interp, objv[3], &bool)
++ if (Tcl_GetBooleanFromObj(interp, objv[3], &boolVal)
+ != TCL_OK) {
+ goto cleanup;
+ }
+- if (bool) outputFlags |= SERIALIZE_XML_DECLARATION;
++ if (boolVal) outputFlags |= SERIALIZE_XML_DECLARATION;
+ objc -= 2;
+ objv += 2;
+ break;
+
+ case m_encString:
+@@ -4933,11 +4933,11 @@
+ const char *localName, *uri, *nsStr;
+ int result, methodIndex, i;
+ domLength length;
+ XML_Size line, column;
+ XML_Index byteIndex;
+- int nsIndex, bool, hnew, legacy, jsonType;
++ int nsIndex, boolVal, hnew, legacy, jsonType;
+ Tcl_Obj *namePtr, *resultPtr;
+ Tcl_Obj *mobjv[MAX_REWRITE_ARGS], *storedErrMsg;
+ Tcl_CmdInfo cmdInfo;
+ Tcl_HashEntry *h;
+
+@@ -5945,14 +5945,14 @@
+ return TCL_ERROR;
+ }
+ SetIntResult(
+ (((node->nodeFlags & DISABLE_OUTPUT_ESCAPING) == 0) ? 0 : 1));
+ if (objc == 3) {
+- if (Tcl_GetBooleanFromObj(interp, objv[2], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objv[2], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- if (bool) {
++ if (boolVal) {
+ node->nodeFlags |= DISABLE_OUTPUT_ESCAPING;
+ } else {
+ node->nodeFlags &= (~DISABLE_OUTPUT_ESCAPING);
+ }
+ }
+@@ -5990,20 +5990,20 @@
+ FREE (str);
+ return TCL_OK;
+
+ case m_normalize:
+ CheckArgs (2,3,2, "?-forXPath?");
+- bool = 0;
++ boolVal = 0;
+ if (objc == 3) {
+ if (strcmp (Tcl_GetString(objv[2]), "-forXPath") == 0) {
+- bool = 1;
++ boolVal = 1;
+ } else {
+ SetResult("unknown option! Options: ?-forXPath?");
+ return TCL_ERROR;
+ }
+ }
+- domNormalize (node, bool, tcldom_deleteNode, interp);
++ domNormalize (node, boolVal, tcldom_deleteNode, interp);
+ return TCL_OK;
+
+ case m_jsonType:
+ CheckArgs (2,3,2, "?jsonType?");
+ if (node->nodeType != ELEMENT_NODE
+@@ -6073,11 +6073,11 @@
+
+ domDeleteInfo * dinfo;
+ domDocument * doc;
+ char * method, *tag, *data, *target, *uri, tmp[100];
+ char * str, *docName, *errMsg;
+- int methodIndex, result, i, nsIndex, forXPath, bool;
++ int methodIndex, result, i, nsIndex, forXPath, boolVal;
+ int setDocumentElement = 0, restoreDomCreateCmdMode = 0;
+ domLength data_length, target_length;
+ domNode * n;
+ Tcl_CmdInfo cmdInfo;
+ Tcl_Obj * mobjv[MAX_REWRITE_ARGS], *storedErrMsg;
+@@ -6420,14 +6420,14 @@
+ SetBooleanResult (1);
+ } else {
+ SetBooleanResult(0);
+ }
+ if (objc == 3) {
+- if (Tcl_GetBooleanFromObj (interp, objv[2], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objv[2], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- if (bool) {
++ if (boolVal) {
+ doc->nodeFlags |= OUTPUT_DEFAULT_INDENT;
+ } else {
+ doc->nodeFlags &= ~OUTPUT_DEFAULT_INDENT;
+ }
+ }
+@@ -7831,11 +7831,11 @@
+ {
+ GetTcldomDATA;
+
+ char * method, tmp[300], *string, *option,
+ *replacement;
+- int methodIndex, result, i, bool, changed;
++ int methodIndex, result, i, boolVal, changed;
+ domLength repllen;
+ Tcl_CmdInfo cmdInfo;
+ Tcl_Obj * mobjv[MAX_REWRITE_ARGS], *newObj, *storedErrMsg;
+ Tcl_DString cleardString, escapedStr;
+
+@@ -7992,34 +7992,34 @@
+ break;
+ #endif
+
+ case m_setStoreLineColumn:
+ if (objc == 3) {
+- if (Tcl_GetBooleanFromObj(interp, objv[2], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objv[2], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- TcldomDATA(storeLineColumn) = bool;
++ TcldomDATA(storeLineColumn) = boolVal;
+ }
+ SetBooleanResult(TcldomDATA(storeLineColumn));
+ return TCL_OK;
+
+ case m_setNameCheck:
+ if (objc == 3) {
+- if (Tcl_GetBooleanFromObj(interp, objv[2], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objv[2], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- TcldomDATA(dontCheckName) = !bool;
++ TcldomDATA(dontCheckName) = !boolVal;
+ }
+ SetBooleanResult(!TcldomDATA(dontCheckName));
+ return TCL_OK;
+
+ case m_setTextCheck:
+ if (objc == 3) {
+- if (Tcl_GetBooleanFromObj(interp, objv[2], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objv[2], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- TcldomDATA(dontCheckCharData) = !bool;
++ TcldomDATA(dontCheckCharData) = !boolVal;
+ }
+ SetBooleanResult(!TcldomDATA(dontCheckCharData));
+ return TCL_OK;
+
+ case m_setObjectCommands:
+
+--- a/generic/tclexpat.c
++++ b/generic/tclexpat.c
+@@ -1265,11 +1265,11 @@
+ enum paramEntityParsingValues {
+ EXPAT_PARAMENTITYPARSINGALWAYS,
+ EXPAT_PARAMENTITYPARSINGNEVER,
+ EXPAT_PARAMENTITYPARSINGNOTSTANDALONE
+ };
+- int optionIndex, value, bool;
++ int optionIndex, value, boolVal;
+ Tcl_Obj *const *objPtr = objv;
+ Tcl_CmdInfo cmdInfo;
+ int rc;
+ domLength len;
+ char *handlerSetName = NULL;
+@@ -1394,15 +1394,15 @@
+ #endif
+ break;
+
+ case EXPAT_FINAL: /* -final */
+
+- if (Tcl_GetBooleanFromObj(interp, objPtr[1], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objPtr[1], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+
+- expat->final = bool;
++ expat->final = boolVal;
+ break;
+
+ case EXPAT_BASE: /* -baseurl */
+
+ if (expat->baseURI) {
+@@ -1591,22 +1591,22 @@
+ }
+ break;
+
+ case EXPAT_USEFOREIGNDTD: /* -useForeignDTD */
+
+- if (Tcl_GetBooleanFromObj (interp, objPtr[1], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objPtr[1], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ if (expat->parser) {
+ /* Cannot be changed after parsing as started (which is
+ kind of understandable). */
+- if (XML_UseForeignDTD (expat->parser, (unsigned char)bool)
++ if (XML_UseForeignDTD (expat->parser, (unsigned char)boolVal)
+ != XML_ERROR_NONE) {
+- expat->useForeignDTD = bool;
++ expat->useForeignDTD = boolVal;
+ }
+ } else {
+- expat->useForeignDTD = bool;
++ expat->useForeignDTD = boolVal;
+ }
+ break;
+
+ case EXPAT_COMMENTCMD: /* -commentcommand */
+ /* ericm@scriptics.com */
+@@ -1774,37 +1774,37 @@
+ }
+ }
+ break;
+
+ case EXPAT_NOEXPAND:
+- if (Tcl_GetBooleanFromObj (interp, objPtr[1], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objPtr[1], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+- if (bool) {
++ if (boolVal) {
+ XML_SetDefaultHandler( expat->parser,
+ TclGenExpatDefaultHandler);
+ } else {
+ XML_SetDefaultHandlerExpand( expat->parser,
+ TclGenExpatDefaultHandler);
+ }
+- expat->noexpand = bool;
++ expat->noexpand = boolVal;
+ break;
+
+ case EXPAT_FASTCALL:
+- if (Tcl_GetBooleanFromObj (interp, objPtr[1], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj (interp, objPtr[1], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+ CheckDefaultTclHandlerSet;
+- activeTclHandlerSet->fastCall = bool;
++ activeTclHandlerSet->fastCall = boolVal;
+ break;
+
+ case EXPAT_KEEPTEXTSTART:
+- if (Tcl_GetBooleanFromObj(interp, objPtr[1], &bool) != TCL_OK) {
++ if (Tcl_GetBooleanFromObj(interp, objPtr[1], &boolVal) != TCL_OK) {
+ return TCL_ERROR;
+ }
+
+- expat->keepTextStart = bool;
++ expat->keepTextStart = boolVal;
+ break;
+
+ #ifndef TDOM_NO_SCHEMA
+ case EXPAT_VALIDATECMD:
+ schemacmd = Tcl_GetString (objv[1]);
+
+
diff --git a/dev-tcltk/tdom/tdom-0.9.5.ebuild b/dev-tcltk/tdom/tdom-0.9.5.ebuild
index 6afb469b02ac..7e3bca865213 100644
--- a/dev-tcltk/tdom/tdom-0.9.5.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.4-useCC.patch
"${FILESDIR}"/${PN}-0.9.3-expat.patch
+ "${FILESDIR}"/${PN}-0.9.5-fix-c23.patch
)
QA_CONFIG_IMPL_DECL_SKIP=(
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-03-05 7:07 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-05 7:07 [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-11-05 20:11 Alfredo Tupone
2024-10-29 17:23 Andreas K. Hüttel
2024-02-26 7:48 Alfredo Tupone
2021-12-31 20:25 Alfredo Tupone
2021-10-25 19:57 Alfredo Tupone
2021-04-19 7:58 Andreas Sturmlechner
2019-12-07 21:15 Alfredo Tupone
2019-11-04 8:12 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox