[Lunar-commits] <moonbase> lyx: version bump fixing Qt4.4 build issues, additionally

[Dennis 'stumbles' Veatch]

commit 4ce63e76e15f12fdc7ca460c3f102f43a3ae821b
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sun May 11 09:16:05 2008 -0400

    lyx: version bump fixing Qt4.4 build issues, additionally
    it appears to me (perhaps incorrectly) Qt4 is a dependency and
    not optional for this reason;
    
    ./configure --without-frontend from cli will give you this error;
    **** The following problems have been detected by configure.
    **** Please check the messages below before running 'make'.
    **** (see the section 'Problems' in the INSTALL file)
    
    ** Unknown frontend 'no'
    
    The only acceptable frontend AFAICT is Qt4. So the DETAILS, DEPENDS
    and BUILD have been adjusted accordingly.
---
 x11-apps/lyx/BUILD   |   23 +++--------------------
 x11-apps/lyx/DEPENDS |    9 +++------
 x11-apps/lyx/DETAILS |   11 ++++++-----
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/x11-apps/lyx/BUILD b/x11-apps/lyx/BUILD
index c0c3a42..fa765ab 100644
--- a/x11-apps/lyx/BUILD
+++ b/x11-apps/lyx/BUILD
@@ -1,26 +1,9 @@
 (
 
-# 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
+  . /etc/profile.d/qt4.rc
 
-  if in_depends lyx qt4; then
-    . /etc/profile.d/qt4.rc
-  fi
+  OPTS="$OPTS --enable-build-type=release"
 
-# 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
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/x11-apps/lyx/DEPENDS b/x11-apps/lyx/DEPENDS
index 4422be8..d84f5e0 100644
--- a/x11-apps/lyx/DEPENDS
+++ b/x11-apps/lyx/DEPENDS
@@ -1,10 +1,7 @@
-depends Python   
+depends Python
 depends ImageMagick
-depends teTeX      
-
-optional_depends "qt4"             "--with-frontend=qt4"        \
-                                   ""                          \
-                                   "For a QT frontend"
+depends teTeX
+depends qt4
 
 optional_depends "perl"            ""                          \
                                    ""                          \
diff --git a/x11-apps/lyx/DETAILS b/x11-apps/lyx/DETAILS
index 81f4f1c..f02f1df 100644
--- a/x11-apps/lyx/DETAILS
+++ b/x11-apps/lyx/DETAILS
@@ -1,12 +1,13 @@
           MODULE=lyx
-         VERSION=1.5.4
+         VERSION=1.5.5
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=ftp://ftp.ntua.gr/pub/X11/LyX/stable
    SOURCE_URL[1]=ftp://ftp.lyx.org/pub/lyx/stable
-      SOURCE_VFY=sha1:75c2be653b64eedeb443caf2b0401fb74a15e908
+      SOURCE_VFY=sha1:a1467e5c1d9114a4b806e1858563fd9d03fcaab3
+   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.lyx.org
          ENTERED=20020904
-         UPDATED=20080226
+         UPDATED=20080511
            SHORT="A GUI LaTeX editor"
       MAINTAINER=jannis at lunar-linux.org
 
@@ -15,9 +16,9 @@ LyX is an advanced open source document processor that encourages an
 approach to writing based on the structure of your documents, not their
 appearance. LyX lets you concentrate on writing, leaving details of
 visual layout to the software.
- 
+
 LyX produces high quality, professional output -- using LaTeX, an
 industrial strength typesetting engine, in the background; LyX is far
 more than a front-end to LaTeX, however. No knowledge of LaTeX is
-necessary to use LyX, although it will give a user more power. 
+necessary to use LyX, although it will give a user more power.
 EOF