Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Olivier Crete (tester)" <tester@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/amsn/files: amsn-0.97.2-http-fix.patch amsn-0.97.2-TkCximage.patch
Date: Sun, 01 Feb 2009 01:22:34
Message-Id: E1LTR2e-0003CZ-Ti@stork.gentoo.org
1 tester 09/02/01 01:22:32
2
3 Added: amsn-0.97.2-http-fix.patch
4 amsn-0.97.2-TkCximage.patch
5 Log:
6 Add fixes for tcltk 8.5.6 compat, bug #255728
7 (Portage version: 2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64)
8
9 Revision Changes Path
10 1.1 net-im/amsn/files/amsn-0.97.2-http-fix.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/amsn/files/amsn-0.97.2-http-fix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/amsn/files/amsn-0.97.2-http-fix.patch?rev=1.1&content-type=text/plain
14
15 Index: amsn-0.97.2-http-fix.patch
16 ===================================================================
17 --- trunk/amsn/autoupdate.tcl 2008/03/11 20:50:28 9648
18 +++ trunk/amsn/autoupdate.tcl 2008/11/14 16:47:29 10726
19 @@ -540,7 +540,7 @@
20 }
21
22 #///////////////////////////////////////////////////////////////////////
23 - package require http
24 + package require -exact http 2.4.4
25
26 proc check_web_version { token } {
27 global version rcversion weburl
28 --- trunk/amsn/proxy.tcl 2008/10/27 18:05:35 10649
29 +++ trunk/amsn/proxy.tcl 2008/11/14 16:47:29 10726
30 @@ -9,7 +9,7 @@
31 ::Version::setSubversionId {$Id: amsn-0.97.2-http-fix.patch,v 1.1 2009/02/01 01:22:32 tester Exp $}
32
33 package provide Proxy 0.1
34 -package require http
35 +package require -exact http 2.4.4
36
37 # This should be converted to a proper package, to use with package require
38 source socks.tcl ;# SOCKS5 proxy support
39
40
41
42 1.1 net-im/amsn/files/amsn-0.97.2-TkCximage.patch
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/amsn/files/amsn-0.97.2-TkCximage.patch?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/amsn/files/amsn-0.97.2-TkCximage.patch?rev=1.1&content-type=text/plain
46
47 Index: amsn-0.97.2-TkCximage.patch
48 ===================================================================
49 --- trunk/amsn/utils/TkCximage/src/TkCximage.cpp 2008/10/03 21:20:28 10549
50 +++ trunk/amsn/utils/TkCximage/src/TkCximage.cpp 2008/12/28 21:50:08 10818
51 @@ -26,6 +26,65 @@
52 char currenttime[30];
53 FILE * logfile;
54
55 +#define AVAILABLE_FORMATS 6
56 +Tk_PhotoImageFormat cximageFormats[] = {
57 + {
58 + "cximage",
59 + (Tk_ImageFileMatchProc *) ChanMatch,
60 + (Tk_ImageStringMatchProc *) ObjMatch,
61 + (Tk_ImageFileReadProc *) ChanRead,
62 + (Tk_ImageStringReadProc *) ObjRead,
63 + (Tk_ImageFileWriteProc *) ChanWrite,
64 + (Tk_ImageStringWriteProc *) StringWrite
65 + },
66 + {
67 + "cxgif",
68 + (Tk_ImageFileMatchProc *) ChanMatch,
69 + (Tk_ImageStringMatchProc *) ObjMatch,
70 + (Tk_ImageFileReadProc *) ChanRead,
71 + (Tk_ImageStringReadProc *) ObjRead,
72 + (Tk_ImageFileWriteProc *) ChanWrite,
73 + (Tk_ImageStringWriteProc *) StringWrite
74 + },
75 + {
76 + "cxpng",
77 + (Tk_ImageFileMatchProc *) ChanMatch,
78 + (Tk_ImageStringMatchProc *) ObjMatch,
79 + (Tk_ImageFileReadProc *) ChanRead,
80 + (Tk_ImageStringReadProc *) ObjRead,
81 + (Tk_ImageFileWriteProc *) ChanWrite,
82 + (Tk_ImageStringWriteProc *) StringWrite
83 + },
84 + {
85 + "cxjpg",
86 + (Tk_ImageFileMatchProc *) ChanMatch,
87 + (Tk_ImageStringMatchProc *) ObjMatch,
88 + (Tk_ImageFileReadProc *) ChanRead,
89 + (Tk_ImageStringReadProc *) ObjRead,
90 + (Tk_ImageFileWriteProc *) ChanWrite,
91 + (Tk_ImageStringWriteProc *) StringWrite
92 + },
93 + {
94 + "cxtga",
95 + (Tk_ImageFileMatchProc *) ChanMatch,
96 + (Tk_ImageStringMatchProc *) ObjMatch,
97 + (Tk_ImageFileReadProc *) ChanRead,
98 + (Tk_ImageStringReadProc *) ObjRead,
99 + (Tk_ImageFileWriteProc *) ChanWrite,
100 + (Tk_ImageStringWriteProc *) StringWrite
101 + },
102 + {
103 + "cxbmp",
104 + (Tk_ImageFileMatchProc *) ChanMatch,
105 + (Tk_ImageStringMatchProc *) ObjMatch,
106 + (Tk_ImageFileReadProc *) ChanRead,
107 + (Tk_ImageStringReadProc *) ObjRead,
108 + (Tk_ImageFileWriteProc *) ChanWrite,
109 + (Tk_ImageStringWriteProc *) StringWrite
110 + }
111 +};
112 +
113 +
114 int RGB2BGR(Tk_PhotoImageBlock *data, BYTE * pixelPtr) {
115 int i;
116 int size = data->height * data->width * data->pixelSize;
117 @@ -267,10 +326,6 @@
118 INITLOGS(); //
119 LOG("---------------------------------"); //
120
121 -
122 - int AvailableFromats = 6;
123 - const char *KnownFormats[] = {"cximage", "cxgif", "cxpng", "cxjpg", "cxtga", "cxbmp"};
124 -
125 //Check Tcl version is 8.3 or higher
126 if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
127 return TCL_ERROR;
128 @@ -285,15 +340,6 @@
129
130 LOG("Tk stub initialized"); //
131
132 - Tk_PhotoImageFormat cximageFormats = {
133 - NULL,
134 - (Tk_ImageFileMatchProc *) ChanMatch,
135 - (Tk_ImageStringMatchProc *) ObjMatch,
136 - (Tk_ImageFileReadProc *) ChanRead,
137 - (Tk_ImageStringReadProc *) ObjRead,
138 - (Tk_ImageFileWriteProc *) ChanWrite,
139 - (Tk_ImageStringWriteProc *) StringWrite
140 - };
141
142 LOG("Creating commands"); //
143
144 @@ -323,14 +369,9 @@
145 #endif
146
147 LOG("Adding format : "); //
148 - for (i = 0; i < AvailableFromats; i++) {
149 - delete cximageFormats.name;
150 - cximageFormats.name = new char[strlen(KnownFormats[i]) + 1];
151 - strcpy(cximageFormats.name, KnownFormats[i]);
152 - Tk_CreatePhotoImageFormat(&cximageFormats);
153 - APPENDLOG(cximageFormats.name); //
154 - delete cximageFormats.name;
155 - cximageFormats.name = NULL;
156 + for (i = 0; i < AVAILABLE_FORMATS; i++) {
157 + Tk_CreatePhotoImageFormat(&cximageFormats[i]);
158 + APPENDLOG(cximageFormats[i].name); //
159 }
160
161 // end of Initialisation
Report Message
Find on MARC Find on Google Groups