Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42deed09a8d9b9973d3ea15604c73c6c80526ed2
commit 42deed09a8d9b9973d3ea15604c73c6c80526ed2
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Thu Sep 17 12:34:10 2009 +0200
amsn-0.98-1-i686
- version bump
diff --git a/source/xapps-extra/amsn/Fix_TkCximage.diff
b/source/xapps-extra/amsn/Fix_TkCximage.diff
deleted file mode 100644
index 2b69e84..0000000
--- a/source/xapps-extra/amsn/Fix_TkCximage.diff
+++ /dev/null
@@ -1,113 +0,0 @@
---- amsn/utils/TkCximage/src/TkCximage.cpp 2008/12/26 16:39:41 10817
-+++ 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/source/xapps-extra/amsn/Fix_http.diff
b/source/xapps-extra/amsn/Fix_http.diff
deleted file mode 100644
index 14911e2..0000000
--- a/source/xapps-extra/amsn/Fix_http.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- amsn/autoupdate.tcl 2008/03/11 20:50:28 9648
-+++ 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
---- amsn/proxy.tcl 2008/10/27 18:05:35 10649
-+++ amsn/proxy.tcl 2008/11/14 16:47:29 10726
-@@ -9,7 +9,7 @@
- ::Version::setSubversionId {$Id$}
-
- 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
diff --git a/source/xapps-extra/amsn/FrugalBuild
b/source/xapps-extra/amsn/FrugalBuild
index d4bbe6b..cf8cd83 100644
--- a/source/xapps-extra/amsn/FrugalBuild
+++ b/source/xapps-extra/amsn/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: crazy <cr...@frugalware.org>
pkgname=amsn
-pkgver=0.97.2
-pkgrel=3
+pkgver=0.98
+pkgrel=1
pkgdesc="AMsN is a great messanger client"
depends=('libice>=1.0.5-1' 'libjpeg' 'libx11>=1.2.1-1' 'libsm>=1.1.0-1'
'libstdc++' 'libpng' 'tk>=8.5.7-2')
rodepends=('tls')
@@ -11,11 +11,9 @@ groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
options=('force')
Finclude sourceforge
-source=($source amsn.patch Fix_TkCximage.diff Fix_http.diff)
-sha1sums=('4be338c01d34f1b776ce6ac51bba11e2adbeda1d' \
- '97a871735cefde7e7d8bdc575ed91bb2700c7f4d' \
- 'f8432a46dc68f8185167c53540a61ce5d504e4a7' \
- 'bc21fea4362ce49a23538bd57db092f7201f54a9')
+source=($source amsn.patch)
+sha1sums=('01793908793118460a48671de2c56ad733036a49' \
+ '97a871735cefde7e7d8bdc575ed91bb2700c7f4d')
build()
{
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
