diff options
Diffstat (limited to 'dev-tcltk/tktable')
| -rw-r--r-- | dev-tcltk/tktable/Manifest | 1 | ||||
| -rw-r--r-- | dev-tcltk/tktable/files/tktable-2.10-clang6.patch | 80 | ||||
| -rw-r--r-- | dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch | 12 | ||||
| -rw-r--r-- | dev-tcltk/tktable/files/tktable-2.10.8-clang6.patch | 20 | ||||
| -rw-r--r-- | dev-tcltk/tktable/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-tcltk/tktable/tktable-2.10-r2.ebuild (renamed from dev-tcltk/tktable/tktable-2.10.ebuild) | 12 | ||||
| -rw-r--r-- | dev-tcltk/tktable/tktable-2.10.8.ebuild | 35 |
7 files changed, 158 insertions, 5 deletions
diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest index 47558485893b..fedd8cd14556 100644 --- a/dev-tcltk/tktable/Manifest +++ b/dev-tcltk/tktable/Manifest @@ -1 +1,2 @@ DIST Tktable2.10.tar.gz 284135 BLAKE2B ff3a37aac53418e7993a310d38ae23b7ec2673e0b44c118ff558a6c3c3805b39bf77f099287e91298fb4a6afacebde68a09171c6b90ecd11f48ac2a33fa3b312 SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899 +DIST tktable-2.10.8.tar.gz 308245 BLAKE2B 4ede838e8553244dabd71d9543094bf5dfc82bd74f31ac9b4d4eea7bb2ee7406d90b16198d700eddfccd236160be1b7ed9a1f72f4760a71cddde5e01927ebb42 SHA512 927dad616306f0af477d1ce801ded962d966f7b46904b0a6b6772d1c9140310ff4c93a90ad4cb228495febae8be5f3ded9a328f621ba34195a339fc29d000f04 diff --git a/dev-tcltk/tktable/files/tktable-2.10-clang6.patch b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch new file mode 100644 index 000000000000..af5eea359442 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10-clang6.patch @@ -0,0 +1,80 @@ +--- a/generic/tkTable.h 2023-01-17 21:57:06.986859146 +0100 ++++ b/generic/tkTable.h 2023-01-17 21:59:18.730802234 +0100 +@@ -526,7 +526,7 @@ + extern int TableOptionBdSet(ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset); +-extern char * TableOptionBdGet(ClientData clientData, ++extern const char *TableOptionBdGet(ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr); + extern int TableTagConfigureBd(Table *tablePtr, +@@ -535,7 +535,7 @@ + Tcl_Interp *interp, + Tk_Window unused, CONST84 char *value, + char *widgRec, int offset); +-extern char * Cmd_OptionGet(ClientData clientData, ++extern const char *Cmd_OptionGet(ClientData clientData, + Tk_Window unused, char *widgRec, + int offset, Tcl_FreeProc **freeProcPtr); + +--- a/generic/tkTableWin.c 2023-01-17 22:09:00.225476183 +0100 ++++ b/generic/tkTableWin.c 2023-01-17 22:02:24.739108283 +0100 +@@ -17,7 +17,7 @@ + static int StickyParseProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * StickyPrintProc _ANSI_ARGS_((ClientData clientData, ++static const char *StickyPrintProc _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -117,7 +117,7 @@ + * + *---------------------------------------------------------------------- + */ +-static char * ++static const char * + StickyPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Ignored. */ + Tk_Window tkwin; /* Window for text widget. */ +--- a/generic/tkTableTag.c 2023-01-17 22:12:25.754449096 +0100 ++++ b/generic/tkTableTag.c 2023-01-17 22:12:49.819092428 +0100 +@@ -22,7 +22,7 @@ + static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, ++static const char *TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -1340,7 +1340,7 @@ + *---------------------------------------------------------------------- + */ + +-static char * ++static const char * + TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +--- a/generic/tkTableUtil.c 2023-01-17 22:13:28.610516868 +0100 ++++ b/generic/tkTableUtil.c 2023-01-17 22:14:07.003963494 +0100 +@@ -169,7 +169,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + TableOptionBdGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ +@@ -329,7 +329,7 @@ + *---------------------------------------------------------------------- + */ + +-char * ++const char * + Cmd_OptionGet(ClientData clientData, Tk_Window unused, + char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) + { diff --git a/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch b/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch new file mode 100644 index 000000000000..534a0a83b901 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10-parallelMake.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in 2023-01-17 21:41:13.532754760 +0100 ++++ b/Makefile.in 2023-01-17 21:41:35.153416999 +0100 +@@ -189,7 +189,8 @@ + # for the BINARIES that you specified above have already been done. + #======================================================================== + +-all: binaries libraries doc ++all: tkTable.tcl.h ++ $(MAKE) binaries libraries doc + + #======================================================================== + # The binaries target builds executable programs, Windows .dll's, unix diff --git a/dev-tcltk/tktable/files/tktable-2.10.8-clang6.patch b/dev-tcltk/tktable/files/tktable-2.10.8-clang6.patch new file mode 100644 index 000000000000..ddf87cbe6814 --- /dev/null +++ b/dev-tcltk/tktable/files/tktable-2.10.8-clang6.patch @@ -0,0 +1,20 @@ +--- a/generic/tkTableTag.c 2023-01-17 22:12:25.754449096 +0100 ++++ b/generic/tkTableTag.c 2023-01-17 22:12:49.819092428 +0100 +@@ -22,7 +22,7 @@ + static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value, char *widgRec, int offset)); +-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, ++static const char *TableOptionReliefGet _ANSI_ARGS_((ClientData clientData, + Tk_Window tkwin, char *widgRec, int offset, + Tcl_FreeProc **freeProcPtr)); + +@@ -1340,7 +1340,7 @@ + *---------------------------------------------------------------------- + */ + +-static char * ++static const char * + TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr) + ClientData clientData; /* Type of struct being set. */ + Tk_Window tkwin; /* Window containing canvas widget. */ diff --git a/dev-tcltk/tktable/metadata.xml b/dev-tcltk/tktable/metadata.xml index fb33b8e74e9d..b29e11480553 100644 --- a/dev-tcltk/tktable/metadata.xml +++ b/dev-tcltk/tktable/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>tcltk@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">tktable</remote-id> + <remote-id type="github">wjoye/tktable</remote-id> </upstream> </pkgmetadata> diff --git a/dev-tcltk/tktable/tktable-2.10.ebuild b/dev-tcltk/tktable/tktable-2.10-r2.ebuild index 52a27f766a8f..1a7cc534e8f1 100644 --- a/dev-tcltk/tktable/tktable-2.10.ebuild +++ b/dev-tcltk/tktable/tktable-2.10-r2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_P="Tktable${PV}" DESCRIPTION="full-featured 2D table widget" HOMEPAGE="http://tktable.sourceforge.net/" -SRC_URI="mirror://sourceforge/tktable/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/tktable/${MY_P}.tar.gz" LICENSE="BSD" KEYWORDS="amd64 ppc x86" SLOT="0" -IUSE="" DEPEND=">=dev-lang/tk-8.0:=" RDEPEND="${DEPEND}" @@ -22,6 +21,11 @@ S=${WORKDIR}/${MY_P} HTML_DOCS=( doc/tkTable.html ) DOCS=( ChangeLog README.txt release.txt ) +PATCHES=( + "${FILESDIR}"/${P}-parallelMake.patch + "${FILESDIR}"/${P}-clang6.patch +) + src_prepare() { default sed -e '/^install:/{s: install-doc::}' \ diff --git a/dev-tcltk/tktable/tktable-2.10.8.ebuild b/dev-tcltk/tktable/tktable-2.10.8.ebuild new file mode 100644 index 000000000000..2215efce4811 --- /dev/null +++ b/dev-tcltk/tktable/tktable-2.10.8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="full-featured 2D table widget" +HOMEPAGE="https://github.com/wjoye/tktable" +SRC_URI="https://github.com/wjoye/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="amd64 ~arm64 ppc x86" +SLOT="0" +RESTRICT="test" + +DEPEND=">=dev-lang/tk-8.0:=" +RDEPEND="${DEPEND}" + +HTML_DOCS=( doc/tkTable.html ) +DOCS=( ChangeLog README.txt release.txt ) + +QA_CONFIG_IMPL_DECL_SKIP=( + opendir64 rewinddir64 closedir64 stat64 # used on AIX +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.10-parallelMake.patch + "${FILESDIR}"/${P}-clang6.patch +) + +src_prepare() { + default + sed -e '/^install:/{s: install-doc::}' \ + -e '/^PKG_EXTRA_FILES/{s:=.*:=:}' -i Makefile.in || die +} |