Enlightenment CVS committal Author : mej Project : eterm Module : Eterm
Dir : eterm/Eterm Modified Files: Tag: ETERM-0_10 ChangeLog Eterm.spec Makefile.am autogen.sh configure.in Log Message: Tue Mar 15 17:29:24 2005 Michael Jennings (mej) Big-ass merge. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v retrieving revision 1.278.2.32 retrieving revision 1.278.2.33 diff -u -3 -r1.278.2.32 -r1.278.2.33 --- ChangeLog 15 Jul 2004 19:57:50 -0000 1.278.2.32 +++ ChangeLog 15 Mar 2005 22:32:12 -0000 1.278.2.33 @@ -5241,3 +5241,141 @@ Actions are now honest-to-goodness libast-style objects. Action bindings for menus are currently disabled, but other stuff works. ---------------------------------------------------------------------- +Fri Jul 16 17:59:48 2004 Michael Jennings (mej) + +If $LANG refers to a UTF-8 or similar locale, remove that part. In +other words, en_US.utf8 becomes en_US instead. +---------------------------------------------------------------------- +Fri Jul 23 12:21:25 2004 Michael Jennings (mej) + +Kirby Kuehl <[EMAIL PROTECTED]> pointed out some portability +issues. These should now be fixed. +---------------------------------------------------------------------- +Fri Jul 23 12:27:18 2004 Michael Jennings (mej) + +Oops, missed one. :( +---------------------------------------------------------------------- +Wed Nov 3 18:17:52 2004 Michael Jennings (mej) + +Small patch for building against libast 0.6.1. + +Fixed compile error when enabling OFFIX_DND support pointed out by JG +Miller <[EMAIL PROTECTED]>. +---------------------------------------------------------------------- +Sun Nov 7 15:37:43 2004 Michael Jennings (mej) + +Fixed minor typo. +---------------------------------------------------------------------- +Tue Dec 14 17:13:02 2004 Michael Jennings (mej) + +0.9.3 release +---------------------------------------------------------------------- +Tue Dec 14 17:22:23 2004 Michael Jennings (mej) + +The benefits of being a passenger on a long road trip... The +beginnings of EWMH opacity (a la xcompmgr) support and (hopefully) +UTF-8 support. Both as yet untested. +---------------------------------------------------------------------- +Fri Dec 17 16:35:31 2004 Michael Jennings (mej) + +Another attempt (and failure) at UTF-8 support. Disabled until +someone can help me out. + +If you know iconv(), please have a look at the FIXME_BLOCK starting at +line 3509 of src/command.c. +---------------------------------------------------------------------- +Mon Dec 20 14:31:33 2004 Michael Jennings (mej) + +Okay, so my first problem was that I didn't pay close enough attention +to the iconv_open() man page and got the parameter order wrong. Duh. +Thanks to Sytse Wielinga <[EMAIL PROTECTED]> for +noticing that. + +kwo suggested using XmbDrawString(), but that causes font problems I'm +not ready to diagnose just yet. +---------------------------------------------------------------------- +Wed Jan 5 15:17:51 2005 Michael Jennings (mej) + +Spec dependency fixes. +---------------------------------------------------------------------- +Fri Jul 16 17:59:48 2004 Michael Jennings (mej) + +If $LANG refers to a UTF-8 or similar locale, remove that part. In +other words, en_US.utf8 becomes en_US instead. +---------------------------------------------------------------------- +Fri Jul 23 12:21:25 2004 Michael Jennings (mej) + +Kirby Kuehl <[EMAIL PROTECTED]> pointed out some portability +issues. These should now be fixed. +---------------------------------------------------------------------- +Fri Jul 23 12:27:18 2004 Michael Jennings (mej) + +Oops, missed one. :( +---------------------------------------------------------------------- +Wed Nov 3 18:17:52 2004 Michael Jennings (mej) + +Small patch for building against libast 0.6.1. + +Fixed compile error when enabling OFFIX_DND support pointed out by JG +Miller <[EMAIL PROTECTED]>. +---------------------------------------------------------------------- +Sun Nov 7 15:37:43 2004 Michael Jennings (mej) + +Fixed minor typo. +---------------------------------------------------------------------- +Tue Dec 14 17:13:02 2004 Michael Jennings (mej) + +0.9.3 release +---------------------------------------------------------------------- +Tue Dec 14 17:22:23 2004 Michael Jennings (mej) + +The benefits of being a passenger on a long road trip... The +beginnings of EWMH opacity (a la xcompmgr) support and (hopefully) +UTF-8 support. Both as yet untested. +---------------------------------------------------------------------- +Fri Dec 17 16:35:31 2004 Michael Jennings (mej) + +Another attempt (and failure) at UTF-8 support. Disabled until +someone can help me out. + +If you know iconv(), please have a look at the FIXME_BLOCK starting at +line 3509 of src/command.c. +---------------------------------------------------------------------- +Mon Dec 20 14:31:33 2004 Michael Jennings (mej) + +Okay, so my first problem was that I didn't pay close enough attention +to the iconv_open() man page and got the parameter order wrong. Duh. +Thanks to Sytse Wielinga <[EMAIL PROTECTED]> for +noticing that. + +kwo suggested using XmbDrawString(), but that causes font problems I'm +not ready to diagnose just yet. +---------------------------------------------------------------------- +Wed Jan 5 15:17:51 2005 Michael Jennings (mej) + +Spec dependency fixes. +---------------------------------------------------------------------- +Wed Feb 23 15:37:40 2005 Michael Jennings (mej) + +Merged in previous autoFUCK changes from libast. + +Added a feature to specify a command to be run in place of the normal +PC speaker beep. +---------------------------------------------------------------------- +Tue Mar 15 16:44:09 2005 Michael Jennings (mej) + +Reverted part of a patch from Chris Schoeneman <[EMAIL PROTECTED]> +(changelog entry "Fri Jun 25 17:48:24 2004") which broke dead keys and +compose-key sequences. + +Fixed autoSHIT for dist/distcheck/distclean/maintainer-clean and newer +autoSHIT versions. + +Fixed error in saving of cut_chars attribute. + +Fixed saving/handling of beep_command attribute. +---------------------------------------------------------------------- +Tue Mar 15 17:29:24 2005 Michael Jennings (mej) + +Big-ass merge. +---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/Eterm.spec,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -3 -r1.3.2.6 -r1.3.2.7 --- Eterm.spec 3 Mar 2004 17:42:43 -0000 1.3.2.6 +++ Eterm.spec 15 Mar 2005 22:32:14 -0000 1.3.2.7 @@ -1,19 +1,21 @@ -%define bzip 0 +%if %{!?compression:1}0 +%define compression gz +%endif + +%define __os_install_post /usr/lib/rpm/brp-compress Summary: Enlightened terminal emulator Name: Eterm Version: 0.10 -Release: 0.4 -Copyright: BSD +#Release: 1 +Release: 0.%(date '+%Y%m%d') +License: BSD Group: User Interface/X Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png -%if %{bzip} -Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.bz2 -Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.bz2 -%else -Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.gz -Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.gz -%endif +#BuildSuggests: xorg-x11-devel +BuildRequires: libast imlib2-devel XFree86-devel freetype-devel +Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.%{compression} +Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.%{compression} URL: http://www.eterm.org/ BuildRoot: /var/tmp/%{name}-%{version}-root @@ -30,14 +32,16 @@ %setup -a 1 %build -CFLAGS="$RPM_OPT_FLAGS" +#CFLAGS="$RPM_OPT_FLAGS" +CFLAGS="-O0 -g3" export CFLAGS # When using the configure macro, I also specify all the directory # macros I use for compatibility with older versions of the macro %configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \ --datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \ - --enable-multi-charset --enable-escreen --enable-auto-encoding %{?acflags} + --enable-multi-charset --enable-escreen --enable-auto-encoding \ + --with-debugging=9 %{?acflags} %{__make} %{?mflags} %install @@ -69,14 +73,14 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop %post -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig || : if [ -d /usr/share/terminfo -a ! -f /usr/share/terminfo/E/Eterm ]; then tic -o/usr/share/terminfo $RPM_DOC_DIR/%{name}-%{version}/%{name}.ti || : fi %postun -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig || : %clean rm -rf $RPM_BUILD_ROOT @@ -92,99 +96,3 @@ %{_datadir}/%{name}/* %changelog -* Tue Feb 20 2001 Tim Powers <[EMAIL PROTECTED]> -- builds on Alpha now. No need to excludearch (bug 28472) - -* Wed Feb 14 2001 Tim Powers <[EMAIL PROTECTED]> -- removed images which are from Digital Blasphemy from the extra - images tarball, had to delete those images because they are not - allowed to be redistributed on CD, or in compressed format - -* Tue Jan 9 2001 Tim Powers <[EMAIL PROTECTED]> -- fixed a bunch of pre and post in/uninstall brokenness by dropping - split backgrounds package, backgrounds now included in Eterm - proper. This also makes the spec file a lot cleaner :) - -* Sat Aug 19 2000 Tim Powers <[EMAIL PROTECTED]> -- fix bug #15687 - -* Tue Aug 8 2000 Tim Powers <[EMAIL PROTECTED]> -- fixed bug #15687 using Hans' patch - -* Wed Aug 2 2000 Tim Powers <[EMAIL PROTECTED]> -- rebuilt against libpng-1.0.8 - -* Mon Jul 24 2000 Prospector <[EMAIL PROTECTED]> -- rebuilt - -* Sat Jul 22 2000 Tim Powers <[EMAIL PROTECTED]> -- fix spec file problem with configure picking up egcs and running with it, - fixes linking bugs - -* Mon Jul 10 2000 Tim Powers <[EMAIL PROTECTED]> -- rebuilt - -* Fri Jun 2 2000 Tim Powers <[EMAIL PROTECTED]> -- no more wmconfig :) converted to applnk -- fix man page location. Now FHS compliant -- use macros wherever possible -- removed redundant defines at the top of the spec - -* Mon Apr 10 2000 Tim Powers <[EMAIL PROTECTED]> -- rebuilt for 7.0 - -* Thu Feb 03 2000 Tim Powers <[EMAIL PROTECTED]> -- strip debug from libraries - -* Wed Feb 02 2000 Tim Powers <[EMAIL PROTECTED]> -- fixed problems when upgrading and error messages due to a faulty script in - the post section for the Eterm package - -* Tue Feb 01 2000 Tim Powers <[EMAIL PROTECTED]> -- applied patch from Hans de Goede <[EMAIL PROTECTED]> to fix some del, home - and end issues - -* Fri Jan 29 2000 Tim Powers <[EMAIL PROTECTED]> -- rebuilt for 6.2 powertools -- bzipped source to conserve space -- using percent configure so that libtoolize is run, needed for some of the - newer alphas instead of ./configure --prefix= -- stripping binaries again - -* Fri Dec 10 1999 Michael Jennings <[EMAIL PROTECTED]> -- Added Tim's spec file to CVS as Eterm.spec.in for 0.9 - -* Wed Dec 8 1999 Tim Powers <[EMAIL PROTECTED]> -- using unified patch for utempter and themes from Michael Jennings - -* Tue Dec 7 1999 Tim Powers <[EMAIL PROTECTED]> -- added wmconfig entry -- split up into 2 packages, Eterm proper, and Eterm-backgrounds -- thanks to ewt, we no longer have to make Eterm suid root, uses utempter - instead - -* Mon Dec 6 1999 Tim Powers <[EMAIL PROTECTED]> -- updated to 0.8.10 -- patched so that Eterm finds pix/themes in the right place -- new version fixes problems with utmp, conforms to Eterm docs. -- added RedHat.Eterm_suid which includes instructions on how to run Eterm in - order to have it seen by "w" and "who" as a regular user - -* Fri Aug 20 1999 Tim Powers <[EMAIL PROTECTED]> -- fixed roblem with removing all files when uninstalling Eterm. - -* Tue Jul 27 1999 Tim Powers <[EMAIL PROTECTED]> -- updated version to 0.8.9 -- cleaned up spec -- updated patch -- includes new backgrounds -- built for 6.1 - -* Mon Apr 05 1999 Michael Maher <[EMAIL PROTECTED]> -- update to 0.8.8 - -* Fri Oct 23 1998 Jeff Johnson <[EMAIL PROTECTED]> -- update to 0.8.7. - -* Fri Oct 08 1998 Michael Maher <[EMAIL PROTECTED]> -- built eterm =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/Makefile.am,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -3 -r1.6 -r1.6.2.1 --- Makefile.am 17 Nov 2000 07:59:11 -0000 1.6 +++ Makefile.am 15 Mar 2005 22:32:14 -0000 1.6.2.1 @@ -1,7 +1,9 @@ -# $Id: Makefile.am,v 1.6 2000/11/17 07:59:11 mej Exp $ +# $Id: Makefile.am,v 1.6.2.1 2005/03/15 22:32:14 mej Exp $ AUTOMAKE_OPTIONS = foreign SUBDIRS = src themes utils doc bg pix EXTRA_DIST = README ReleaseNotes ReleaseNotes.1 CVS-README ChangeLog autogen.sh Eterm.spec +MAINTAINERCLEANFILES = Makefile.in *~ aclocal.m4 config.guess config.sub configure depcomp \ + install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h* *.log config.h.in =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/autogen.sh,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -u -3 -r1.5.2.3 -r1.5.2.4 --- autogen.sh 11 Mar 2004 14:26:33 -0000 1.5.2.3 +++ autogen.sh 15 Mar 2005 22:32:14 -0000 1.5.2.4 @@ -1,6 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -# $Id: autogen.sh,v 1.5.2.3 2004/03/11 14:26:33 mej Exp $ +# $Id: autogen.sh,v 1.5.2.4 2005/03/15 22:32:14 mej Exp $ broken() { echo @@ -14,46 +14,51 @@ echo "Generating configuration files for Eterm, please wait...." -LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize" -AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader" -ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal" -AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake" -AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf" +LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize" +ACLOCAL_CHOICES="$ACLOCAL aclocal" +AUTOCONF_CHOICES="$AUTOCONF autoconf" +AUTOHEADER_CHOICES="$AUTOHEADER autoheader" +AUTOMAKE_CHOICES="$AUTOMAKE automake" for i in $LIBTOOLIZE_CHOICES ; do $i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break done [ "x$LIBTOOLIZE" = "x" ] && broken libtool -for i in $AUTOHEADER_CHOICES ; do - $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break -done -[ "x$AUTOHEADER" = "x" ] && broken autoconf - for i in $ACLOCAL_CHOICES ; do $i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break done [ "x$ACLOCAL" = "x" ] && broken automake -for i in $AUTOMAKE_CHOICES ; do - $i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break -done -[ "x$AUTOMAKE" = "x" ] && broken automake - for i in $AUTOCONF_CHOICES ; do $i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break done [ "x$AUTOCONF" = "x" ] && broken autoconf +for i in $AUTOHEADER_CHOICES ; do + $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break +done +[ "x$AUTOHEADER" = "x" ] && broken autoconf + +for i in $AUTOMAKE_CHOICES ; do + $i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break +done +[ "x$AUTOMAKE" = "x" ] && broken automake + # Export them so configure can AC_SUBST() them. -export LIBTOOLIZE AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF +export LIBTOOLIZE ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE + +# Check for existing libast.m4 we can use. Use the local one if not. +if test ! -f "`$ACLOCAL --print-ac-dir`/libast.m4"; then + ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS" +fi # Run the stuff. (set -x && $LIBTOOLIZE -c -f) -(set -x && $AUTOHEADER) (set -x && $ACLOCAL $ACLOCAL_FLAGS) -(set -x && $AUTOMAKE -a -c) (set -x && $AUTOCONF) +(set -x && $AUTOHEADER) +(set -x && $AUTOMAKE -a -c) # Run configure. ./configure "$@" =================================================================== RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v retrieving revision 1.62.2.16 retrieving revision 1.62.2.17 diff -u -3 -r1.62.2.16 -r1.62.2.17 --- configure.in 15 Jul 2004 19:57:51 -0000 1.62.2.16 +++ configure.in 15 Mar 2005 22:32:14 -0000 1.62.2.17 @@ -1,25 +1,25 @@ -dnl# $Id: configure.in,v 1.62.2.16 2004/07/15 19:57:51 mej Exp $ +dnl# $Id: configure.in,v 1.62.2.17 2005/03/15 22:32:14 mej Exp $ PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin export PATH -test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=true -test "x$AUTOHEADER" = "x" && AUTOHEADER=true -test "x$ACLOCAL" = "x" && ACLOCAL=true -test "x$AUTOMAKE" = "x" && AUTOMAKE=true -test "x$AUTOCONF" = "x" && AUTOCONF=true +test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize +test "x$ACLOCAL" = "x" && ACLOCAL=aclocal +test "x$AUTOCONF" = "x" && AUTOCONF=autoconf +test "x$AUTOHEADER" = "x" && AUTOHEADER=autoheader +test "x$AUTOMAKE" = "x" && AUTOMAKE=automake AC_SUBST(LIBTOOLIZE) -AC_SUBST(AUTOHEADER) AC_SUBST(ACLOCAL) -AC_SUBST(AUTOMAKE) AC_SUBST(AUTOCONF) +AC_SUBST(AUTOHEADER) +AC_SUBST(AUTOMAKE) SAVE_LIBTOOLIZE="$LIBTOOLIZE" -SAVE_AUTOHEADER="$AUTOHEADER" SAVE_ACLOCAL="$ACLOCAL" -SAVE_AUTOMAKE="$AUTOMAKE" SAVE_AUTOCONF="$AUTOCONF" +SAVE_AUTOHEADER="$AUTOHEADER" +SAVE_AUTOMAKE="$AUTOMAKE" AC_INIT(src/feature.h) AM_INIT_AUTOMAKE(Eterm, 0.10) @@ -33,11 +33,22 @@ AC_SUBST(AUTHORS) AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors]) -LIBTOOLIZE="$SAVE_LIBTOOLIZE" -AUTOHEADER="$SAVE_AUTOHEADER" -ACLOCAL="$SAVE_ACLOCAL" -AUTOMAKE="$SAVE_AUTOMAKE" -AUTOCONF="$SAVE_AUTOCONF" +LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}" +ACLOCAL="${SAVE_ACLOCAL:-aclocal}" +AUTOCONF="${SAVE_AUTOCONF:-autoconf}" +AUTOHEADER="${SAVE_AUTOHEADER:-autoheader}" +AUTOMAKE="${SAVE_AUTOMAKE:-automake}" + +AC_MSG_CHECKING(for preferred libtoolize) +AC_MSG_RESULT($LIBTOOLIZE) +AC_MSG_CHECKING(for preferred aclocal) +AC_MSG_RESULT($ACLOCAL) +AC_MSG_CHECKING(for preferred autoconf) +AC_MSG_RESULT($AUTOCONF) +AC_MSG_CHECKING(for preferred autoheader) +AC_MSG_RESULT($AUTOHEADER) +AC_MSG_CHECKING(for preferred automake) +AC_MSG_RESULT($AUTOMAKE) dnl# Find RCS Ident info from source files AC_DEFINE_UNQUOTED(ACTIONS_IDENT, "`grep '$''Id:' $srcdir/src/actions.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [actions.c RCS ID]) @@ -109,6 +120,7 @@ AC_ARG_PROGRAM AM_PROG_LIBTOOL +AC_PROG_LIBTOOL dnl# Where are we? AC_MSG_CHECKING(for distribution root) @@ -916,6 +928,17 @@ AC_MSG_RESULT(no) fi +dnl# Enable/disable name reporting escape sequences +AC_MSG_CHECKING(if we should enable name reporting escape sequences) +AC_ARG_ENABLE(name-eporting-escapes, [ --enable-name-reporting-escapes Specify this to enable title/icon name reporting], [ + if test "$enableval" = "yes"; then + AC_MSG_RESULT(yes) + AC_DEFINE(ENABLE_NAME_REPORTING_ESCAPES, 1, [Defined to enable title/icon name reporting escape sequences.]) + else + AC_MSG_RESULT(no) + fi +], [AC_MSG_RESULT(no)]) + dnl# Enable/disable humor AC_ARG_WITH(sense-of-humor, [ --without-sense-of-humor Specify this if you have no sense of humor], [ if test "$withval" = "no"; then @@ -988,7 +1011,7 @@ } else { print $0; } - }' $srcdir/$i.in > $srcdir/$i + }' $i.in > $i done &% changequote([, ])dnl @@ -1006,7 +1029,7 @@ Source code location: $srcdir Host System Type: $host - Preprocessor: $CC $CPPFLAGS + Preprocessor: $CPP $CPPFLAGS Compiler: $CC $CFLAGS Linker: $CC $LDFLAGS $LIBS Install path: $prefix ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs