sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac5762f7f183230e320d3c1ffb67fd7d0a0047b3)

From: Thomas Orgis <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac5762f7f183230e320d3c1ffb67fd7d0a0047b3)
Date: Wed, 9 Mar 2016 09:09:17 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

editors/lyx/BUILD | 5 +----
editors/lyx/DEPENDS | 5 +++--
editors/lyx/DETAILS | 6 +++---
editors/lyx/HISTORY | 5 +++++
4 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit ac5762f7f183230e320d3c1ffb67fd7d0a0047b3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lyx: update to 2.1.4 and fix things with QT4 (again)

diff --git a/editors/lyx/BUILD b/editors/lyx/BUILD
index 3c97051..d3f5e9a 100755
--- a/editors/lyx/BUILD
+++ b/editors/lyx/BUILD
@@ -1,7 +1,4 @@
CFLAGS=${CFLAGS/-O3/-O2} &&
CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
-OPTS="${OPTS} --with-frontend=qt4 \
- --with-qt-libraries=/usr/lib/qt4" &&
-PATH=$QT4DIR/bin:$PATH &&
-
+OPTS="${OPTS} --with-frontend=qt4 --with-qt4-dir=$QT4DIR" &&
default_build
diff --git a/editors/lyx/DEPENDS b/editors/lyx/DEPENDS
index b977bc1..9386b8a 100755
--- a/editors/lyx/DEPENDS
+++ b/editors/lyx/DEPENDS
@@ -43,8 +43,9 @@ suggest_depends latex-xft-fonts "" ""
\
"ttf fonts with math symbols - used at least by the QT
frontend" &&
suggest_depends POSTSCRIPT-INTERPRETER "" "" \
"for Postscript and pdf formats support." &&
-suggest_depends acroread "" "" \
- "for Acrobat Reader integration." &&
+# No, we really do not suggest that outdated insecure thing.
+#suggest_depends acroread "" "" \
+# "for Acrobat Reader integration." &&
suggest_depends docbook-utils "" "" \
"for tools using DocBook format." &&
suggest_depends grace "" "" \
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index 35879ee..98906c8 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,7 +1,7 @@
SPELL=lyx
- VERSION=2.1.2.2
- VERSIONX=${VERSION%.*.*}.x
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.1.4
+ VERSIONX=2.1.x
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/$VERSIONX/$SOURCE
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 45fb45f..016174b 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,8 @@
+2016-03-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.1.4
+ * DEPENDS: Do not suggest acroread. This is just wrong.
+ * BUILD: fix qt4 for good
+
2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: fix qt4 path

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (ac5762f7f183230e320d3c1ffb67fd7d0a0047b3), Thomas Orgis, 03/09/2016