diff options
author | 2014-06-02 18:34:02 -0700 | |
---|---|---|
committer | 2014-06-02 18:34:02 -0700 | |
commit | 65fc338462eee3a97a0f3e2d6693f7ae2921ac62 (patch) | |
tree | ffe44f782ce1af29c2122ffa2d3a9db19244db47 /dev-tcltk | |
parent | eclass/python-multilib{,-utils}-r1: best->native (diff) | |
download | gmt-65fc338462eee3a97a0f3e2d6693f7ae2921ac62.tar.gz gmt-65fc338462eee3a97a0f3e2d6693f7ae2921ac62.tar.bz2 gmt-65fc338462eee3a97a0f3e2d6693f7ae2921ac62.zip |
dev-tcltk/tix: clone upstream
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-tcltk')
-rw-r--r-- | dev-tcltk/tix/ChangeLog | 154 | ||||
-rw-r--r-- | dev-tcltk/tix/Manifest | 7 | ||||
-rw-r--r-- | dev-tcltk/tix/files/tix-8.4.3-link.patch | 11 | ||||
-rw-r--r-- | dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch | 190 | ||||
-rw-r--r-- | dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch | 18 | ||||
-rw-r--r-- | dev-tcltk/tix/metadata.xml | 5 | ||||
-rw-r--r-- | dev-tcltk/tix/tix-8.4.3-r2.ebuild | 61 |
7 files changed, 446 insertions, 0 deletions
diff --git a/dev-tcltk/tix/ChangeLog b/dev-tcltk/tix/ChangeLog new file mode 100644 index 0000000..8133611 --- /dev/null +++ b/dev-tcltk/tix/ChangeLog @@ -0,0 +1,154 @@ +# ChangeLog for dev-tcltk/tix +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.42 2013/05/16 09:42:31 jlec Exp $ + +*tix-8.4.3-r1 (16 May 2013) + + 16 May 2013; Justin Lecher <jlec@gentoo.org> +tix-8.4.3-r1.ebuild, + +files/tix-8.4.3-tcl8.5.patch, files/tix-8.4.3-tcl8.6.patch: + Straighten Fix for >tcl-8.5 + + 21 Jan 2013; Justin Lecher <jlec@gentoo.org> tix-8.4.3.ebuild, + +files/tix-8.4.3-tcl8.6.patch: + Add fix tcl-8.6, #453370 + + 13 Dec 2012; Justin Lecher <jlec@gentoo.org> -files/tix-8.2.0-gentoo.diff, + -files/tix-8.4.2-tcl85.patch, tix-8.4.3.ebuild, +files/tix-8.4.3-link.patch, + metadata.xml: + EAPI BUmp to use new features + + 09 Sep 2012; Anthony G. Basile <blueness@gentoo.org> tix-8.4.3.ebuild: + Keyword ~ppc64, bug #413433 + + 05 Jul 2012; Anthony G. Basile <blueness@gentoo.org> tix-8.4.3.ebuild: + Keyword ~mips + + 17 Jun 2012; Raúl Porcel <armin76@gentoo.org> tix-8.4.3.ebuild: + Add ~alpha/~ia64/~s390/~sh wrt #413433 + + 28 May 2012; Markus Meier <maekke@gentoo.org> tix-8.4.3.ebuild: + add ~arm, bug #413433 + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> tix-8.4.3.ebuild: + keyword ~amd64-fbsd + + 16 May 2012; Naohiro Aota <naota@gentoo.org> tix-8.4.3.ebuild: + Add ~x86-fbsd. #413433 + + 25 Apr 2012; Jeroen Roovers <jer@gentoo.org> tix-8.4.3.ebuild: + Marked ~hppa (bug #413433). + + 11 Mar 2011; Justin Lecher <jlec@gentoo.org> -tix-8.4.2-r1.ebuild, + -tix-8.4.2-r2.ebuild: + Cleaned old + + 16 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> tix-8.4.3.ebuild: + x86 stable wrt bug #281409 + + 15 Dec 2010; Justin Lecher <jlec@gentoo.org> -tix-8.2.0-r1.ebuild, + -tix-8.4.0.ebuild, -tix-8.4.2.ebuild, tix-8.4.2-r1.ebuild, + tix-8.4.2-r2.ebuild, tix-8.4.3.ebuild: + Cleaning + + 17 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org> tix-8.4.3.ebuild: + keyworded for ~amd64-linux ~x86-linux, tested in prefix overlay + + 22 Sep 2009; Markus Meier <maekke@gentoo.org> tix-8.4.3.ebuild: + amd64 stable, bug #281409 + + 12 Sep 2009; Raúl Porcel <armin76@gentoo.org> tix-8.4.3.ebuild: + sparc stable wrt #281409 + + 18 Aug 2009; Christian Faulhammer <fauli@gentoo.org> tix-8.4.2-r2.ebuild: + stable x86, bug 281409 + +*tix-8.4.3 (10 May 2009) + + 10 May 2009; Federico Ferri <mescalinum@gentoo.org> +tix-8.4.3.ebuild: + bump to 8.4.3. fix #259692 + +*tix-8.4.2-r2 (17 Apr 2009) + + 17 Apr 2009; Federico Ferri <mescalinum@gentoo.org> + +files/tix-8.4.2-tcl85.patch, +tix-8.4.2-r2.ebuild: + add tcl85 patch. fixes bug #250354 + + 27 Apr 2008; Markus Meier <maekke@gentoo.org> tix-8.4.2-r1.ebuild: + amd64 stable, bug #211972 + + 01 Mar 2008; Christian Faulhammer <opfer@gentoo.org> tix-8.4.2-r1.ebuild: + stable x86, bug 211972 + + 01 Mar 2008; Ferris McCormick <fmccor@gentoo.org> tix-8.4.2-r1.ebuild: + Sparc stable, Bug #211972 --- it's been over two months now. + +*tix-8.4.2-r1 (06 Dec 2007) + + 06 Dec 2007; <matsuu@gentoo.org> +tix-8.4.2-r1.ebuild: + Added symlink for netgen, bug #201138. + + 28 May 2007; MATSUU Takuto <matsuu@gentoo.org> tix-8.4.2.ebuild: + Fixed bug #168897 (again). + +*tix-8.4.2 (28 Apr 2007) + + 28 Apr 2007; MATSUU Takuto <matsuu@gentoo.org> +tix-8.4.2.ebuild: + Version bumped. + Fixed bug #168897. + + 26 Mar 2007; Alec Warner <antarus@gentoo.org> tix-8.2.0-r1.ebuild, + tix-8.4.0.ebuild: + Remove dependency on portage: ref bug 162516 + +*tix-8.4.0 (24 Sep 2006) + + 24 Sep 2006; MATSUU Takuto <matsuu@gentoo.org> -tix-8.2.0.ebuild, + -tix-8.2.0-r2.ebuild, +tix-8.4.0.ebuild: + Version bumped. #107911. + Removed old versions. + + 09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tix-8.2.0-r2.ebuild: + added ~amd64 KEYWORD, fixes #82914 + +*tix-8.2.0-r2 (01 Feb 2005) + + 01 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org> tix-8.2.0-r2.ebuild: + Bumped revision. Fixes #79474. + + 10 Jun 2004; Ferris McCormick <fmccor@gentoo.org> tix-8.2.0-r1.ebuild: + Marked stable for sparc. + + 23 May 2004; Ferris McCormick <fmccor@gentoo.org> tix-8.2.0-r1.ebuild: + Add ~sparc keyword. + +*tix-8.2.0-r1 (12 Apr 2004) + + 12 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tix-8.2.0-r1.ebuild: + rev bump so the header file fix goes out. + + 12 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tix-8.2.0.ebuild: + fix for bug #46561; inherit eutils for epatch; use emake -j1 for buggy + makefiles + + 04 Apr 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml, tix-8.2.0.ebuild: + Clean up. + + 24 Jan 2004; Alastair Tse <liquidx@gentoo.org> tix-8.2.0.ebuild: + applied more fixes for unresolved symbols (#29371) + + 18 Oct 2003; Alastair Tse <liquidx@gentoo.org> tix-8.2.0.ebuild: + add fix for unresolved symbols in X11 (#29371) + + 10 May 2003; Stanislav Brabec <sb@gentoo.org> tix-8.2.0.ebuild: + Removed obsolete fix_makefile (bug #20259) and removed dependency on + sed-4.0.5. Now should work with both tk-8.3.4-r1 and tk-8.4.*. + +*tix-8.2.0 (31 Oct 2002) +*tix-8.2.0b1 (11 Oct 2002) + + 31 Jan 2003; Martin Holzer <mholzer@gentoo.org> tix-8.2.0b1.ebuild + files/tix-8.2.0-gentoo.diff ChangeLog : + Change SRC_URI to use mirror://sourceforge. Fixed diff. Closes #14141. + + 11 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tix-8.2.0b1.ebuild files/digest-tix-8.2.0b1 : + Initial import. Ebuild submitted by Pete Gale <pete@SoulCoffee.org>. diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest new file mode 100644 index 0000000..214ad86 --- /dev/null +++ b/dev-tcltk/tix/Manifest @@ -0,0 +1,7 @@ +AUX tix-8.4.3-link.patch 402 SHA256 d4992c9d78b90c8e2ae79b1be63218f6d05cfbce31cc5ceadb5bb54571cb9696 SHA512 e220035cc8d71592dfe72e73e1fb92f79f7750b5c8a97d749bdb67aef9488a3684aad7873041ba6054083287c758889cb243d6cac5b83281f738b1392f29a821 WHIRLPOOL 2be7a639fd78020e79a6bb9d340113e58efe78c8ac491ba34ab48fda5a9668cee0b511af756af702b0dffe267993935af5f7b9570d5c50cdd25a7853faed0008 +AUX tix-8.4.3-tcl8.5.patch 6808 SHA256 435f96d7ae0cceab7b09b9b7630a2f51766fb36dd09c2ab84d7d4509365393a7 SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd WHIRLPOOL aca539ace69d8cd97958bb35ad702398c3eb7e2ce2bfabf9d02ca4b940bf88ce1c7a31dd3fd7eca5a14e4fd6a037c2aee3cbd3ac8687078bedb92f6dd78cb7e0 +AUX tix-8.4.3-tcl8.6.patch 665 SHA256 9c8d7b07d6d5e98c66485d9c3e68ef1b816232c1630590a2f4df0e03a20bcff7 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e WHIRLPOOL c0b18f5012ea432ceef376ecb646a6ea2b79cb8ca4c21f9f347a6367f8c37054694df97e4ad8e7f72a54ec63b5fafdea09560a4397b13cf3e0341ec2841b4a38 +DIST Tix8.4.3-src.tar.gz 1831503 SHA256 562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852 WHIRLPOOL 5f72582d30eb1be27b3e5a9d7a49b5e5b46d7d8a0bdd1228c592c1b2192bf0d627f50b63990c8bd43f0e2713d61e7e903bdedd8135f5ef67464d51bd6f23110a +EBUILD tix-8.4.3-r2.ebuild 1389 SHA256 63dccda318f8a62849ea76ac6819169a6bb8e2b3f8a7c1ce6a4decd7814a848a SHA512 1914d14b08d5837e7a3c0705965870569dfa11d9c25847d0c6521a690c9e230b3438b7df12fd885f6c4557e5caf4c6342625fb09f672b2c4fbbce64ef460ee89 WHIRLPOOL 87fe498342d2cc0765e0d9e79d642b2fe0aa9a4b8b81624e0b988aa31871edb0f44caf1cb7d4968f29b5f0b10309ef2d9114527d596c04bea9564100e56d2efc +MISC ChangeLog 5249 SHA256 79a8cede6cc58dde41d0ba19997f2813a6c522318f02df5cb36797770abf3e39 SHA512 e0afc35e4db4219013a8d36b2400006c29640ff7e587d48fab534ef04a350a5f23129ab62995e24b61bfbae3c7e4b8f669a86f86ff73a7cec7724104f7f69016 WHIRLPOOL e084655ed51b68711a5721a6892cd167bd0415c5133d4a7475bfc0a68f983f0f1c55f3c31c8201bd17468cb45eab00fd563b667aa89150f6be519a15d3162cb1 +MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365 diff --git a/dev-tcltk/tix/files/tix-8.4.3-link.patch b/dev-tcltk/tix/files/tix-8.4.3-link.patch new file mode 100644 index 0000000..d2d402d --- /dev/null +++ b/dev-tcltk/tix/files/tix-8.4.3-link.patch @@ -0,0 +1,11 @@ +--- Tix8.4.2/Makefile.in.link 2006-11-18 04:41:06.000000000 +0100 ++++ Tix8.4.2/Makefile.in 2006-11-18 04:43:13.000000000 +0100 +@@ -124,7 +124,7 @@ + RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = @SHLIB_LD@ $(CFLAGS) -Wl,-soname=$(PKG_LIB_FILE) + SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + STLIB_LD = @STLIB_LD@ diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch new file mode 100644 index 0000000..d87cbff --- /dev/null +++ b/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch @@ -0,0 +1,190 @@ +diff -up Tix8.4.2/generic/tixImgXpm.c_old Tix8.4.2/generic/tixImgXpm.c +--- Tix8.4.2/generic/tixImgXpm.c_old 2008-01-08 11:53:37.000000000 +0100 ++++ Tix8.4.2/generic/tixImgXpm.c 2008-01-08 12:04:49.000000000 +0100 +@@ -45,19 +45,19 @@ static int ImgXpmConfigureMaster _ANSI_ + int flags)); + static int ImgXpmGetData _ANSI_ARGS_((Tcl_Interp *interp, + PixmapMaster *masterPtr)); +-static char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp, ++static CONST84 char ** ImgXpmGetDataFromFile _ANSI_ARGS_((Tcl_Interp * interp, + char * string, int * numLines_return)); +-static char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp, ++static CONST84 char ** ImgXpmGetDataFromId _ANSI_ARGS_((Tcl_Interp * interp, + CONST84 char * id)); +-static char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp, ++static CONST84 char ** ImgXpmGetDataFromString _ANSI_ARGS_((Tcl_Interp*interp, + char * string, int * numLines_return)); + static void ImgXpmGetPixmapFromData _ANSI_ARGS_(( + Tcl_Interp * interp, + PixmapMaster *masterPtr, + PixmapInstance *instancePtr)); +-static char * GetType _ANSI_ARGS_((char * colorDefn, ++static CONST84 char * GetType _ANSI_ARGS_((CONST84 char * colorDefn, + int * type_ret)); +-static char * GetColor _ANSI_ARGS_((char * colorDefn, ++static CONST84 char * GetColor _ANSI_ARGS_((CONST84 char * colorDefn, + char * colorName, int * type_ret)); + + /* +@@ -286,7 +286,7 @@ ImgXpmGetData(interp, masterPtr) + Tcl_Interp *interp; /* For reporting errors. */ + PixmapMaster *masterPtr; + { +- char ** data = NULL; ++ CONST84 char ** data = NULL; + int isAllocated = 0; /* do we need to free "data"? */ + int listArgc; + CONST84 char ** listArgv = NULL; +@@ -363,7 +363,7 @@ ImgXpmGetData(interp, masterPtr) + return code; + } + +-static char ** ImgXpmGetDataFromId(interp, id) ++static CONST84 char ** ImgXpmGetDataFromId(interp, id) + Tcl_Interp * interp; + CONST84 char * id; + { +@@ -378,13 +378,13 @@ static char ** ImgXpmGetDataFromId(inter + if (hashPtr == NULL) { + Tcl_AppendResult(interp, "unknown pixmap ID \"", id, + "\"", NULL); +- return (char**)NULL; ++ return NULL; + } else { +- return (char**)Tcl_GetHashValue(hashPtr); ++ return (CONST84 char**)Tcl_GetHashValue(hashPtr); + } + } + +-static char ** ImgXpmGetDataFromString(interp, string, numLines_return) ++static CONST84 char ** ImgXpmGetDataFromString(interp, string, numLines_return) + Tcl_Interp * interp; + char * string; + int * numLines_return; +@@ -392,7 +392,7 @@ static char ** ImgXpmGetDataFromString(i + int quoted; + char * p, * list; + int numLines; +- char ** data; ++ CONST84 char ** data; + + /* skip the leading blanks (leading blanks are not defined in the + * the XPM definition, but skipping them shouldn't hurt. Also, the ability +@@ -510,17 +510,17 @@ static char ** ImgXpmGetDataFromString(i + + error: + Tcl_AppendResult(interp, "File format error", NULL); +- return (char**) NULL; ++ return NULL; + } + +-static char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return) ++static CONST84 char ** ImgXpmGetDataFromFile(interp, fileName, numLines_return) + Tcl_Interp * interp; + char * fileName; + int * numLines_return; + { + FILE * fd = NULL; + int size, n; +- char ** data; ++ CONST84 char ** data; + char *cmdBuffer = NULL; + Tcl_DString buffer; /* initialized by Tcl_TildeSubst */ + +@@ -588,16 +588,16 @@ static char ** ImgXpmGetDataFromFile(int + ckfree(cmdBuffer); + } + Tcl_DStringFree(&buffer); +- return (char**)NULL; ++ return NULL; + } + + +-static char * ++static CONST84 char * + GetType(colorDefn, type_ret) +- char * colorDefn; ++ CONST84 char * colorDefn; + int * type_ret; + { +- char * p = colorDefn; ++ CONST84 char * p = colorDefn; + + /* skip white spaces */ + while (*p && isspace(*p)) { +@@ -642,9 +642,9 @@ GetType(colorDefn, type_ret) + /* + * colorName is guaranteed to be big enough + */ +-static char * ++static CONST84 char * + GetColor(colorDefn, colorName, type_ret) +- char * colorDefn; ++ CONST84 char * colorDefn; + char * colorName; /* if found, name is copied to this array */ + int * type_ret; + { +@@ -751,7 +751,7 @@ ImgXpmGetPixmapFromData(interp, masterPt + } + + for (i=0; i<masterPtr->ncolors; i++) { +- char * colorDefn; /* the color definition line */ ++ CONST84 char * colorDefn; /* the color definition line */ + char * colorName; /* temp place to hold the color name + * defined for one type of visual */ + char * useName; /* the color name used for this +@@ -842,7 +842,7 @@ ImgXpmGetPixmapFromData(interp, masterPt + * Parse the main body of the image + */ + for (i=0; i<masterPtr->size[1]; i++) { +- char * p = masterPtr->data[i+lOffset]; ++ CONST84 char * p = masterPtr->data[i+lOffset]; + + for (j=0; j<masterPtr->size[0]; j++) { + if (masterPtr->cpp == 1) { +diff -up Tix8.4.2/generic/tixImgXpm.h_old Tix8.4.2/generic/tixImgXpm.h +--- Tix8.4.2/generic/tixImgXpm.h_old 2008-01-08 12:04:59.000000000 +0100 ++++ Tix8.4.2/generic/tixImgXpm.h 2008-01-08 12:05:26.000000000 +0100 +@@ -55,7 +55,7 @@ typedef struct PixmapMaster { + int size[2]; /* width and height */ + int ncolors; /* number of colors */ + int cpp; /* characters per pixel */ +- char ** data; /* The data that defines this pixmap ++ CONST84 char ** data; /* The data that defines this pixmap + * image (array of strings). It is + * converted into an X Pixmap when this + * image is instanciated +diff -up Tix8.4.2/generic/tixInt.h_old Tix8.4.2/generic/tixInt.h +--- Tix8.4.2/generic/tixInt.h_old 2008-01-08 12:05:53.000000000 +0100 ++++ Tix8.4.2/generic/tixInt.h 2008-01-08 12:09:35.000000000 +0100 +@@ -23,6 +23,10 @@ + #include <tixPort.h> + #endif + ++#include <stdlib.h> ++#include <string.h> ++#include <ctype.h> ++ + /*---------------------------------------------------------------------- + * + * Tix Display Item Types +diff -up Tix8.4.2/Makefile.in_old Tix8.4.2/Makefile.in +--- Tix8.4.2/Makefile.in_old 2008-01-08 11:43:41.000000000 +0100 ++++ Tix8.4.2/Makefile.in 2008-01-08 11:46:22.000000000 +0100 +@@ -128,6 +128,7 @@ SHLIB_LD = @SHLIB_LD@ $(CFLAGS) -Wl,-son + SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + STLIB_LD = @STLIB_LD@ ++TCL_VERSION = @TCL_VERSION@ + TCL_DEFS = @TCL_DEFS@ + TCL_SRC_DIR = @TCL_SRC_DIR@ + TCL_BIN_DIR = @TCL_BIN_DIR@ +@@ -294,7 +295,7 @@ VPATH = $(srcdir):$(srcdir)/generic:$(sr + + pkgIndex.tcl: + (\ +- echo 'if {[catch {package require Tcl 8.4}]} return';\ ++ echo 'if {[catch {package require Tcl $(TCL_VERSION)}]} return';\ + echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ + [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\ + ) > pkgIndex.tcl diff --git a/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch b/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch new file mode 100644 index 0000000..0ed1750 --- /dev/null +++ b/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch @@ -0,0 +1,18 @@ + generic/tixGrSort.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c +index 7dee30f..26ec054 100644 +--- a/generic/tixGrSort.c ++++ b/generic/tixGrSort.c +@@ -447,8 +447,8 @@ SortCompareProc(first, second) + * Parse the result of the command. + */ + +- order = strtol(sortInterp->result, &end, 0); +- if ((end == sortInterp->result) || (*end != 0)) { ++ order = strtol(Tcl_GetStringResult(sortInterp), &end, 0); ++ if ((end == Tcl_GetStringResult(sortInterp)) || (*end != 0)) { + Tcl_ResetResult(sortInterp); + Tcl_AppendResult(sortInterp, + "comparison command returned non-numeric result", diff --git a/dev-tcltk/tix/metadata.xml b/dev-tcltk/tix/metadata.xml new file mode 100644 index 0000000..70ac404 --- /dev/null +++ b/dev-tcltk/tix/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>tcltk</herd> +</pkgmetadata> diff --git a/dev-tcltk/tix/tix-8.4.3-r2.ebuild b/dev-tcltk/tix/tix-8.4.3-r2.ebuild new file mode 100644 index 0000000..658172e --- /dev/null +++ b/dev-tcltk/tix/tix-8.4.3-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils multilib + +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" + +IUSE="" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" + +RESTRICT="test" + +DEPEND=" + dev-lang/tk + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + (use x86-macos || use x64-macos) || epatch "${FILESDIR}"/${P}-link.patch + sed \ + -e 's:-Os::g' \ + -i configure tclconfig/tcl.m4 || die + epatch \ + "${FILESDIR}"/${P}-tcl8.5.patch \ + "${FILESDIR}"/${P}-tcl8.6.patch +} + +src_configure() { + econf \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ + --with-tk="${EPREFIX}/usr/$(get_libdir)" +} + +src_install() { + default + + # Bug 168897 + doheader generic/tix.h + # Bug 201138 + if use x86-macos || use x64-macos; then + mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib + 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 + + dodoc ChangeLog README.txt docs/*.txt + dohtml -r index.html ABOUT.html docs/ +} |