lyx 1.3.0 with patches from lyx upstream cvs

6 files changed, 453 insertions, 3 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index f648df8cfea0..ce6a4e0abdc6 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for app-office/lyx
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.14 2003/02/12 05:13:14 vapier Exp $
+# ChangeLog for app-officelyxChangeLog/
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.15 2003/02/12 22:38:17 danarmak Exp $
+
+*lyx-1.3 (12 Feb 2003)
+
+  12 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A new major version. Among many other nice things this adds a qt3 interface,
+  which is used instead of the xforms one if 'qt' USE flag is on. The qt
+  interface provides antialiasing and suhc stuff, as well as qt3's unicode
+  input management support (so you don't need to deal with lyx-style keymap
+  files).
 
   13 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/app-office/lyx/files/digest-lyx-1.3.0 b/app-office/lyx/files/digest-lyx-1.3.0
new file mode 100644
index 000000000000..e441b8bdaa1d
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.3.0
@@ -0,0 +1 @@
+MD5 a7b2a8041c3c3bd99f96cb0316c4595c lyx-1.3.0.tar.gz 7270856
diff --git a/app-office/lyx/files/lyx-1.3.0-autogen.sh.diff b/app-office/lyx/files/lyx-1.3.0-autogen.sh.diff
new file mode 100644
index 000000000000..5aa73bc77e56
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.0-autogen.sh.diff
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
+retrieving revision 1.42
+retrieving revision 1.42.2.1
+diff -u -r1.42 -r1.42.2.1
+--- autogen.sh	2002/12/23 14:14:12	1.42
++++ autogen.sh	2003/02/11 13:07:44	1.42.2.1
+@@ -19,7 +19,7 @@
+ 	rm -f lib/reLyX/configure.ac
+ 	EXTRA_ACINCLUDE_FILES="lyxinclude213.m4"
+ 	;;
+-    *2.5[2346])
++    *2.5[23467])
+ 	rm -f acconfig.h
+ 	rm -f configure.in
+ 	cp config/configure.ac .
diff --git a/app-office/lyx/files/lyx-1.3.0-configure.in b/app-office/lyx/files/lyx-1.3.0-configure.in
new file mode 100644
index 000000000000..5363bec3e80c
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.0-configure.in
@@ -0,0 +1,327 @@
+dnl Process with autoconf to generate configure script   -*- sh -*-
+
+AC_INIT(src/main.C)
+AC_PREREQ(2.13) dnl We want to use autoconf 2.13
+AM_CONFIG_HEADER(src/config.h)
+dnl This is a trick to make autoheader do the right thing
+dnl AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_AUX_DIR(config)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.3.1cvs"
+LYX_CHECK_VERSION
+
+AC_CANONICAL_SYSTEM
+
+LYX_VERSION_SUFFIX
+
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
+
+# The list of languages known to LyX
+# This is needed by GNU gettext
+ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
+
+# fix the value of the prefixes.
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+### Set the execute permissions of the various scripts correctly
+for file in config/install-sh config/mkinstalldirs lib/configure ; do
+  chmod 755 ${srcdir}/${file}
+done
+
+### Check for programs
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+#AC_PROG_RANLIB
+AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
+if test "x$KPSEWHICH" = xkpsewhich ; then
+    AC_DEFINE(HAVE_KPSEWHICH, 1,
+    [Define this if you have the kpsewhich program working on your system.])
+fi
+AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
+
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
+
+### we will also need a C compiler to compile GNU gettext
+AC_PROG_CC
+
+### check for special systems
+AC_ISC_POSIX
+AC_AIX
+
+### Check for program extensions (.exe or nothing)
+AC_EXEEXT
+
+### check which frontend we want to use
+LYX_USE_FRONTEND
+
+### Check for a C++ compiler
+LYX_PROG_CXX
+### Some checks on what the C++ compiler can(not) do
+AC_LANG_CPLUSPLUS
+dnl we do not need that currently (and probably all our supported
+dnl compiler allow that)
+dnl LYX_CXX_PARTIAL
+LYX_CXX_EXPLICIT
+LYX_CXX_STL_STRING
+LYX_CXX_GOOD_STD_STRING
+LYX_CXX_CHEADERS
+LYX_CXX_GLOBAL_CSTD
+LYX_STD_COUNT
+dnl we disable rtti for now
+dnl LYX_CXX_RTTI
+AC_CHECK_HEADERS(ostream istream sstream locale limits)
+LYX_CXX_STL_MODERN_STREAMS
+
+### and now some special lyx flags.
+AC_ARG_ENABLE(assertions,
+  [  --enable-assertions     add runtime sanity checks in the program],,
+  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+	enable_assertions=yes;
+    else
+	enable_assertions=no;
+    fi;])
+if test "x$enable_assertions" = xyes ; then
+   lyx_flags="$lyx_flags assertions"
+   AC_DEFINE(ENABLE_ASSERTIONS,1,
+    [Define if you want assertions to be enabled in the code])
+fi
+
+### Library Files
+dnl by testing these we check if it is ok to have
+dnl -lc and -lm as args to the compiler
+AC_CHECK_LIB(m, sin)
+AC_CHECK_LIB(c, fopen)
+
+### Add extra directories to check for libraries.
+LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
+LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir))
+test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
+
+### Add extra directories to check for include files.
+LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
+LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
+test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
+
+### Add both includes and libraries
+LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
+LYX_LOOP_DIR($lyx_cv_extra_prefix,[
+LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+
+AC_ARG_WITH(aiksaurus,
+  [  --without-aiksaurus     do not use the Aiksaurus library],
+  [lyx_use_aiksaurus=$withval])
+if test x$lyx_use_aiksaurus != xno; then
+AC_CHECK_LIB(Aiksaurus, main,
+	[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
+	 AIKSAURUS_LIBS="-lAiksaurus -lbz2"
+	],,"-lbz2")
+fi
+AC_SUBST(AIKSAURUS_LIBS)
+
+### Setup libtool
+AC_DISABLE_SHARED
+AC_LIBTOOL_WIN32_DLL
+#AM_PROG_LIBTOOL
+LYX_PROG_LIBTOOL
+
+### Check if we want pspell libraries
+CHECK_WITH_PSPELL
+
+### Check for X libraries
+# The real thing.
+AC_PATH_XTRA
+LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+# Since solaris X headers use int as implicit return type and modern
+# gcc's do not like that, let's use -isystem instead of -I.
+# We should test for gcc version and see whether it supports -isystem,
+# but since at least gcc 2.6.x supports it and it is still too old for
+# us, it seems we are safe.
+if test -n "$GXX" ; then
+  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
+fi
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+### check which frontend we want to use
+
+#LYX_USE_FRONTEND
+dnl The code below is not in a macro, because this would cause big
+dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
+case "$lyx_use_frontend" in
+  xforms)
+	LYX_PATH_XPM
+	LYX_PATH_XFORMS
+	LYX_CHECK_XFORMS_IMAGE_LOADER
+	FRONTEND="xforms"
+	FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
+	FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+	case "$host" in
+	  *cygwin)
+	    FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
+	    ;;
+	  *)
+	    FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
+	    ;;
+	esac
+	FRONTEND_INFO="    libXpm version:               ${XPM_VERSION}\n\
+    libforms version:             ${XFORMS_VERSION}\n"
+	;;
+dnl   gnome)
+dnl # Leaving these tests in means that they are performed twice for the
+dnl # xforms frontend. No, I don't understand why :-(
+dnl # Angus 16 Dec 2002.
+dnl #     LYX_PATH_XPM
+dnl #     LYX_PATH_XFORMS
+dnl #     LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl     AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl     AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl     FRONTEND="xforms gnome"
+dnl     FRONTEND_GUILIB="gnome/*.lo"
+dnl     FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
+  qt)
+    QT_DO_IT_ALL
+    FRONTEND="qt2"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
+    FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+    FRONTEND_LIBS="\$(QT_LIB)"
+    FRONTEND_INFO="    Qt version:                   ${QT_VERSION}\n"
+    ;;
+  *)
+    LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+esac
+
+### Check for xforms and xpm (only if X has been found).
+if test "$have_x" = no ; then
+LYX_ERROR(dnl
+[Cannot find X window libraries and/or headers. Check your installation.
+   If you use a Linux system, check that you have installed
+   the development tools.])
+fi
+
+### Setup GNU gettext
+dnl GNU gettext is written in C
+AC_LANG_C
+# Some tests that may be useful for gettext
+AC_C_CONST
+AC_C_INLINE
+# Do the real setup now
+AM_GNU_GETTEXT
+# a hack for those who try to change LyX, but do not have gettext installed
+case  "${XGETTEXT}" in
+ *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
+esac
+
+AC_SUBST(LINGUAS)
+
+AC_LANG_CPLUSPLUS
+
+# some standard header files
+AC_HEADER_DIRENT
+AC_HEADER_MAJOR
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
+
+# some standard structures
+AC_HEADER_STAT
+AC_HEADER_TIME
+
+# some standard types
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIGNAL
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+
+AC_CHECK_FUNCS(snprintf vsnprintf strerror)
+LYX_CHECK_DECL(snprintf, stdio.h)
+LYX_CHECK_DECL(vsnprintf, stdio.h)
+LYX_CHECK_DECL(istreambuf_iterator, iterator)
+
+dnl This is a slight hack: the tests generated by autoconf 2.52 do not
+dnl work correctly because of some conflict with stdlib.h with g++ 2.96
+dnl We aim to remove this eventually, since we should test as much as
+dnl possible with the compiler which will use the functions (JMarc)
+AC_LANG_C
+AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
+AC_LANG_CPLUSPLUS
+
+dnl Until this is fixed in autoconf we provide our own version
+LYX_FUNC_SELECT_ARGTYPES
+
+dnl check whether we have to work around solaris broken putenv()
+LYX_FUNC_PUTENV_ARGTYPE
+
+
+LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
+
+### Some information on what just happened
+real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
+real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+VERSION_INFO="Configuration\n\
+  Host type:                      ${host}\n\
+  Special build flags:           ${lyx_flags}\n\
+  C   Compiler:                   ${CC}\n\
+  C   Compiler flags:             ${CFLAGS}\n\
+  C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler flags:             ${CXXFLAGS}\n\
+  Linker flags:                   ${LDFLAGS}\n\
+  Frontend:                       ${lyx_use_frontend}\n\
+${FRONTEND_INFO}\
+  LyX binary dir:                 ${real_bindir}\n\
+  LyX files dir:                  ${real_datadir}\n"
+
+
+AC_SUBST(VERSION_INFO)
+
+### Finish the work.
+AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_OUTPUT([Makefile \
+       boost/Makefile \
+       boost/libs/Makefile \
+       boost/libs/regex/Makefile \
+       boost/libs/regex/src/Makefile \
+       boost/libs/signals/Makefile \
+       boost/libs/signals/src/Makefile \
+       config/Makefile \
+       development/Makefile \
+       development/lyx.spec \
+       lib/Makefile \
+       intl/Makefile \
+       po/Makefile.in \
+       sourcedoc/Doxyfile \
+       sourcedoc/Makefile \
+       src/Makefile \
+       src/version.C \
+       src/mathed/Makefile \
+       src/graphics/Makefile \
+       src/insets/Makefile \
+       src/support/Makefile \
+       src/frontends/Makefile \
+       src/frontends/controllers/Makefile \
+       src/frontends/xforms/Makefile \
+       src/frontends/xforms/forms/Makefile \
+       src/frontends/qt2/Makefile \
+       src/frontends/qt2/moc/Makefile \
+       src/frontends/qt2/ui/Makefile \
+       src/frontends/qt2/ui/moc/Makefile \
+       src/frontends/gnome/Makefile \
+])
+
+# show version information
+echo
+printf "$VERSION_INFO"
+echo
+
+# Display a final warning if there has been a LYX_ERROR
+LYX_CHECK_ERRORS
diff --git a/app-office/lyx/files/lyx-1.3.0-glibc31.diff b/app-office/lyx/files/lyx-1.3.0-glibc31.diff
new file mode 100644
index 000000000000..cd2b532b613f
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.0-glibc31.diff
@@ -0,0 +1,21 @@
+? a.diff
+Index: configure.ac
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.ac,v
+retrieving revision 1.23
+diff -u -r1.23 configure.ac
+--- configure.ac	30 Jan 2003 10:05:18 -0000	1.23
++++ configure.ac	7 Feb 2003 10:39:25 -0000
+@@ -238,7 +238,7 @@
+ AC_TYPE_SIZE_T
+ AC_TYPE_UID_T
+ 
+-AC_CHECK_FUNCS(snprintf vsnprintf)
++AC_CHECK_FUNCS(snprintf vsnprintf strerror)
+ LYX_CHECK_DECL(snprintf, stdio.h)
+ LYX_CHECK_DECL(vsnprintf, stdio.h)
+ LYX_CHECK_DECL(istreambuf_iterator, iterator)
+Index: configure.in
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.in,v
+retrieving revision 1.16
diff --git a/app-office/lyx/lyx-1.3.0.ebuild b/app-office/lyx/lyx-1.3.0.ebuild
new file mode 100644
index 000000000000..0c7144ed9f9a
--- /dev/null
+++ b/app-office/lyx/lyx-1.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.0.ebuild,v 1.1 2003/02/12 22:38:17 danarmak Exp $
+
+DESCRIPTION="LyX is an WYSIWYM frontend for LaTeX"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.gz"
+HOMEPAGE="http://www.lyx.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="nls cups qt"
+
+DEPEND="virtual/x11
+	app-text/tetex 
+	>=sys-devel/perl-5
+	nls? ( sys-devel/gettext )
+	app-text/aiksaurus
+	qt? ( >=x11-libs/qt-3 ) !qt? ( =x11-libs/xforms-1* )"
+
+RDEPEND="${DEPEND}
+	app-text/ghostscript
+	app-text/xpdf
+	app-text/aspell
+	app-text/gv
+	app-text/latex2html
+	media-gfx/imagemagick
+	cups? ( virtual/lpr )
+	app-text/rcs
+	dev-util/cvs
+	app-text/sgmltools-lite
+	app-text/noweb
+	app-text/chktex"
+
+src_unpack() {
+
+    unpack $A
+    cd $S
+    # patch to fix compile problem with glibc 2.3.1 from lyx 1.3.x branch cvs.
+    # cf bugzilla.lyx.org #874.
+    patch -p0 < $FILESDIR/$P-glibc31.diff
+    patch -p0 < $FILESDIR/$P-autogen.sh.diff
+    cp -f $FILESDIR/$P-configure.in $S/configure.in
+
+}
+
+src_compile() {
+
+	use nls || myconf="${myconf} --disable-nls"
+	if [ -n "`use qt`" ]; then
+	    inherit kde-functions
+	    set-qtdir 3
+	    myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
+	else
+	    myconf="$myconf --with-frontend=xforms"
+	fi
+	[ -n "$DEBUG" ] && myconf="$myconf --enable-debug" || myconf="$myconf --disable-debug"
+
+	# from 1.2.x, should be rechecked:
+	# -O3 and higher breaks
+	export CXXFLAGS="${CXXFLAGS//-O[3..9]/-O2}"
+	export CFLAGS="${CFLAGS//-O[3..9]/-O2}"
+
+	export WANT_AUTOCONF_2_5=1
+	
+	#./autogen.sh
+	econf ${myconf}
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	einstall
+	dodoc README* UPGRADING INSTALL* ChangeLog NEW COPYING ANNOUNCE ABOUT-NLS
+}