diff options
Diffstat (limited to 'print/lyx-devel/files')
| -rw-r--r-- | print/lyx-devel/files/patch-aa | 216 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-ab | 11 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-autogen.sh | 32 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-config::ltmain.sh | 28 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-sp_spell | 7 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-xformsversion | 13 | ||||
| -rw-r--r-- | print/lyx-devel/files/patch-xpm | 7 |
7 files changed, 87 insertions, 227 deletions
diff --git a/print/lyx-devel/files/patch-aa b/print/lyx-devel/files/patch-aa deleted file mode 100644 index af9207168a48..000000000000 --- a/print/lyx-devel/files/patch-aa +++ /dev/null @@ -1,216 +0,0 @@ ---- src/LyXView.C.orig Thu Jul 4 18:26:33 2002 -+++ src/LyXView.C Thu Jul 4 18:28:28 2002 -@@ -19,7 +19,7 @@ - - #include "LyXView.h" - #include "lyx_main.h" --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - #include "lyxlookup.h" - #endif - #include "minibuffer.h" -@@ -214,7 +214,7 @@ - { - fl_show_form(form_, place, border, title.c_str()); - minibuffer->Init(); --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - InitLyXLookup(fl_get_display(), form_->window); - #endif - } ---- src/WorkArea.C.orig2 Thu Jul 4 18:33:22 2002 -+++ src/WorkArea.C Thu Jul 4 18:36:02 2002 -@@ -24,7 +24,7 @@ - #include "LyXView.h" - #include "lyxfunc.h" - --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - #include "lyxlookup.h" - #endif - -@@ -323,7 +323,7 @@ - ev->xbutton.y - ob->y, - ev->xbutton.button); - break; --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - case FL_MOUSE: - #else - case FL_DRAG: -@@ -339,7 +339,7 @@ - ev->xbutton.state); - } - break; --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - case FL_KEYBOARD: - #else - case FL_KEYPRESS: -@@ -350,7 +350,7 @@ - KeySym keysym = 0; - char dummy[1]; - XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev); --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - // XForms < 0.89.5 does not have compose support - // so we are using our own compose support - LyXLookupString(ev, dummy, 1, &keysym); -@@ -369,7 +369,7 @@ - << keysym << "]" << endl; - } - --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - if (keysym == NoSymbol) { - lyxerr[Debug::KEY] - << "Empty kdb action (probably composing)" -@@ -446,7 +446,7 @@ - } - break; - --#if FL_REVISION >= 89 -+#if (FL_VERSION > 0 || FL_REVISION >= 89) - case FL_KEYRELEASE: - lyxerr << "Workarea event: KEYRELEASE" << endl; - break; ---- src/lyx_gui.C.orig2 Thu Jul 4 18:36:45 2002 -+++ src/lyx_gui.C Thu Jul 4 18:39:42 2002 -@@ -36,7 +36,7 @@ - #include "lyxrc.h" - #include "gettext.h" - #include "lyx_gui_misc.h" --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - #include "lyxlookup.h" - #endif - #include "bufferlist.h" -@@ -171,7 +171,7 @@ - delete lyxserver; - lyxserver = 0; - delete lyxViews; --#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) -+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5) - CloseLyXLookup(); - #endif - } ---- src/insets/figinset.C.orig2 Thu Jul 4 18:40:17 2002 -+++ src/insets/figinset.C Thu Jul 4 18:42:08 2002 -@@ -933,7 +933,7 @@ - tmpfig->inset->form->OkBtn); - fl_hide_form(tmpfig->inset->form->Figure); - } --#if FL_REVISION == 89 -+#if (FL_VERSION == 0 && FL_REVISION == 89) - // CHECK Reactivate this free_form calls - #else - fl_free_form(tmpfig->inset->form->Figure); -@@ -1769,7 +1769,7 @@ - if (arg == 8) { - fl_set_focus_object(form->Figure, form->OkBtn); - fl_hide_form(form->Figure); --#if FL_REVISION == 89 -+#if (FL_VERSION == 0 && FL_REVISION == 89) - // CHECK Reactivate this free_form calls - #else - fl_free_form(form->Figure); -@@ -1786,7 +1786,7 @@ - case 9: /* cancel = restore and close */ - fl_set_focus_object(form->Figure, form->OkBtn); - fl_hide_form(form->Figure); --#if FL_REVISION == 89 -+#if (FL_VERSION == 0 && FL_REVISION == 89) - // CHECK Reactivate this free_form calls - // Jug, is this still a problem? - #else ---- src/frontends/kde/GUIRunTime.C.orig Thu Jul 4 18:43:25 2002 -+++ src/frontends/kde/GUIRunTime.C Thu Jul 4 18:44:57 2002 -@@ -26,7 +26,7 @@ - - // I keep these here so that it will be processed as early in - // the compilation process as possible. --#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0 -+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0) - #error LyX will not compile with this version of XForms.\ - Please get version 0.89.\ - If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C. ---- src/frontends/gnome/GUIRunTime.C.orig Thu Jul 4 18:46:08 2002 -+++ src/frontends/gnome/GUIRunTime.C Thu Jul 4 18:47:23 2002 -@@ -25,7 +25,7 @@ - - // I keep these here so that it will be processed as early in - // the compilation process as possible. --#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0 -+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0) - #error LyX will not compile with this version of XForms.\ - Please get version 0.89.\ - If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C. ---- src/frontends/xforms/GUIRunTime.C.orig Thu Jul 4 18:47:48 2002 -+++ src/frontends/xforms/GUIRunTime.C Thu Jul 4 18:48:18 2002 -@@ -19,7 +19,7 @@ - - // I keep these here so that it will be processed as early in - // the compilation process as possible. --#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0 -+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0) - #error LyX will not compile with this version of XForms.\ - Please get version 0.89.\ - If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C. ---- src/frontends/xforms/Menubar_pimpl.C.orig Thu Jul 4 18:49:05 2002 -+++ src/frontends/xforms/Menubar_pimpl.C Thu Jul 4 18:50:18 2002 -@@ -219,7 +219,7 @@ - static inline - string const fixlabel(string const & str) - { --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - return subst(str, '%', '?'); - #else - return subst(str, "%", "%%"); ---- src/frontends/xforms/Toolbar_pimpl.C.orig Thu Jul 4 18:50:40 2002 -+++ src/frontends/xforms/Toolbar_pimpl.C Thu Jul 4 18:52:37 2002 -@@ -84,13 +84,13 @@ - : owner(o), sxpos(x), sypos(y) - { - combox = 0; --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - bubble_timer = 0; - #endif - } - - --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - // timer-cb for bubble-help (Matthias) - static - void BubbleTimerCB(FL_OBJECT *, long data) -@@ -339,7 +339,7 @@ - fl_addto_form(owner->getForm()); - } - --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - // add the time if it don't exist - if (bubble_timer == 0) - bubble_timer = fl_add_timer(FL_HIDDEN_TIMER, -@@ -383,7 +383,7 @@ - fl_set_pixmapbutton_focus_outline(obj, 0); - - // Set the tooltip --#if FL_REVISION >= 89 -+#if (FL_VERSION > 0 || FL_REVISION >= 89) - string help = _(lyxaction.helpText(item->action)); - fl_set_object_helper(obj, help.c_str()); - #else ---- src/frontends/xforms/Toolbar_pimpl.h.orig Thu Jul 4 18:52:55 2002 -+++ src/frontends/xforms/Toolbar_pimpl.h Thu Jul 4 18:53:40 2002 -@@ -93,7 +93,7 @@ - ToolbarList toollist; - /// - LyXView * owner; --#if FL_REVISION < 89 -+#if (FL_VERSION == 0 && FL_REVISION < 89) - /// - FL_OBJECT * bubble_timer; - #endif diff --git a/print/lyx-devel/files/patch-ab b/print/lyx-devel/files/patch-ab deleted file mode 100644 index 3e3ecce8853e..000000000000 --- a/print/lyx-devel/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Mon Jan 17 21:04:28 2000 -+++ po/Makefile.in.in Tue May 2 21:53:41 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po diff --git a/print/lyx-devel/files/patch-autogen.sh b/print/lyx-devel/files/patch-autogen.sh new file mode 100644 index 000000000000..9358d3a465e0 --- /dev/null +++ b/print/lyx-devel/files/patch-autogen.sh @@ -0,0 +1,32 @@ +--- autogen.sh Thu Apr 18 22:11:28 2002 ++++ autogen.sh Fri Jun 28 21:55:35 2002 +@@ -1,9 +1,9 @@ + #!/bin/sh + + ACLOCAL=aclocal +-AUTOHEADER=autoheader ++AUTOHEADER=autoheader213 + AUTOMAKE="automake -a -c --foreign" +-AUTOCONF=autoconf ++AUTOCONF=autoconf213 + GNUM4= + + ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4" +@@ -31,7 +31,7 @@ + echo "done." + + # Generate the Makefiles and configure files +-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then ++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then + echo "Building macros..." + for dir in . lib/reLyX sigc++ ; do + echo " $dir" +@@ -43,7 +43,7 @@ + exit + fi + +-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then ++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then + echo "Building config header template..." + for dir in . sigc++ ; do + echo " $dir" diff --git a/print/lyx-devel/files/patch-config::ltmain.sh b/print/lyx-devel/files/patch-config::ltmain.sh new file mode 100644 index 000000000000..29ed1a55df53 --- /dev/null +++ b/print/lyx-devel/files/patch-config::ltmain.sh @@ -0,0 +1,28 @@ +--- config/ltmain.sh Thu Jan 24 06:28:31 2002 ++++ config/ltmain.sh Fri Jun 28 20:15:12 2002 +@@ -1043,14 +1043,14 @@ + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -2441,7 +2441,7 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; + *) diff --git a/print/lyx-devel/files/patch-sp_spell b/print/lyx-devel/files/patch-sp_spell new file mode 100644 index 000000000000..9ec68f198e44 --- /dev/null +++ b/print/lyx-devel/files/patch-sp_spell @@ -0,0 +1,7 @@ +--- src/sp_spell.C Thu Mar 21 12:25:20 2002 ++++ src/sp_spell.C Wed Jul 31 18:49:57 2002 +@@ -371,3 +371,3 @@ + retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1), +- SELECT_TYPE_ARG234 (&infds), ++ &infds, + 0, diff --git a/print/lyx-devel/files/patch-xformsversion b/print/lyx-devel/files/patch-xformsversion new file mode 100644 index 000000000000..29db709d6816 --- /dev/null +++ b/print/lyx-devel/files/patch-xformsversion @@ -0,0 +1,13 @@ +--- src/frontends/xforms/GUIRunTime.C Thu Mar 21 16:18:03 2002 ++++ src/frontends/xforms/GUIRunTime.C Wed Jul 31 18:39:04 2002 +@@ -26,10 +26,2 @@ + +-// I keep these here so that it will be processed as early in +-// the compilation process as possible. +-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0 +-#error LyX will not compile with this version of XForms.\ +- Please get version 0.89.\ +- If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C. +-#endif +- + diff --git a/print/lyx-devel/files/patch-xpm b/print/lyx-devel/files/patch-xpm new file mode 100644 index 000000000000..4ca930ba2341 --- /dev/null +++ b/print/lyx-devel/files/patch-xpm @@ -0,0 +1,7 @@ +--- src/graphics/GraphicsImageXPM.h Thu Mar 21 12:27:08 2002 ++++ src/graphics/GraphicsImageXPM.h Wed Jul 31 18:08:13 2002 +@@ -17,3 +17,3 @@ + #include "GraphicsImage.h" +-#include XPM_H_LOCATION ++#include <X11/xpm.h> + #include "support/smart_ptr.h" |