From 9648bcd0a0b3837ca38b622580a3f411920b9767 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Thu, 6 Jul 2000 01:17:20 +0000 Subject: [PATCH] Wed Jul 5 18:31:39 PDT 2000 Michael Jennings Several people have asked for the spec file to be in the tarball so that rpm -ta works properly. I've put it in there, but I don't recommend doing it that way. I use /usr/local as my prefix, and there's a good chance I'll forget to change it before doing a dist tarball. I also put some dummy crap in pixmap.h so that compiling without Imlib2.h works again. SVN revision: 2903 --- ChangeLog | 12 ++++++++++++ Makefile.am | 2 +- src/pixmap.h | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac5a487..cbadd4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3751,3 +3751,15 @@ Mon Jul 3 12:50:00 PDT 2000 Michael Jennings but keys Eterm uses (like Shift-PgUp) will still work as expected. ------------------------------------------------------------------------------- +Wed Jul 5 18:31:39 PDT 2000 Michael Jennings + + Several people have asked for the spec file to be in the tarball so + that rpm -ta works properly. I've put it in there, but I + don't recommend doing it that way. I use /usr/local as my prefix, and + there's a good chance I'll forget to change it before doing a dist + tarball. + + I also put some dummy crap in pixmap.h so that compiling without + Imlib2.h works again. + +------------------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 4573cab..7520b2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,4 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = libmej src themes utils doc bg pix -EXTRA_DIST = README ReleaseNotes ReleaseNotes.1 CVS-README COPYING ChangeLog autogen.sh +EXTRA_DIST = README ReleaseNotes ReleaseNotes.1 CVS-README COPYING ChangeLog autogen.sh Eterm.spec diff --git a/src/pixmap.h b/src/pixmap.h index 07117ff..3c78904 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -27,6 +27,12 @@ #include #ifdef PIXMAP_SUPPORT # include +#else +typedef struct { + int left, top, right, bottom; +} Imlib_Border; +typedef void *Imlib_Image; +typedef void *Imlib_Color_Modifier; #endif #include "misc.h"