Add fixes for tcltk 8.5.6 compat, bug #255728

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 224 insertions, 5 deletions

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index 0bf9b736a040..5da27b6d0dec 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/amsn
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.83 2009/01/12 05:59:58 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.84 2009/02/01 01:22:33 tester Exp $
+
+*amsn-0.97.2-r1 (01 Feb 2009)
+
+  01 Feb 2009; Olivier Crête <tester@gentoo.org>
+  +files/amsn-0.97.2-TkCximage.patch, +files/amsn-0.97.2-http-fix.patch,
+  +amsn-0.97.2-r1.ebuild:
+  Add fixes for tcltk 8.5.6 compat, bug #255728
 
   12 Jan 2009; Olivier Crête <tester@gentoo.org>
   -files/amsn-0.96-dos.patch, -files/amsn-0.97_rc1-autoconf-logic.patch,
diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index 38fac87066c9..8b62df08515d 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX amsn-0.97.2-TkCximage.patch 3451 RMD160 ecb50e3e98e8c0142c12a11be2345069286fbbba SHA1 be3c392d856ff7150f437c6419a6dd63f40e92dc SHA256 51b02012d51ad981d307f8b816aa783214a9b7811198136ef0fc1bd68ed5a8fc
+AUX amsn-0.97.2-http-fix.patch 771 RMD160 10eb6467d140e84ae8bc1726013b1630b1af78ff SHA1 12793ccdcfcaab341c515dbee991e5d4d5ce246b SHA256 9caa3e9b439f690114e4dc7609221dba3d662e857233208cc9e44009209d6b1c
 AUX amsn-0.97_rc1-nostrip.patch 281 RMD160 9276deedc6df1ea49031a11e61b171a7739703b4 SHA1 00e23dae355531073cb5317d64c1a5703b703981 SHA256 309684e00439feaee29240f59b486bbcd895bbfb057da99b1d06c6c57d98929d
 DIST amsn-0.97.2.tar.bz2 3431430 RMD160 cfc195a1f35d262c71265e6412df6611027ece45 SHA1 22452bb5973c9fb38e6feb3a37b8d6453c56600e SHA256 1026b99a112f840c14b30c161895ac8b6b1b613c9d955eddb07c56d738b8b80b
+EBUILD amsn-0.97.2-r1.ebuild 1668 RMD160 a08657707e54498748fbaf7f4d715306a1a551b4 SHA1 9af654bae83d8c3b9a89f018d70731f66eb41a67 SHA256 79efbe33a4fbd8cc1cada17a1fc675869d60199e793ed60fb85c17589b69ca13
 EBUILD amsn-0.97.2.ebuild 1561 RMD160 d83e722baa828dcc93b6337bfc8af8f6d4e5eacd SHA1 abe4f4b16fb0cafbfbdf0cae6e2fdf412b3764ba SHA256 48284b80a650de03c32b4f9f0c919b86593ae2ba2b1c5a866b8665629ffa85cd
-MISC ChangeLog 10188 RMD160 1af138e6bc028b63e0a7abdb0419a53f79a8eb2e SHA1 e5a2b6b3844d865ec129e2fc439b665e8cbdcda7 SHA256 a7860bdd0445041186713bc1d8c54d33f2bed0de4fc9728961e514a7fb888a71
+MISC ChangeLog 10417 RMD160 04de679cb713afb4daf5b8333c40d0ba35dcef11 SHA1 8abfa7f0ce1bc12b5253472916f2ddaa95443ac2 SHA256 2187a4139d0c0d0d1127c53830a0ebe3a8ba6eccc76e184a769bd7d2abd18ffb
 MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklq3GQACgkQmOfEJZHYOKeZIgCfedk7dVt4OTz43I4iZvV7sRau
-ImcAoJLjdC4S86CBMgAQXeBO6x3astG8
-=NVl1
+iEYEARECAAYFAkmE+V4ACgkQmOfEJZHYOKfTawCfZ77YYY8dYt3VAoBAvJUrWzIc
+gPAAni0cpcRoCTL+j3gclvv8V+CXrKdn
+=HemQ
 -----END PGP SIGNATURE-----
diff --git a/net-im/amsn/amsn-0.97.2-r1.ebuild b/net-im/amsn/amsn-0.97.2-r1.ebuild
new file mode 100644
index 000000000000..045da13d283d
--- /dev/null
+++ b/net-im/amsn/amsn-0.97.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.97.2-r1.ebuild,v 1.1 2009/02/01 01:22:33 tester Exp $
+
+inherit autotools eutils fdo-mime gnome2-utils
+
+MY_P=${P/_rc/RC}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Alvaro's Messenger client for MSN"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.amsn-project.net"
+
+# The tests are interactive
+RESTRICT="test"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc -sparc ~x86"
+IUSE="debug static"
+
+DEPEND=">=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
+	>=dev-tcltk/tls-1.4.1
+	media-libs/jpeg
+	media-libs/libpng
+	>=dev-tcltk/snack-2.2.10"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.97_rc1-nostrip.patch"
+	epatch "${FILESDIR}/amsn-0.97.2-http-fix.patch"
+	epatch "${FILESDIR}/amsn-0.97.2-TkCximage.patch"
+	eautoconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable static) \
+		|| die "configure script failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AGREEMENT TODO README FAQ CREDITS
+
+	domenu amsn.desktop
+	sed -i -e s:.png:: "${D}/usr/share/applications/amsn.desktop"
+
+	cd desktop-icons
+	for i in *; do
+		if [ -e ${i}/msn.png ]; then
+			insinto /usr/share/icons/hicolor/${i}/apps
+			doins  ${i}/msn.png
+		fi
+	done
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "You might have to remove ~/.amsn prior to running as user if amsn hangs on start-up."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
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