dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 09:50:35 +00:00 · 2009-11-26 01:27:26 +00:00 · 2009-02-17 20:08:33 +00:00 · 2008-11-07 03:59:52 +00:00
4 changed files with 119 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: amsn
-# $Id$
-NAME := amsn
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/amsn-0.97-tkcximage.patch
+++ b/amsn-0.97-tkcximage.patch
@ -0,0 +1,113 @@
+--- trunk/amsn/utils/TkCximage/src/TkCximage.cpp	2008/12/26 16:39:41	10817
+++ 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
--- a/amsn.spec
+++ b/amsn.spec
@ -3,7 +3,7 @@

 Name:           amsn
 Version:        0.97.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows

 Group:          Applications/Internet
@ -12,6 +12,7 @@ URL:            http://www.amsn-project.net/
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 Patch0:         amsn-0.97-libng-fixes.patch
 Patch1:         amsn-0.97-libng-libv4l2.patch
+Patch2:         amsn-0.97-tkcximage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@ -39,6 +40,7 @@ snapshots with your webcam to use as your display picture.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2

 rm -r utils/bwidget1.8.0
 rm -r skins/default/winicons
@ -129,6 +131,9 @@ fi


 %changelog
+* Tue Feb 17 2009 Sander Hoentjen <sander@hoentjen.eu> - 0.97.2-2
+- add patch for TkCxImage to build against newer tcl/tk (bug #483368)
+
 * Mon Oct 27 2008 Sander Hoentjen <sander@hoentjen.eu> - 0.97.2-1
 - Update to latest release
Author	SHA1	Message	Date
Fedora Release Engineering	6ebf53c759	dist-git conversion	2010-07-28 09:50:35 +00:00
Bill Nottingham	90a6ceb2cf	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:27:26 +00:00
Sander Hoentjen	f731efc2f6	add patch for TkCxImage to build against newer tcl/tk (bug #483368 )	2009-02-17 20:08:33 +00:00
Jesse Keating	2e5007c6c4	Initialize branch F-10 for amsn	2008-11-07 03:59:52 +00:00