[Lunar-commits] <moonbase> lyx: Added some sedits to fix a segfault with Qt4.4 and

[Dennis 'stumbles' Veatch]

commit bf40341e0f2f9e60b3fff6e1b43c1033ee19857d
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sat May 10 09:32:30 2008 -0400

    lyx: Added some sedits to fix a segfault with Qt4.4 and
    a configure if someone decides not to use a frontend. Also
    make a few adjustments to DEPENDS.
---
 x11-apps/lyx/BUILD   |   24 ++++++++++++++++++------
 x11-apps/lyx/DEPENDS |   22 +++++++++++++---------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/x11-apps/lyx/BUILD b/x11-apps/lyx/BUILD
index ce82a7f..c0c3a42 100644
--- a/x11-apps/lyx/BUILD
+++ b/x11-apps/lyx/BUILD
@@ -1,14 +1,26 @@
 (
 
-  # -O3 and higher breaks - praise to gentoo
-  #export CXXFLAGS="${CXXFLAGS//-O[3..9]/-O2}"
-  #export CFLAGS="${CFLAGS//-O[3..9]/-O2}"
+# The follwoing sedit's fixes a Qt4.4 problem and will be 
+# removed on the next lyx bump.
+  sedit "s:viewport()->repaint();:viewport()->update();:" src/frontends/qt4/GuiWorkArea.cpp
+  sedit "s:lyx_view_.busy(true);::" src/frontends/WorkArea.cpp
+  sedit "s:lyx_view_.message(_(\"Formatting document...\"));::" src/frontends/WorkArea.cpp
+  sedit "s:lyx_view_.updateLayoutChoice();::g" src/frontends/WorkArea.cpp
+  sedit "s:lyx_view_.clearMessage();::g" src/frontends/WorkArea.cpp
+  sedit "s:lyx_view_.busy(false);::" src/frontends/WorkArea.cpp
 
   if in_depends lyx qt4; then
     . /etc/profile.d/qt4.rc
   fi
-  
-  #./autogen.sh  &&
-  default_build
+
+# This is needed instead of default_build if someone chooses to 
+# build lyx without a frontend.
+  ./configure --build=$BUILD            \
+              --prefix=/usr             \
+              --bindir=/bin             \
+              --infodir=/usr/share/info \
+              --mandir=/usr/share/man   &&
+
+  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/x11-apps/lyx/DEPENDS b/x11-apps/lyx/DEPENDS
index 7d09055..fb35370 100644
--- a/x11-apps/lyx/DEPENDS
+++ b/x11-apps/lyx/DEPENDS
@@ -1,19 +1,23 @@
-depends Python      &&
-depends ImageMagick &&
-depends teTeX       &&
+depends Python   
+depends ImageMagick
+depends teTeX      
 
 optional_depends "qt4"             "--with-frontend=qt4"        \
                                    ""                          \
-                                   "For a QT frontend (say n to use XForms instead)" &&
-optional_depends "xforms"          "--with-frontend=xforms"    \
-                                   ""                          \
-                                   "For the XForms frontend"   &&
+                                   "For a QT frontend (say n to use XForms instead)"
+
 optional_depends "perl"            ""                          \
                                    ""                          \
-                                   "to import LaTeX documents into LyX" &&
+                                   "to import LaTeX documents into LyX"
+
 optional_depends "aspell"          ""                          \
                                    ""                          \
-                                   "to do spellchecking"       &&
+                                   "to do spellchecking"
+
 optional_depends "latex-xft-fonts" ""                          \
                                    ""                          \
                                    "to enable math preview"
+
+optional_depends "boost"           "--without-included-boost"  \
+                                   ""                          \
+                                   "use with system or included boost"