Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27ad23064b250534ded8a77e20318c4df7b44ed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b27ad23064b250534ded8a77e20318c4df7b44ed)
  • Date: Sat, 1 Oct 2011 15:05:44 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4 ++
devel/qtassistantclient/.DETAILS.swp |binary
devel/qtassistantclient/01_build_system.diff | 48
+++++++++++++++++++++++++++
devel/qtassistantclient/BUILD | 7 +++
devel/qtassistantclient/DEPENDS | 1
devel/qtassistantclient/DETAILS | 23 ++++++++++++
devel/qtassistantclient/HISTORY | 4 ++
devel/qtassistantclient/INSTALL | 14 +++++++
devel/qtassistantclient/PRE_BUILD | 3 +
science/scidavis/BUILD | 1
science/scidavis/DEPENDS | 8 ++++
science/scidavis/DETAILS | 20 +++++++++++
science/scidavis/HISTORY | 3 +
science/scidavis/PRE_BUILD | 11 ++++++
science/scidavis/conf.patch | 40 ++++++++++++++++++++++
science/scidavis/qtassistant.patch | 11 ++++++
science/scidavis/qwtplot3d.patch | 31 +++++++++++++++++
17 files changed, 229 insertions(+)

New commits:
commit b27ad23064b250534ded8a77e20318c4df7b44ed
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/scidavis: new spell, an interactive plotting tool

commit 208832cf45cdca8dcc4c23e42a0192ab6ef95a97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/qtassistantclient: new spell, legacy files for qt4

