rpms/tix/devel tix-8.4.2-tcl8.5.patch,1.2,1.3 tix.spec,1.26,1.27

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/tix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17041

Modified Files:
	tix-8.4.2-tcl8.5.patch tix.spec 
Log Message:

fix tix-8.4.2-tcl8.5.patch to not drop the TkPutImage define to XPutImage, because without it, apps just stop working.


tix-8.4.2-tcl8.5.patch:

Index: tix-8.4.2-tcl8.5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tix/devel/tix-8.4.2-tcl8.5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tix-8.4.2-tcl8.5.patch	10 Jan 2008 08:11:37 -0000	1.2
+++ tix-8.4.2-tcl8.5.patch	6 Feb 2008 16:28:39 -0000	1.3
@@ -254,19 +254,3 @@
  	echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
  	    [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\
  	) > pkgIndex.tcl
-diff -up Tix8.4.2/unix/tixUnixXpm.c_old Tix8.4.2/unix/tixUnixXpm.c
---- Tix8.4.2/unix/tixUnixXpm.c_old	2008-01-08 12:10:18.000000000 +0100
-+++ Tix8.4.2/unix/tixUnixXpm.c	2008-01-08 12:13:07.000000000 +0100
-@@ -19,12 +19,6 @@
- #include <tixImgXpm.h>
- #include <X11/Xutil.h>
- 
--#if !defined(WIN32) && !defined(MAC_OSX_TK)
--#define TkPutImage(colors, ncolors, display, pixels, gc, image, destx, desty, srcx, srcy, width, height) \
--	XPutImage(display, pixels, gc, image, destx, desty, srcx, \
--	srcy, width, height);
--#endif
--
- typedef struct PixmapData {
-     Pixmap mask;		/* Mask: only display pixmap pixels where
- 				 * there are 1's here. */


Index: tix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tix/devel/tix.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tix.spec	6 Feb 2008 16:02:07 -0000	1.26
+++ tix.spec	6 Feb 2008 16:28:39 -0000	1.27
@@ -131,6 +131,8 @@
 - apps can't find libTix.so without an ld.so.conf.d file. It probably makes
   more sense to move this library back into %%{_libdir}, but I'll leave that to
   Vitezslav to decide.
+- fix tix-8.4.2-tcl8.5.patch so that it leaves the TkPutImage define to XPutImage,
+  otherwise, apps just stop working.
 
 * Thu Jan 17 2008 Jesse Keating <jkeating at redhat.com> - 1:8.4.2-4
 - Rebuild, fix libTix.so link paths.