diff options
| author |   Olivier Crête <tester@gentoo.org> | 2009-02-01 01:22:33 +0000 |
|---|---|---|
| committer | Olivier Crête <tester@gentoo.org> | 2009-02-01 01:22:33 +0000 |
| commit | 44f14d974a126ad798b80ef522334a2da02f8c86 (patch) | |
| tree | 9779bf86ccb787cd0f7854285bfb6f080f2c7bd9 /net-im/amsn/files | |
| parent | Version bump (diff) | |
| download | gentoo-2-44f14d974a126ad798b80ef522334a2da02f8c86.tar.gz gentoo-2-44f14d974a126ad798b80ef522334a2da02f8c86.tar.bz2 gentoo-2-44f14d974a126ad798b80ef522334a2da02f8c86.zip | |
Add fixes for tcltk 8.5.6 compat, bug #255728
(Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'net-im/amsn/files')
| -rw-r--r-- | net-im/amsn/files/amsn-0.97.2-TkCximage.patch | 113 | ||||
| -rw-r--r-- | net-im/amsn/files/amsn-0.97.2-http-fix.patch | 22 |
2 files changed, 135 insertions, 0 deletions
diff --git a/net-im/amsn/files/amsn-0.97.2-TkCximage.patch b/net-im/amsn/files/amsn-0.97.2-TkCximage.patch new file mode 100644 index 000000000000..33c5edb4ea14 --- /dev/null +++ b/net-im/amsn/files/amsn-0.97.2-TkCximage.patch @@ -0,0 +1,113 @@ +--- trunk/amsn/utils/TkCximage/src/TkCximage.cpp 2008/10/03 21:20:28 10549 ++++ trunk/amsn/utils/TkCximage/src/TkCximage.cpp 2008/12/28 21:50:08 10818 +@@ -26,6 +26,65 @@ + char currenttime[30]; + FILE * logfile; + ++#define AVAILABLE_FORMATS 6 ++Tk_PhotoImageFormat cximageFormats[] = { ++ { ++ "cximage", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxgif", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxpng", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxjpg", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxtga", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxbmp", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ } ++}; ++ ++ + int RGB2BGR(Tk_PhotoImageBlock *data, BYTE * pixelPtr) { + int i; + int size = data->height * data->width * data->pixelSize; +@@ -267,10 +326,6 @@ + INITLOGS(); // + LOG("---------------------------------"); // + +- +- int AvailableFromats = 6; +- const char *KnownFormats[] = {"cximage", "cxgif", "cxpng", "cxjpg", "cxtga", "cxbmp"}; +- + //Check Tcl version is 8.3 or higher + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { + return TCL_ERROR; +@@ -285,15 +340,6 @@ + + LOG("Tk stub initialized"); // + +- Tk_PhotoImageFormat cximageFormats = { +- NULL, +- (Tk_ImageFileMatchProc *) ChanMatch, +- (Tk_ImageStringMatchProc *) ObjMatch, +- (Tk_ImageFileReadProc *) ChanRead, +- (Tk_ImageStringReadProc *) ObjRead, +- (Tk_ImageFileWriteProc *) ChanWrite, +- (Tk_ImageStringWriteProc *) StringWrite +- }; + + LOG("Creating commands"); // + +@@ -323,14 +369,9 @@ + #endif + + LOG("Adding format : "); // +- for (i = 0; i < AvailableFromats; i++) { +- delete cximageFormats.name; +- cximageFormats.name = new char[strlen(KnownFormats[i]) + 1]; +- strcpy(cximageFormats.name, KnownFormats[i]); +- Tk_CreatePhotoImageFormat(&cximageFormats); +- APPENDLOG(cximageFormats.name); // +- delete cximageFormats.name; +- cximageFormats.name = NULL; ++ for (i = 0; i < AVAILABLE_FORMATS; i++) { ++ Tk_CreatePhotoImageFormat(&cximageFormats[i]); ++ APPENDLOG(cximageFormats[i].name); // + } + + // end of Initialisation diff --git a/net-im/amsn/files/amsn-0.97.2-http-fix.patch b/net-im/amsn/files/amsn-0.97.2-http-fix.patch new file mode 100644 index 000000000000..d5b2d093db29 --- /dev/null +++ b/net-im/amsn/files/amsn-0.97.2-http-fix.patch @@ -0,0 +1,22 @@ +--- trunk/amsn/autoupdate.tcl 2008/03/11 20:50:28 9648 ++++ trunk/amsn/autoupdate.tcl 2008/11/14 16:47:29 10726 +@@ -540,7 +540,7 @@ + } + + #/////////////////////////////////////////////////////////////////////// +- package require http ++ package require -exact http 2.4.4 + + proc check_web_version { token } { + global version rcversion weburl +--- trunk/amsn/proxy.tcl 2008/10/27 18:05:35 10649 ++++ trunk/amsn/proxy.tcl 2008/11/14 16:47:29 10726 +@@ -9,7 +9,7 @@ + ::Version::setSubversionId {$Id: amsn-0.97.2-http-fix.patch,v 1.1 2009/02/01 01:22:32 tester Exp $} + + package provide Proxy 0.1 +-package require http ++package require -exact http 2.4.4 + + # This should be converted to a proper package, to use with package require + source socks.tcl ;# SOCKS5 proxy support |