fix tix-8.4.2-tcl8.5.patch to not drop the TkPutImage define to XPutImage,

because without it, apps just stop working.
This commit is contained in:
Tom Callaway 2008-02-06 16:28:39 +00:00
parent 56f4418312
commit 915ac703cc
2 changed files with 2 additions and 16 deletions

View File

@ -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 <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. */

View File

@ -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 <jkeating@redhat.com> - 1:8.4.2-4
- Rebuild, fix libTix.so link paths.