From 220240f060e150ba4c4bb2d0f2a07f7c8f9de480 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 18 Jan 2023 17:57:26 +0000 Subject: gentoo auto-resync : 18:01:2023 - 17:57:26 --- dev-tcltk/tix/Manifest | 3 +- dev-tcltk/tix/files/tix-8.4.3-clang6.patch | 114 +++++++++++++++++++++++++++++ dev-tcltk/tix/tix-8.4.3-r2.ebuild | 70 ------------------ dev-tcltk/tix/tix-8.4.3-r3.ebuild | 71 ++++++++++++++++++ 4 files changed, 187 insertions(+), 71 deletions(-) create mode 100644 dev-tcltk/tix/files/tix-8.4.3-clang6.patch delete mode 100644 dev-tcltk/tix/tix-8.4.3-r2.ebuild create mode 100644 dev-tcltk/tix/tix-8.4.3-r3.ebuild (limited to 'dev-tcltk/tix') diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest index d361b63d7b5b..c769659868df 100644 --- a/dev-tcltk/tix/Manifest +++ b/dev-tcltk/tix/Manifest @@ -1,7 +1,8 @@ +AUX tix-8.4.3-clang6.patch 4875 BLAKE2B a8888285f32a8d4d81caed4ef045eca94aa1395508394fcd4109df01a679a6c9714c454a96dcdaba2f044d5a4eb935da7bb3f1cbc7eab55a7b89a294c91eea0f SHA512 8d98e88d487f79c9d0f984f5a5bc42189e226ac18517ef8acccfa9c0a2c5f3116d3a34e2bd34b26fe220e2ac98c589699cdb5e10e5b812d52ef20d5058fbdfca AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8e418139ccf4802e8057f198b95a64bc4cac17fc4daa259f925d4b8e831f035a702f2931b80f15d5d67984 SHA512 e220035cc8d71592dfe72e73e1fb92f79f7750b5c8a97d749bdb67aef9488a3684aad7873041ba6054083287c758889cb243d6cac5b83281f738b1392f29a821 AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e AUX tix-8.4.3-wimplicit-int.patch 1246 BLAKE2B 8181dc38d064bbbfb20708b6d02ef70b38e97fbc34a08a9985869fc370396470eb944dfbf51652888016088cdb764025e1297a63c8883643b1027dca38a1c930 SHA512 5465d7878beac8fd474e58301b4a5230c8863e2f70412b486abb2bd538614361ba9035fb9ac8f118de2836af7d0aa62f6ef63a10fd7d06204355233c51070365 DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852 -EBUILD tix-8.4.3-r2.ebuild 1430 BLAKE2B b2d57853f372253afaeb64fdc49ce249661db7afbc17c36cbde95ad798f378b0f12d6d1f477c3becb8645900c0d079e5c18548c39040495293c0f0ed1931b941 SHA512 bfd63034719d951cffc13bc6bce83fb740a9e9da52ff23c227a560ff31eb37136e38075e19ca1431df436e13d0b90c3fc445c896787eec7f49064f648a4bfdb1 +EBUILD tix-8.4.3-r3.ebuild 1463 BLAKE2B bb2daa8800e641d39602080875240553fc84eb4231f20e03157d9ae443bb4886957fcb78536771661fd2a6e6c104fd8c8a2e029cef27b7dc652357b35018614e SHA512 ebf480ca84efb3e9aaa872e60899e888f47abdfeb931097a3729c899d7b9e49d20cbf8a03536e8ff9e08c1916231822a1356935f50544b3e487c48c5ea302442 MISC metadata.xml 327 BLAKE2B dd176eab1909873ba46ff7cb9b18031de4d7728f71427fc7fbbabbe988fda69020904f1d504b0f4cec968ae5de36fd893db5a20e3d5127eadf34ed629bc376d6 SHA512 d4289ef32294e0bdaa4d2111cfaf38e781808af2af0a9781993db085e1f4fdd7d84f7d975fd4f47d2c23aee63792ff01ce036588afdce4e695e0f883b2fe26bb diff --git a/dev-tcltk/tix/files/tix-8.4.3-clang6.patch b/dev-tcltk/tix/files/tix-8.4.3-clang6.patch new file mode 100644 index 000000000000..a33984ddf225 --- /dev/null +++ b/dev-tcltk/tix/files/tix-8.4.3-clang6.patch @@ -0,0 +1,114 @@ +--- a/generic/tixDiStyle.c 2023-01-18 12:17:57.150995223 +0100 ++++ b/generic/tixDiStyle.c 2023-01-18 12:18:33.855410140 +0100 +@@ -31,7 +31,7 @@ + static int DItemStyleParseProc _ANSI_ARGS_((ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, + CONST84 char *value,char *widRec, int offset)); +-static char * DItemStylePrintProc _ANSI_ARGS_(( ++static const char *DItemStylePrintProc _ANSI_ARGS_(( + ClientData clientData, Tk_Window tkwin, + char *widRec, int offset, + Tcl_FreeProc **freeProcPtr)); +@@ -998,7 +998,7 @@ + return TCL_ERROR; + } + +-static char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr) ++static const char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr) + ClientData clientData; + Tk_Window tkwin; + char *widRec; +--- a/generic/tixDItem.c 2023-01-18 12:16:16.448599643 +0100 ++++ b/generic/tixDItem.c 2023-01-18 12:16:48.979081490 +0100 +@@ -30,7 +30,7 @@ + Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value, + char *widRec, int offset)); + +-static char *DItemPrintProc _ANSI_ARGS_(( ++static const char *DItemPrintProc _ANSI_ARGS_(( + ClientData clientData, Tk_Window tkwin, char *widRec, + int offset, Tcl_FreeProc **freeProcPtr)); + +@@ -548,7 +548,7 @@ + return TCL_OK; + } + +-static char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) ++static const char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) + ClientData clientData; + Tk_Window tkwin; + char *widRec; +--- a/generic/tixImgCmp.c 2023-01-18 12:19:03.138943264 +0100 ++++ b/generic/tixImgCmp.c 2023-01-18 12:21:32.884554265 +0100 +@@ -142,8 +142,8 @@ + * The type record for bitmap images: + */ + static int ImgCmpCreate _ANSI_ARGS_((Tcl_Interp *interp, +- char *name, int argc, Tcl_Obj *CONST objv[], +- Tk_ImageType *typePtr, Tk_ImageMaster master, ++ const char *name, int argc, Tcl_Obj *CONST objv[], ++ const Tk_ImageType *typePtr, Tk_ImageMaster master, + ClientData *clientDataPtr)); + static ClientData ImgCmpGet _ANSI_ARGS_((Tk_Window tkwin, + ClientData clientData)); +@@ -378,11 +378,11 @@ + ImgCmpCreate(interp, name, argc, objv, typePtr, master, clientDataPtr) + Tcl_Interp *interp; /* Interpreter for application containing + * image. */ +- char *name; /* Name to use for image. */ ++ const char *name; /* Name to use for image. */ + int argc; /* Number of arguments. */ + Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't + * include image name or type). */ +- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ ++ const Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ + Tk_ImageMaster master; /* Token for image, to be used by us in + * later callbacks. */ + ClientData *clientDataPtr; /* Store manager's token for image here; +--- a/generic/tixImgXpm.c 2023-01-18 12:22:25.967706824 +0100 ++++ b/generic/tixImgXpm.c 2023-01-18 12:23:05.589074088 +0100 +@@ -22,8 +22,8 @@ + */ + + static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp, +- char *name, int argc, Tcl_Obj *CONST objv[], +- Tk_ImageType *typePtr, Tk_ImageMaster master, ++ const char *name, int argc, Tcl_Obj *CONST objv[], ++ const Tk_ImageType *typePtr, Tk_ImageMaster master, + ClientData *clientDataPtr)); + static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin, + ClientData clientData)); +@@ -115,11 +115,11 @@ + ImgXpmCreate(interp, name, argc, objv, typePtr, master, clientDataPtr) + Tcl_Interp *interp; /* Interpreter for application containing + * image. */ +- char *name; /* Name to use for image. */ ++ const char *name; /* Name to use for image. */ + int argc; /* Number of arguments. */ + Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't + * include image name or type). */ +- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ ++ const Tk_ImageType *typePtr; /* Pointer to our type record (not used). */ + Tk_ImageMaster master; /* Token for image, to be used by us in + * later callbacks. */ + ClientData *clientDataPtr; /* Store manager's token for image here; +--- a/generic/tixUtils.c 2023-01-18 12:14:01.374751235 +0100 ++++ b/generic/tixUtils.c 2023-01-18 12:14:36.414192268 +0100 +@@ -24,7 +24,7 @@ + static int ReliefParseProc(ClientData clientData, + Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value, + char *widRec, int offset); +-static char * ReliefPrintProc(ClientData clientData, ++static const char *ReliefPrintProc(ClientData clientData, + Tk_Window tkwin, char *widRec, int offset, + Tix_FreeProc **freeProcPtr); + +@@ -637,7 +637,7 @@ + return TCL_ERROR; + } + +-static char * ++static const char * + ReliefPrintProc(clientData, tkwin, widRec,offset, freeProcPtr) + ClientData clientData; + Tk_Window tkwin; diff --git a/dev-tcltk/tix/tix-8.4.3-r2.ebuild b/dev-tcltk/tix/tix-8.4.3-r2.ebuild deleted file mode 100644 index 3eef52a79f09..000000000000 --- a/dev-tcltk/tix/tix-8.4.3-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="Tix${PV}" -DESCRIPTION="A widget library for Tcl/Tk" -HOMEPAGE="http://tix.sourceforge.net/" -SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -RESTRICT="test" - -DEPEND=" - dev-lang/tk:= - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-tcl8.5.patch - "${FILESDIR}"/${P}-tcl8.6.patch - "${FILESDIR}"/${P}-wimplicit-int.patch -) - -src_prepare() { - [[ ${CHOST} == *-darwin* ]] || eapply "${FILESDIR}"/${P}-link.patch - - sed \ - -e 's:-Os::g' \ - -i configure tclconfig/tcl.m4 || die - default -} - -src_configure() { - econf \ - --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ - --with-tk="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - DOCS=( ChangeLog README.txt docs/*.txt ) - HTML_DOCS=( - index.html - ABOUT.html - docs/*.html - docs/html - docs/img - docs/tix-book - ) - - default - - # Bug #168897 - doheader generic/tix.h - - # Bug #201138 - if [[ ${CHOST} == *-darwin* ]] ; then - mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib || die - dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib - else - dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so - fi -} diff --git a/dev-tcltk/tix/tix-8.4.3-r3.ebuild b/dev-tcltk/tix/tix-8.4.3-r3.ebuild new file mode 100644 index 000000000000..b1aa7a279451 --- /dev/null +++ b/dev-tcltk/tix/tix-8.4.3-r3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="Tix${PV}" +DESCRIPTION="A widget library for Tcl/Tk" +HOMEPAGE="http://tix.sourceforge.net/" +SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +RESTRICT="test" + +DEPEND=" + dev-lang/tk:= + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-tcl8.5.patch + "${FILESDIR}"/${P}-tcl8.6.patch + "${FILESDIR}"/${P}-wimplicit-int.patch + "${FILESDIR}"/${P}-clang6.patch +) + +src_prepare() { + [[ ${CHOST} == *-darwin* ]] || eapply "${FILESDIR}"/${P}-link.patch + + sed \ + -e 's:-Os::g' \ + -i configure tclconfig/tcl.m4 || die + default +} + +src_configure() { + econf \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ + --with-tk="${EPREFIX}/usr/$(get_libdir)" +} + +src_install() { + DOCS=( ChangeLog README.txt docs/*.txt ) + HTML_DOCS=( + index.html + ABOUT.html + docs/*.html + docs/html + docs/img + docs/tix-book + ) + + default + + # Bug #168897 + doheader generic/tix.h + + # Bug #201138 + if [[ ${CHOST} == *-darwin* ]] ; then + mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib || die + dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib + else + dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so + fi +} -- cgit v1.2.3