From 915ac703cc2069daf671a97c5d37c9a8b8376fe9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Feb 2008 16:28:39 +0000 Subject: [PATCH] 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 | 16 ---------------- tix.spec | 2 ++ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/tix-8.4.2-tcl8.5.patch b/tix-8.4.2-tcl8.5.patch index cdb6ba0..a195dd3 100644 --- a/tix-8.4.2-tcl8.5.patch +++ b/tix-8.4.2-tcl8.5.patch @@ -254,19 +254,3 @@ diff -up Tix8.4.2/Makefile.in_old Tix8.4.2/Makefile.in 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 - #include - --#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. */ diff --git a/tix.spec b/tix.spec index 03ada59..7614b4d 100644 --- a/tix.spec +++ b/tix.spec @@ -131,6 +131,8 @@ rm -rf $RPM_BUILD_ROOT - 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 - 1:8.4.2-4 - Rebuild, fix libTix.so link paths.