Merge branch 'lyx' of https://github.com/Florin65/moonbase-kde into F…

…lorin65-lyx
lunar-linux · May 27, 2016 · 9784b38 · 9784b38
2 parents 8a0281e + 2bb889f
commit 9784b38
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/qt4-apps/lyx/BUILD b/qt4-apps/lyx/BUILD
@@ -1,11 +1,15 @@
-. /etc/profile.d/qt4.rc &&
+if in_depends $MODULE qt5; then
+  . /etc/profile.d/qt5.rc
+else
+  . /etc/profile.d/qt4.rc
+fi &&
 
 OPTS+=" --enable-build-type=release" &&
 
 default_build &&
 
 # Desktop menu entry
-cat > ${MODULE}.desktop << EOF  &&
+cat > $MODULE.desktop << EOF &&
 [Desktop Entry]
 Type=Application
 Name=LyX
@@ -15,4 +19,4 @@ Icon=$QTDIR/share/lyx/images/lyx.png
 Categories=Qt;KDE;Graphics;Office;
 EOF
 
-install -D -m644 ${MODULE}.desktop /usr/share/applications/${MODULE}.desktop
+install -D -m644 $MODULE.desktop /usr/share/applications/$MODULE.desktop
diff --git a/qt4-apps/lyx/DEPENDS b/qt4-apps/lyx/DEPENDS
@@ -1,29 +1,29 @@
 depends Python
 depends ImageMagick
 depends texlive
-depends qt4
 
-optional_depends "perl"            ""                          \
-                                   ""                          \
-                                   "to import LaTeX documents into LyX"
+optional_depends qt5  "" "" "to build it with Qt 5.x" y
+optional_depends qt4  "" "" "to build it with Qt 4.x" n
+optional_depends perl "" "" "to import LaTeX documents into LyX"
 
-optional_depends "latex-xft-fonts" ""                          \
-                                   ""                          \
-                                   "to enable math preview"
+optional_depends latex-xft-fonts \
+                 "" "" "to enable math preview"
 
-optional_depends "boost"           "--without-included-boost"  \
-                                   ""                          \
-                                   "use with system or included boost"
+optional_depends boost \
+                 "--without-included-boost" "" \
+                 "use with system or included boost"
 
-optional_depends "aspell"          "--with-aspell"             \
-                                   "--without-aspell"          \
-                                   "for dictionary support"
+optional_depends aspell \
+                 "--with-aspell" \
+                 "--without-aspell" \
+                 "for dictionary support"
 
-optional_depends "hunspell"        "--with-hunspell"           \
-                                   "--without-hunspell"        \
-                                   "for hunspell support"
-
-optional_depends "enchant"         "--with-enchant"            \
-                                   "--without-enchant"         \
-                                   "for generic spellcheck support"
+optional_depends hunspell \
+                 "--with-hunspell" \
+                 "--without-hunspell" \
+                 "for hunspell support"
 
+optional_depends enchant \
+                 "--with-enchant" \
+                 "--without-enchant" \
+                 "for generic spellcheck support"
diff --git a/qt4-apps/lyx/DETAILS b/qt4-apps/lyx/DETAILS
@@ -1,13 +1,12 @@
           MODULE=lyx
-         VERSION=2.1.4
+         VERSION=2.2.0
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.1.x
-   SOURCE_URL[1]=ftp://ftp.lyx.org/pub/lyx/stable/2.1.x
-      SOURCE_VFY=sha256:5552f2a1a0c8a129a0ccd7f2ad0b4ce05ed3eb8673483024e495961352fb4287
-   MODULE_PREFIX=${QT4_PREFIX:-/usr}
+   SOURCE_URL[0]=ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/
+   SOURCE_URL[1]=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/
+      SOURCE_VFY=sha256:c898bea7352830592f1dc6d9dddb74269a0f6714d63c7d1a163a4586da7af625
         WEB_SITE=http://www.lyx.org
          ENTERED=20020904
-         UPDATED=20150731
+         UPDATED=20160527
            SHORT="GUI LaTeX editor"
 
 cat << EOF