sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (29cf4d2d1f30d06312cb892d9ab8de524e4264fd)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (29cf4d2d1f30d06312cb892d9ab8de524e4264fd)
- Date: Sun, 2 Oct 2011 10:59:45 -0500
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:
ChangeLog | 7 +++
devel/geany/DETAILS | 2 -
devel/geany/HISTORY | 3 +
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 +
http/ashd/DETAILS | 10 ++---
http/ashd/HISTORY | 4 +-
mail/thunderbird/DETAILS | 2 -
mail/thunderbird/HISTORY | 3 +
php-pear/php/DETAILS | 2 -
php-pear/php/HISTORY | 6 +++
php-pear/php/PRE_BUILD | 4 ++
php-pear/php/security-20110929.patch.bz2 |binary
python-pypi/dblatex/DEPENDS | 2 +
python-pypi/dblatex/DETAILS | 17 +++++++++
python-pypi/dblatex/HISTORY | 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 +++++++++++++++++
utils/usbutils/DETAILS | 4 --
utils/usbutils/HISTORY | 3 +
32 files changed, 284 insertions(+), 13 deletions(-)
New commits:
commit 7263423ff3d34b9bd2b9d12eb83bb0c2d709f7e3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
geany: => 0.21
commit 68bae4bcc4b2cfbd1af9a242e7a756adfdbc29a8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: security bump (legacy)
commit ed8114ccded871c450f7ae6900ac3c43091d2e94
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
dblatex: new spell, produces dvi, ps and pdf from docbook
commit a17f6259a4239b888c451173b02b385bc69dfebc
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
thunderbird: Updated to version 7.0.1
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
commit abc87e683c0773e5fc7322fb97a0aac56169e56b
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
usbutils: Updated SOURCE_URL due to kernel.org being offline
commit 224bdb2ea8a9fcd13749c283f6352d0d07f02e0f
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>
ashd: update to 0.9
diff --git a/ChangeLog b/ChangeLog
index b92f503..f291632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-01 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/dblatex: new spell, produces dvi, ps and pdf from
docbook
+
+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/geany/DETAILS b/devel/geany/DETAILS
index 80ad689..b0f97c3 100755
--- a/devel/geany/DETAILS
+++ b/devel/geany/DETAILS
@@ -1,5 +1,5 @@
SPELL=geany
- VERSION=0.20
+ VERSION=0.21
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://download.geany.org/$SOURCE
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index ea8a64f..34652d9 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,6 @@
+2011-10-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.21
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
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/http/ashd/DETAILS b/http/ashd/DETAILS
index 5316660..2910a56 100755
--- a/http/ashd/DETAILS
+++ b/http/ashd/DETAILS
@@ -10,10 +10,10 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION=0.8
+ VERSION=0.9
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.dolda2000.com/~fredrik/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:6c0844f7b91465b74f6b7f6cba414576950c3178084b531e2c0d2dd0b552b95ccc0c6d5911b5be23d57503e0fcef7e1e0ef87fabd42bae748dfe310d2a9f1f24
+
SOURCE_HASH=sha512:9cf2e76df1adf6fe3ab3aee779d6f7272322e0bf646912a505b2789577b2e8dd593fc4d8b300c8ca73777dbd0c964f01fbb8afc098b9bfc21b2aeb639090b4b1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://www.dolda2000.com/~fredrik/ashd/";
@@ -30,9 +30,9 @@ simple protocol (not unlike Unix pipelines). The design of
Ashd brings it
a number of nice properties, the following being the most noteworthy ones.
Sanity of design The separation of concerns between different, independent
-programs is an example of standard Unix philosophy - each program
+programs is an example of standard Unix philosophy – each program
does one thing only, but does it well (I hope). The clean delineation of
-functions allows each program to be very small and simple - currently,
+functions allows each program to be very small and simple – currently,
each of the programs in the collection (including even the core HTTP parser
program, htparser, as long as one does not count its, quite optional, SSL
implementation) is implemented in less than 1,000 lines of C code (and most
@@ -54,6 +54,6 @@ possible, and most programs are configured simply with
command-line options.
Persistence Though Ashd is a multi-process program, it is not in the same
sense as e.g. Apache. Each request handler continues to run indefinitely
and does not spawn multiple copies of itself, meaning that all process
-state persists between requests - session data can be kept in memory,
+state persists between requests – session data can be kept in memory,
connections to back-end services can be kept open, and so on.
EOF
diff --git a/http/ashd/HISTORY b/http/ashd/HISTORY
index 1af6cb5..f69d3a7 100644
--- a/http/ashd/HISTORY
+++ b/http/ashd/HISTORY
@@ -1,5 +1,5 @@
-2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Remove non-ASCII dash from long description.
+2011-10-01 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 0.9
2011-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index b7be9fd..4033cba 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=7.0
+ VERSION=7.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 5ac3136..a172d97 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2011-10-01 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 7.0.1
+
2011-09-29 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 7.0
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index a5bc870..e57ebc5 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -21,7 +21,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=15
+ SECURITY_PATCH=16
SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 5025371..cf2d618 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2011-10-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (legacy branch)
+ * PRE_BUILD: apply the patch
+ * security-20110929.patch.bz2: added, backported security fixes from
5.3
+ branch by project php52-backports
+
2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: suhosin patch 5.2.16 applies fine for PHP 5.2.17
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index 3eb0e38..b02a038 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
+if [[ $PHP5_BRANCH == legacy ]]; then
+ bzcat "$SPELL_DIRECTORY/security-20110929.patch.bz2" | patch -p1
+fi &&
+
if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
verify_source "${SOURCE2}" &&
zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
diff --git a/php-pear/php/security-20110929.patch.bz2
b/php-pear/php/security-20110929.patch.bz2
new file mode 100644
index 0000000..a387f51
Binary files /dev/null and b/php-pear/php/security-20110929.patch.bz2 differ
diff --git a/python-pypi/dblatex/DEPENDS b/python-pypi/dblatex/DEPENDS
new file mode 100755
index 0000000..eea3ab1
--- /dev/null
+++ b/python-pypi/dblatex/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends texlive
diff --git a/python-pypi/dblatex/DETAILS b/python-pypi/dblatex/DETAILS
new file mode 100755
index 0000000..56fcc81
--- /dev/null
+++ b/python-pypi/dblatex/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=dblatex
+ VERSION=0.3.2
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${SPELL}-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:af27694b9f2e5e549f1260721c7eeb92cf0a0f8d8a2555cc314fee76af1e9ce29ec4867031790bae1980937bab4cb9879fc8f267a971da25829ed6f7d67e977b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://dblatex.sourceforge.net/";
+ LICENSE[0]=GPL2
+ ENTERED=20111001
+ SHORT="Produces DVI, PostScript, PDF documents from DocBook
sources"
+cat << EOF
+DocBook to LaTeX Publishing that transforms your SGML/XML DocBook documents
to
+DVI, PostScript or PDF by translating them in pure LaTeX as a first process.
+MathML 2.0 markups are supported, too. It originally started as a clone
+of DB2LaTeX, but has been enhanced extensively since then and is actively
+maintained by the upstream author.
+EOF
diff --git a/python-pypi/dblatex/HISTORY b/python-pypi/dblatex/HISTORY
new file mode 100644
index 0000000..3c32c05
--- /dev/null
+++ b/python-pypi/dblatex/HISTORY
@@ -0,0 +1,3 @@
+2011-10-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+
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
+
diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index 94a2bd6..e85358e 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,13 +1,11 @@
SPELL=usbutils
VERSION=004
-
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
+
SOURCE_URL[0]=http://ftp.sunet.se/pub/Linux/kernel.org/linux/utils/usb/usbutils/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sign
SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.linux-usb.org/
ENTERED=20021218
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index 5a59a17..8e40049 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,6 @@
+2011-10-01 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated SOURCE_URL due to kernel.org being offline
+
2011-08-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 004, upstream gpg checking
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (29cf4d2d1f30d06312cb892d9ab8de524e4264fd), Vlad Glagolev, 10/02/2011
Archive powered by MHonArc 2.6.24.