diff --git a/ChangeLog b/ChangeLog
index b92f503..e7b4213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * devel/qtassistantclient: new spell, some legacy files for qt4
+ * science/scidavis: new spell, an interactive plotting tool
+
2011-09-30 Ladislav Hagara <hgr AT vabo.cz>
* doc/itstool: new spell, convert between XML and PO using ITS
* gnome2-libs/yelp-tools: scripts and utilities for Yelp documentation
diff --git a/devel/qtassistantclient/.DETAILS.swp
b/devel/qtassistantclient/.DETAILS.swp
new file mode 100644
index 0000000..89236bd
Binary files /dev/null and b/devel/qtassistantclient/.DETAILS.swp differ
diff --git a/devel/qtassistantclient/01_build_system.diff
b/devel/qtassistantclient/01_build_system.diff
new file mode 100644
index 0000000..3266ced
--- /dev/null
+++ b/devel/qtassistantclient/01_build_system.diff
@@ -0,0 +1,48 @@
+Description: several workarounds for the build system which is completely
broken
+Author: Fathi Boudra <fabo AT debian.org>
+
+--- a/compat.pro
++++ b/compat.pro
+@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad
+ translations/assistant_adp_zh_CN.ts \
+ translations/assistant_adp_zh_TW.ts
+
+-unix:!contains(QT_CONFIG, zlib):LIBS += -lz
+-
+ contains(CONFIG, static): {
+ win32 {
+ exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) {
+@@ -81,3 +79,7 @@ contains(CONFIG, static): {
+ }
+ }
+ }
++
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+--- a/lib/lib.pro
++++ b/lib/lib.pro
+@@ -16,8 +16,8 @@ HEADERS = qassistantclient.h \
+ qassistantclient_global.h
+ SOURCES = qassistantclient.cpp
+
+-DESTDIR = ../../../../lib
+-DLLDESTDIR = ../../../../bin
++DESTDIR = lib
++DLLDESTDIR = bin
+
+ unix {
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
+@@ -62,7 +62,7 @@ win32 {
+ }
+
+ qt_install_headers {
+- assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
++ assistant_headers.files = qassistantclient.h qassistantclient_global.h
+ assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant
+ INSTALLS += assistant_headers
+ }
+--- /dev/null
++++ b/lib/QtAssistant/qassistantclient_global.h
+@@ -0,0 +1 @@
++#include "../qassistantclient_global.h"
diff --git a/devel/qtassistantclient/BUILD b/devel/qtassistantclient/BUILD
new file mode 100755
index 0000000..baf2c66
--- /dev/null
+++ b/devel/qtassistantclient/BUILD
@@ -0,0 +1,7 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
+cd lib &&
+qmake PREFIX=$INSTALL_ROOT/usr CONFIG+=create_prl &&
+default_build_make &&
+cd ${SOURCE_DIRECTORY}/translations &&
+lrelease assistant_adp_*.ts
diff --git a/devel/qtassistantclient/DEPENDS b/devel/qtassistantclient/DEPENDS
new file mode 100755
index 0000000..2e4e2ef
--- /dev/null
+++ b/devel/qtassistantclient/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/devel/qtassistantclient/DETAILS b/devel/qtassistantclient/DETAILS
new file mode 100755
index 0000000..3ef2289
--- /dev/null
+++ b/devel/qtassistantclient/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=qtassistantclient
+ VERSION=4.6.3
+
SOURCE="qt-assistant-qassistantclient-library-compat-src-${VERSION}.tar.gz"
+ SOURCE_URL[0]=ftp://ftp.qt.nokia.com/qt/source/${SOURCE}
+
SOURCE_HASH=sha512:a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qt-assistant-qassistantclient-library-compat-version-${VERSION}"
+ WEB_SITE="http://doc.qt.nokia.com/4.6/qassistantclient.html";
+ LICENSE[0]=GPL
+ ENTERED=20111001
+ SHORT="Qt Assistant client library"
+cat << EOF
+Qt is a cross-platform C++ application framework. Qt's primary feature is
+its rich set of widgets that provide standard GUI functionality.
+
+This package contains the files necessary to build applications using the
+deprecated QAssistantClient class, which is used together with the legacy
+Assistant Document Profile (.adp) version of Qt Assistant.
+
+This class is obsolete. It is provided to keep old source code working. It
+is strongly advised against using it in new code. New code should use the
+Qt Help Framework introduced in Qt 4.4 and/or the version of Qt Assistant
+based on it (also introduced in Qt 4.4) instead.
+EOF
diff --git a/devel/qtassistantclient/HISTORY b/devel/qtassistantclient/HISTORY
new file mode 100644
index 0000000..81c8e5a
--- /dev/null
+++ b/devel/qtassistantclient/HISTORY
@@ -0,0 +1,4 @@
+2011-10-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 01_build_system.diff, BUILD, DEPENDS, DETAILS,
+ INSTALL, PRE_BUILD: spell created, patch and
+ build procedure borrowed from debian
diff --git a/devel/qtassistantclient/INSTALL b/devel/qtassistantclient/INSTALL
new file mode 100755
index 0000000..d88460e
--- /dev/null
+++ b/devel/qtassistantclient/INSTALL
@@ -0,0 +1,14 @@
+cd ${SOURCE_DIRECTORY}/lib &&
+default_install &&
+cd ${SOURCE_DIRECTORY} &&
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d"
${INSTALL_ROOT}/usr/lib/libQtAssistantClient.prl &&
+mkdir -p ${INSTALL_ROOT}/usr/share/qt4/translations/ &&
+install -p -m0644 translations/assistant_adp_*.qm
${INSTALL_ROOT}/usr/share/qt4/translations/ &&
+install -D -p -m0644 features/assistant.prf
${INSTALL_ROOT}/usr/share/qt4/mkspecs/features/assistant.prf &&
+mkdir -p ${INSTALL_ROOT}/usr/include/qt4/QtAssistant &&
+echo '#include "qassistantclient.h"' >
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QAssistantClient &&
+echo -e '#ifndef QT_QTASSISTANT_MODULE_H' >
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QtAssistant &&
+echo -e '#define QT_QTASSISTANT_MODULE_H' >>
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QtAssistant &&
+echo -e '#include <QtNetwork/QtNetwork>' >>
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QtAssistant &&
+echo -e '#include "qassistantclient.h"' >>
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QtAssistant &&
+echo -e '#endif' >>
${INSTALL_ROOT}/usr/include/qt4/QtAssistant/QtAssistant
diff --git a/devel/qtassistantclient/PRE_BUILD
b/devel/qtassistantclient/PRE_BUILD
new file mode 100755
index 0000000..5360bed
--- /dev/null
+++ b/devel/qtassistantclient/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/01_build_system.diff
diff --git a/science/scidavis/BUILD b/science/scidavis/BUILD
new file mode 100755
index 0000000..eec3de4
--- /dev/null
+++ b/science/scidavis/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/science/scidavis/DEPENDS b/science/scidavis/DEPENDS
new file mode 100755
index 0000000..15e7b47
--- /dev/null
+++ b/science/scidavis/DEPENDS
@@ -0,0 +1,8 @@
+depends qt4 &&
+depends qwt5 &&
+depends qwtplot3d &&
+depends gsl &&
+depends muparser &&
+depends qtassistantclient &&
+
+optional_depends pyqt4 "" "" "for python scripting support"
diff --git a/science/scidavis/DETAILS b/science/scidavis/DETAILS
new file mode 100755
index 0000000..39917e7
--- /dev/null
+++ b/science/scidavis/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=scidavis
+ VERSION=0.2.4
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/SciDAVis/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:84b385c39aab96ed1abede7a81912d47e1d5fc6f9e9de76d0492aeefe1a2ecec61b9921cc89815bdb5eff810e1fdb2ce1bb6be0b4fda3b061b1902ee2c0517d2
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://scidavis.sourceforge.net/";
+ LICENSE[0]=GPL
+ ENTERED=20111001
+ SHORT="a free application for Scientific Data Analysis and
Visualization"
+cat << EOF
+SciDAVis is a free interactive application aimed at data analysis and
+publication-quality plotting. It combines a shallow learning curve and an
+intuitive, easy-to-use graphical user interface with powerful features such
+as scriptability and extensibility.
+
+SciDAVis is similar in its field of application to proprietary Windows
+applications like Origin and SigmaPlot as well as free applications like
+QtiPlot, Labplot and Gnuplot.
+EOF
diff --git a/science/scidavis/HISTORY b/science/scidavis/HISTORY
new file mode 100644
index 0000000..114cb52
--- /dev/null
+++ b/science/scidavis/HISTORY
@@ -0,0 +1,3 @@
+2011-10-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, conf.patch, DEPENDS, DETAILS, PRE_BUILD,
+ qtassistant.patch, qwtplot3d.patch: spell created
diff --git a/science/scidavis/PRE_BUILD b/science/scidavis/PRE_BUILD
new file mode 100755
index 0000000..f2bb6c5
--- /dev/null
+++ b/science/scidavis/PRE_BUILD
@@ -0,0 +1,11 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+#patch -p0 < $SPELL_DIRECTORY/conf.patch &&
+sedit '/^LIBS/d; s,^#unix,unix,p' fitPlugins/fitRational?/fitRational?.pro &&
+sedit 's:manual::' scidavis.pro &&
+patch -p1 < ${SCRIPT_DIRECTORY}/qwtplot3d.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/qtassistant.patch &&
+
+if ! is_depends_enabled $SPELL pyqt4; then
+ sed -i '/^SCRIPT.*Python/d' $SOURCE_DIRECTORY/scidavis/scidavis.pro
+fi
diff --git a/science/scidavis/conf.patch b/science/scidavis/conf.patch
new file mode 100644
index 0000000..3fd07af
--- /dev/null
+++ b/science/scidavis/conf.patch
@@ -0,0 +1,40 @@
+--- qtiplot/scidavis.pro.orig 2007-07-12 17:42:26.000000000 +0200
++++ qtiplot/scidavis.pro 2007-07-12 17:45:40.000000000 +0200
+@@ -26,11 +26,12 @@
+
#############################################################################
+
+ INCLUDEPATH += ../3rdparty/muParser
+-INCLUDEPATH += ../3rdparty/qwtplot3d/include
+-INCLUDEPATH += ../3rdparty/qwt/src
+ INCLUDEPATH += ../3rdparty/liborigin
+-INCLUDEPATH += ../3rdparty/gsl/include
+ INCLUDEPATH += ../3rdparty/zlib123/include
++INCLUDEPATH += /usr/include/qwtplot3d
++INCLUDEPATH += /usr/include/qwt
++INCLUDEPATH += /usr/include/gsl
++
+
+ ##################### 3rd PARTY LIBRARIES SECTION
###########################
+ #!!! Warning: You must modify these paths according to your computer
settings
+@@ -43,18 +44,14 @@
+ unix:LIBS += -L /usr/lib$${libsuff}
+
+ # statically link against Qwt(3D) in 3rdparty
+-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+ # dynamically link against Qwt(3D) installed system-wide
+ # WARNING: make sure they are compiled against Qt4
+-#unix:LIBS += -lqwtplot3d
+-#unix:LIBS += -lqwt
++unix:LIBS += -lqwtplot3d
++unix:LIBS += -lqwt
+
+ # statically link against GSL in 3rdparty
+-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
+-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
+
+ ##################### Windows
###############################################
+
diff --git a/science/scidavis/qtassistant.patch
b/science/scidavis/qtassistant.patch
new file mode 100644
index 0000000..472de89
--- /dev/null
+++ b/science/scidavis/qtassistant.patch
@@ -0,0 +1,11 @@
+--- scidavis-0.2.4/scidavis/scidavis.pro.orig 2011-10-01 21:41:35.508464199
+0200
++++ scidavis-0.2.4/scidavis/scidavis.pro 2011-10-01 21:42:02.618143390
+0200
+@@ -114,6 +114,8 @@
+ ##dynamically link against GSL and zlib installed system-wide
+ #unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+
++unix:INCLUDEPATH += /usr/include/qt4/QtAssistant
++
+
#############################################################################
+ ### Default settings for Windows
+
#############################################################################
diff --git a/science/scidavis/qwtplot3d.patch
b/science/scidavis/qwtplot3d.patch
new file mode 100644
index 0000000..ac6552d
--- /dev/null
+++ b/science/scidavis/qwtplot3d.patch
@@ -0,0 +1,31 @@
+--- scidavis-0.2.4/scidavis/scidavis.pro.orig 2011-10-01 18:33:46.959397655
+0200
++++ scidavis-0.2.4/scidavis/scidavis.pro 2011-10-01 18:35:01.406552063
+0200
+@@ -87,11 +87,11 @@
+ ### are compiled against Qt4), dynamically against everything else.
+
#############################################################################
+
+-unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
+-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
++#unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
++#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
+-unix:INCLUDEPATH += ../3rdparty/qwt/src
+-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
++#unix:INCLUDEPATH += ../3rdparty/qwt/src
++#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+
+ unix:LIBS += -L/usr/lib$${libsuff}
+ unix:LIBS += -lgsl -lgslcblas -lz
+@@ -108,9 +108,9 @@
+ ## WARNING: make sure they are compiled against >= Qt4.2
+ ## Mixing Qt 4.2 and Qt >= 4.3 compiled stuff may also
+ ## cause problems.
+-#unix:INCLUDEPATH += /usr/include/qwtplot3d
+-#unix:LIBS += -lqwtplot3d
+-#unix:LIBS += -lqwt
++unix:INCLUDEPATH += /usr/include/qwtplot3d
++unix:LIBS += -lqwtplot3d
++unix:LIBS += -lqwt
+ ##dynamically link against GSL and zlib installed system-wide
+ #unix:LIBS += -lgsl -lgslcblas -lz -lmuparser
+




Archive powered by MHonArc 2.6.24.

Top of Page