Fixes amsn startup.
Patch from Azwaw Ousadou <bsdmaniak at gmail.com>, thanks. ok ajacoutot@
This commit is contained in:
parent
36f67b8060
commit
c7c117ae3f
@ -1,8 +1,9 @@
|
||||
#$OpenBSD: Makefile,v 1.4 2008/08/31 17:16:22 steven Exp $
|
||||
#$OpenBSD: Makefile,v 1.5 2009/02/11 20:22:45 pea Exp $
|
||||
|
||||
COMMENT= open source MSN Messenger clone
|
||||
|
||||
DISTNAME= amsn-0.97.2
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://www.amsn-project.net/
|
||||
|
12
net/amsn/patches/patch-autoupdate_tcl
Normal file
12
net/amsn/patches/patch-autoupdate_tcl
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-autoupdate_tcl,v 1.1 2009/02/11 20:22:45 pea Exp $
|
||||
--- autoupdate.tcl.orig Tue Jan 20 16:00:03 2009
|
||||
+++ autoupdate.tcl Tue Jan 20 16:00:30 2009
|
||||
@@ -540,7 +540,7 @@ namespace eval ::autoupdate {
|
||||
}
|
||||
|
||||
#///////////////////////////////////////////////////////////////////////
|
||||
- package require http
|
||||
+ package require -exact http 2.4.4
|
||||
|
||||
proc check_web_version { token } {
|
||||
global version rcversion weburl
|
12
net/amsn/patches/patch-proxy_tcl
Normal file
12
net/amsn/patches/patch-proxy_tcl
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-proxy_tcl,v 1.1 2009/02/11 20:22:45 pea Exp $
|
||||
--- proxy.tcl.orig Tue Jan 20 16:00:40 2009
|
||||
+++ proxy.tcl Tue Jan 20 16:00:50 2009
|
||||
@@ -9,7 +9,7 @@
|
||||
::Version::setSubversionId {$Id: patch-proxy_tcl,v 1.1 2009/02/11 20:22:45 pea 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
|
114
net/amsn/patches/patch-utils_TkCximage_src_TkCximage_cpp
Normal file
114
net/amsn/patches/patch-utils_TkCximage_src_TkCximage_cpp
Normal file
@ -0,0 +1,114 @@
|
||||
$OpenBSD: patch-utils_TkCximage_src_TkCximage_cpp,v 1.1 2009/02/11 20:22:45 pea Exp $
|
||||
--- utils/TkCximage/src/TkCximage.cpp.orig Fri Jan 4 17:08:26 2008
|
||||
+++ utils/TkCximage/src/TkCximage.cpp Thu Jan 22 11:17:16 2009
|
||||
@@ -13,6 +13,64 @@
|
||||
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;
|
||||
@@ -254,10 +312,6 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
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;
|
||||
@@ -271,16 +325,6 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
}
|
||||
|
||||
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"); //
|
||||
|
||||
@@ -310,14 +354,9 @@ int Tkcximage_Init (Tcl_Interp *interp ) {
|
||||
#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
|
Loading…
Reference in New Issue
Block a user