diff options
| author | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-04 08:09:05 +0000 |
|---|---|---|
| committer | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-04 08:09:05 +0000 |
| commit | db59d15a8ececbddd134ccfee64ce13d9cfa3919 (patch) | |
| tree | 4618426a17ffccb60420d694accab0ede2b37738 /japanese/lyx | |
| parent | Update to version 9.3b. (diff) | |
Prepare for xforms update.
Notes
Notes:
svn path=/head/; revision=62419
Diffstat (limited to 'japanese/lyx')
| -rw-r--r-- | japanese/lyx/Makefile | 2 | ||||
| -rw-r--r-- | japanese/lyx/files/patch-ab | 57 | ||||
| -rw-r--r-- | japanese/lyx/files/patch-ac | 12 |
3 files changed, 70 insertions, 1 deletions
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile index 2cbf8e9f9219..bec89c217945 100644 --- a/japanese/lyx/Makefile +++ b/japanese/lyx/Makefile @@ -22,7 +22,7 @@ MAINTAINER= flathill@FreeBSD.ORG #.if defined(WITH_ISPELL) #RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell #.endif -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms USE_XPM= yes USE_PERL5= yes diff --git a/japanese/lyx/files/patch-ab b/japanese/lyx/files/patch-ab new file mode 100644 index 000000000000..90179d0a41c1 --- /dev/null +++ b/japanese/lyx/files/patch-ab @@ -0,0 +1,57 @@ +--- src/main.C.orig Tue Jul 2 00:11:14 2002 ++++ src/main.C Tue Jul 2 00:11:52 2002 +@@ -21,16 +21,6 @@ + static char vcid[] = "$Id: main.C,v 1.2 1998/06/22 05:50:57 arrae Exp $"; + #endif /* lint */ + +-// I keep these here so that it will be processed as early in +-// the compilation process as possible. +-#if !defined(FL_REVISION) || (FL_REVISION != 81 && FL_REVISION != 86 &&\ +- FL_REVISION != 87 && FL_REVISION != 88) \ +- || FL_VERSION != 0 +-#error LyX will not compile with this version of XForms.\ +- Please get version 0.88 (0.81 and 0.86 also work).\ +- If you want to try to compile anyway, delete this test in src/main.C. +-#endif +- + + int main(int argc, char *argv[]) + { +--- src/lyx_gui_misc.h.orig Tue Jul 2 00:23:13 2002 ++++ src/lyx_gui_misc.h Tue Jul 2 00:23:32 2002 +@@ -64,7 +64,7 @@ + inline + void LyXBell() { + // if (audio()) ON/OFF switch yet to be implemented +-#if FL_REVISION > 85 ++#if FL_VERSION > 0 || FL_REVISION > 85 + fl_ringbell(20); + #else + ringbell(); +--- src/lyx_gui_misc.C.orig Tue Jul 2 00:27:17 2002 ++++ src/lyx_gui_misc.C Tue Jul 2 00:30:10 2002 +@@ -379,7 +379,7 @@ + { + fl_set_resource("flQuestion.yes.label", idex(_("Yes|Yy#y"))); + fl_set_resource("flQuestion.no.label", idex(_("No|Nn#n"))); +-#if FL_REVISION > 85 ++#if FL_VERSION > 0 || FL_REVISION > 85 + return fl_show_question((s1 + "\n" + s2 + "\n" + s3).c_str(), 0); + #else + return fl_show_question(s1.c_str(), s2.c_str(), s3.c_str()); +@@ -392,13 +392,12 @@ + fl_set_choices_shortcut(scex(_("Yes|Yy#y")), + scex(_("No|Nn#n")), + scex(_("Cancel|^["))); +-#if FL_REVISION < 86 ++#if FL_VERSION == 0 && FL_REVISION < 86 + return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(), + 3, idex(_("Yes|Yy#y")), + idex(_("No|Nn#n")), + idex(_("Cancel|^["))); +-#endif +-#if FL_REVISION > 85 ++#else + return fl_show_choice(s1.c_str(), s2.c_str(), s3.c_str(), + 3, idex(_("Yes|Yy#y")), + idex(_("No|Nn#n")), diff --git a/japanese/lyx/files/patch-ac b/japanese/lyx/files/patch-ac new file mode 100644 index 000000000000..7531db9275d1 --- /dev/null +++ b/japanese/lyx/files/patch-ac @@ -0,0 +1,12 @@ +--- src/screen.C.orig Tue Jul 2 00:53:03 2002 ++++ src/screen.C Tue Jul 2 00:53:23 2002 +@@ -809,9 +809,6 @@ + // I want the buttons back before 0.12. OK, this is very simple, + // like what is done in xforms sources. (Ale) + +- // This one is too dirty. Get rid of it. +- extern GC fl_gc; +- + // Please comment this annonymous variable. + int d = 2; + |