sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (33c794bf63dbc1b036c7d10774aae73e9c53e5df)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (33c794bf63dbc1b036c7d10774aae73e9c53e5df)
Date: Wed, 6 Dec 2017 21:41:12 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

editors/lyx/BUILD | 8 ++++++--
editors/lyx/DEPENDS | 25 +++++++++++++++----------
editors/lyx/DETAILS | 2 +-
editors/lyx/HISTORY | 5 +++++
4 files changed, 27 insertions(+), 13 deletions(-)

New commits:
commit 33c794bf63dbc1b036c7d10774aae73e9c53e5df
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lyx 2.2.3

diff --git a/editors/lyx/BUILD b/editors/lyx/BUILD
index 6bea0ba..c6e2780 100755
--- a/editors/lyx/BUILD
+++ b/editors/lyx/BUILD
@@ -1,5 +1,9 @@
CFLAGS=${CFLAGS/-O3/-O2} &&
CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
-OPTS="${OPTS} --with-frontend=qt4 --with-qt4-dir=$QT4DIR" &&
-PATH="$QT4DIR/bin:$PATH" &&
+if is_depends_enabled "$SPELL" qtbase; then
+ OPTS="$OPTS --enable-qt5 --with-qt-dir=$QT5DIR"
+else
+ OPTS="$OPTS --with-qt-dir=$QT4DIR"
+fi &&
+PATH="$QTDIR/bin:$PATH" &&
default_build
diff --git a/editors/lyx/DEPENDS b/editors/lyx/DEPENDS
index 9386b8a..9405abe 100755
--- a/editors/lyx/DEPENDS
+++ b/editors/lyx/DEPENDS
@@ -8,24 +8,29 @@ depends libxdmcp &&
depends libxft &&
depends libxt &&
depends perl &&
-depends texlive &&
-depends qt4 &&
+depends texlive &&
+depends QT &&

optional_depends python \
"--with-python" \
"" \
"for importing old LyX files with lyx2lyx" &&

-optional_depends ispell \
- "--with-ispell" \
- "" \
- "for spell checker support through ispell" &&
+optional_depends hunspell \
+ "--with-hunspell" \
+ "--without-hunspell" \
+ "for spell checker support through hunspell" &&

optional_depends aspell \
- "--with-pspell" \
- "" \
+ "--with-aspell" \
+ "--without-aspell" \
"for spell checker support through aspell" &&
-
+
+optional_depends enchant \
+ "--with-enchant" \
+ "--without-enchant" \
+ "for spell checker support through enchant" &&
+
optional_depends aiksaurus \
"--with-aiksaurus" \
"--without-aiksaurus" \
@@ -34,7 +39,7 @@ optional_depends aiksaurus \

#
# The following dependencies are all runtime dependencies.
-#
+#
suggest_depends cvs "" "" \
"for CVS revision control of files" &&
suggest_depends rcs "" "" \
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index 51e51c6..b88d515 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,5 +1,5 @@
SPELL=lyx
- VERSION=2.2.2
+ VERSION=2.2.3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index d2e94ee..abf74f0 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,8 @@
+2017-12-06 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.3
+ * DEPENDS: updated dependencies, fixed typos
+ * BUILD: Qt 5 support added
+
2016-12-25 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
Fixed SOURCE2_URL[0]

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (33c794bf63dbc1b036c7d10774aae73e9c53e5df), Ismael Luceno, 12/06/2017