Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (011dd035d78172d4ddbac21733a2d28e2aa6c676)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (011dd035d78172d4ddbac21733a2d28e2aa6c676)
  • Date: Thu, 6 Sep 2012 13:16:23 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 4 ++++
audio-libs/clalsadrv/BUILD | 3 ++-
audio-libs/clalsadrv/DETAILS | 10 +++++-----
audio-libs/clalsadrv/HISTORY | 4 ++++
audio-libs/clalsadrv/INSTALL | 2 +-
audio-libs/clalsadrv/PRE_BUILD | 4 ----
audio-players/mpg123/DETAILS | 2 +-
audio-players/mpg123/HISTORY | 3 +++
audio-soft/jaaa/BUILD | 1 +
audio-soft/jaaa/DEPENDS | 4 ++++
audio-soft/jaaa/DETAILS | 14 ++++++++++++++
audio-soft/jaaa/HISTORY | 3 +++
audio-soft/jaaa/INSTALL | 1 +
dev/null |binary
ftp/uget/DETAILS | 6 +++---
ftp/uget/HISTORY | 3 +++
java/icedtea6/DETAILS | 4 +++-
java/icedtea6/HISTORY | 3 +++
java/icedtea6/icedtea6-1.11.3.tar.gz.sig | 0
java/icedtea6/icedtea6-1.11.4.tar.gz.sig |binary
net/fping/DETAILS | 4 ++--
net/fping/HISTORY | 3 +++
net/wpa_supplicant/HISTORY | 3 +++
net/wpa_supplicant/INSTALL | 6 ++++--
utils/less/DETAILS | 2 +-
utils/less/HISTORY | 3 +++
x11-toolkits/qwt5/BUILD | 8 +-------
x11-toolkits/qwt5/CONFLICTS | 3 +++
x11-toolkits/qwt5/DEPENDS | 2 +-
x11-toolkits/qwt5/DETAILS | 4 ++--
x11-toolkits/qwt5/HISTORY | 5 +++++
x11-toolkits/qwt5/PRE_BUILD | 22 +++++++++-------------
32 files changed, 92 insertions(+), 44 deletions(-)

New commits:
commit e04b3f969b9179c29efcb27d3a43a6d26e7684fd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

uget: => 1.10

commit 6144c2e9dc83ce6be92a551124bd059a2ca26a9c
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

icedtea6: updated to 1.11.4

commit db3fe9e22529e8a2bd237d263d581c6b481cda74
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wpa_supplicant: fix qt4/gui switch

commit 80e6128044f0f25fecb7412cc9bcf3627f144804
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

jaaa: added

commit 694f56f84d1da450530dabb1157810f69c78fb3c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qwt5: update tp 6.0.1

commit 6500ad9434c742aa135e0c5de43eaa3cca96a983
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpg132: bump to 1.14.4

commit 1bf8f77eb4ed87a2b3b7793271aba0499cf6fb17
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

clalsadrv: bump to 2.0.0

commit 95f1682c4bd1f737a649a79af9fca2a71a891384
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

less: => 451

commit e759e2b89078d324c5f36a2ba1edaaf66183d1f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fping: => 3.4

diff --git a/ChangeLog b/ChangeLog
index dfb4725..4b3aeaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * audio-soft/jaaa: new spell, audio analyzer
+
+
2012-09-04 Vlad Glagolev <stealth AT sourcemage.org>
* graphics/tiff2png: new spell, TIFF to PNG converter

diff --git a/audio-libs/clalsadrv/BUILD b/audio-libs/clalsadrv/BUILD
index 8f58e6d..7c0fefc 100755
--- a/audio-libs/clalsadrv/BUILD
+++ b/audio-libs/clalsadrv/BUILD
@@ -1 +1,2 @@
-make
+cd libs
+make PREFIX="$INSTALL_ROOT/usr"
diff --git a/audio-libs/clalsadrv/DETAILS b/audio-libs/clalsadrv/DETAILS
index 459d24c..73c43db 100755
--- a/audio-libs/clalsadrv/DETAILS
+++ b/audio-libs/clalsadrv/DETAILS
@@ -1,10 +1,10 @@
SPELL=clalsadrv
- VERSION=1.2.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://www.kokkinizita.net/linuxaudio/downloads/$SOURCE
-
SOURCE_HASH=sha512:a1b15551488d0bb597339804b36ed4cbb2459db24a3f71c1a068e3874eba10059668d358d8e0202b2964d3b80ed41d51f6db657614102a9a2b99597a7cd87106
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- WEB_SITE=http://users.skynet.be/solaris/linuxaudio/
+
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/$SOURCE
+
SOURCE_HASH=sha512:6913fefa913ef50a8245541a7a1cafe76d1768bb4fa302d6ac0db86b40cc8b702ae3d257d0998809cc26f116a69db591b73f01a4ca0021bd062189438ca69ab8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://kokkinizita.linuxaudio.org/linuxaudio/
LICENSE[0]=GPL
ENTERED=20060818
KEYWORDS="library audio"
diff --git a/audio-libs/clalsadrv/HISTORY b/audio-libs/clalsadrv/HISTORY
index a13ad64..1fa4e76 100644
--- a/audio-libs/clalsadrv/HISTORY
+++ b/audio-libs/clalsadrv/HISTORY
@@ -1,3 +1,7 @@
+2012-09-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, INSTALL, BUILD: bump to 2.0.0, website update
+ * PRE_BUILD: gone
+
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/audio-libs/clalsadrv/INSTALL b/audio-libs/clalsadrv/INSTALL
index f1c9903..82b3260 100755
--- a/audio-libs/clalsadrv/INSTALL
+++ b/audio-libs/clalsadrv/INSTALL
@@ -1,2 +1,2 @@
# No lib64 == no suffix.
-make SUFFIX= install
+make SUFFIX= PREFIX="$INSTALL_ROOT/usr" install
diff --git a/audio-libs/clalsadrv/PRE_BUILD b/audio-libs/clalsadrv/PRE_BUILD
deleted file mode 100755
index 120c542..0000000
--- a/audio-libs/clalsadrv/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "s:PREFIX = .*:PREFIX = ${INSTALL_ROOT}/usr:" Makefile
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index fecd0d8..f23b391 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
SPELL=mpg123
- VERSION=1.14.3
+ VERSION=1.14.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index 1936bbe..2d9f05d 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2012-07-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.14.4
+
2012-07-04 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: Update to 1.14.3

diff --git a/audio-soft/jaaa/BUILD b/audio-soft/jaaa/BUILD
new file mode 100755
index 0000000..0374137
--- /dev/null
+++ b/audio-soft/jaaa/BUILD
@@ -0,0 +1 @@
+make PREFIX="$INSTALL_ROOT/usr"
diff --git a/audio-soft/jaaa/DEPENDS b/audio-soft/jaaa/DEPENDS
new file mode 100755
index 0000000..e99a328
--- /dev/null
+++ b/audio-soft/jaaa/DEPENDS
@@ -0,0 +1,4 @@
+depends clalsadrv &&
+depends clthreads &&
+depends clxclient &&
+depends JACK-DRIVER
diff --git a/audio-soft/jaaa/DETAILS b/audio-soft/jaaa/DETAILS
new file mode 100755
index 0000000..52bc28a
--- /dev/null
+++ b/audio-soft/jaaa/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=jaaa
+ VERSION=0.6.0
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${SOURCE}
+
SOURCE_HASH=sha512:a93ea4c8a5fe9b1589a5c47052eb56b74164a6baaee835f11c261dd8cfa1141354d52ec71519bff93ecce9d7787138b5d12ead10f44fa3f4d0d83ecc390f3538
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://kokkinizita.linuxaudio.org/linuxaudio/";
+ LICENSE[0]=GPL
+ ENTERED=20120905
+ SHORT="signal generator and spectrum analyzer"
+cat << EOF
+Jaaa (JACK and ALSA Audio Analyser, is an audio signal generator and spectrum
+analyser designed to make accurate measurements.
+EOF
diff --git a/audio-soft/jaaa/HISTORY b/audio-soft/jaaa/HISTORY
new file mode 100644
index 0000000..987848f
--- /dev/null
+++ b/audio-soft/jaaa/HISTORY
@@ -0,0 +1,3 @@
+2012-09-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/audio-soft/jaaa/INSTALL b/audio-soft/jaaa/INSTALL
new file mode 100755
index 0000000..9021604
--- /dev/null
+++ b/audio-soft/jaaa/INSTALL
@@ -0,0 +1 @@
+make SUFFIX= PREFIX="$INSTALL_ROOT/usr" install
diff --git a/ftp/uget/DETAILS b/ftp/uget/DETAILS
index 8565e3c..1505cb8 100755
--- a/ftp/uget/DETAILS
+++ b/ftp/uget/DETAILS
@@ -1,8 +1,8 @@
SPELL=uget
- VERSION=1.8.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.10
+ SOURCE=$SPELL-$VERSION-2.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/urlget/$SOURCE
-
SOURCE_HASH=sha512:72495d475079b35ed0b7b58727a8ff8de500e6d81100bdbd5f292955bdebcd217119846b8f84c892d8ec8cfd1970c75b8d5e5d494ddbcd14fc116c58a818d919
+
SOURCE_HASH=sha512:1c37f26988c2137ea1f6904e2761e366bfe7252269f0029862619134928f603dd14087eb425ac6aad25a30d7a2574c172c03dc4d9f5f5e993684acd40f28b84c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://uget.visuex.com/
LICENSE[0]=LGPL
diff --git a/ftp/uget/HISTORY b/ftp/uget/HISTORY
index a683b61..0a403bd 100644
--- a/ftp/uget/HISTORY
+++ b/ftp/uget/HISTORY
@@ -1,3 +1,6 @@
+2012-09-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.10-2
+
2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.2

diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
index c4b38ad..220090e 100755
--- a/java/icedtea6/DETAILS
+++ b/java/icedtea6/DETAILS
@@ -1,11 +1,13 @@
SPELL=icedtea6
- VERSION=1.11.3
+ VERSION=1.11.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
SOURCE4=jdk6-jaf-b20.zip
SOURCE5=jaxp144_03.zip
+# SOURCE5=jaxp145_01.zip
SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
+# SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
SOURCE2_IGNORE=signature
SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index e1a02a1..d8d3e18 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,6 @@
+2012-09-05 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 1.11.4
+
2012-06-18 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added icedtea7

diff --git a/java/icedtea6/icedtea6-1.11.3.tar.gz.sig
b/java/icedtea6/icedtea6-1.11.3.tar.gz.sig
deleted file mode 100644
index ec26bd6..0000000
Binary files a/java/icedtea6/icedtea6-1.11.3.tar.gz.sig and /dev/null differ
diff --git a/java/icedtea6/icedtea6-1.11.4.tar.gz.sig
b/java/icedtea6/icedtea6-1.11.4.tar.gz.sig
new file mode 100644
index 0000000..b84f179
Binary files /dev/null and b/java/icedtea6/icedtea6-1.11.4.tar.gz.sig differ
diff --git a/net/fping/DETAILS b/net/fping/DETAILS
index 575102c..793e074 100755
--- a/net/fping/DETAILS
+++ b/net/fping/DETAILS
@@ -1,9 +1,9 @@
SPELL=fping
- VERSION=3.3
+ VERSION=3.4
SOURCE=fping-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.fping.org/dist/$SOURCE
-
SOURCE_HASH=sha512:8137ac76a07349f5855d8cac125c12cfde2699752b2466cf8fb8f0d732a6cc2e089fa93d62eb443d26665012c805792e3ead910da607e85ebdac006f0b1525e0
+
SOURCE_HASH=sha512:f9580c5537550738b316aa2ed50408035ab3dca789960c58414687f0aa253dcafaa751009bed417e6c11ec97f02bdf4d21c57f5b0f655cd28eccecb1107192a2
WEB_SITE=http://www.fping.org/
ENTERED=20020326
KEYWORDS="net"
diff --git a/net/fping/HISTORY b/net/fping/HISTORY
index b72402c..fe2a5ee 100644
--- a/net/fping/HISTORY
+++ b/net/fping/HISTORY
@@ -1,3 +1,6 @@
+2012-09-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.4
+
2012-08-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.3
* CONFIGURE: added IPv6 configure option
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0913401..9abd8cf 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: qt4 is the switch for wpa_gui
+
2011-10-10 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: removed optional dependency on qt-x11

diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 07cd6b7..bde3a13 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,3 +1,5 @@
+cd "$SOURCE_DIRECTORY/wpa_supplicant" &&
+
make DESTDIR="$INSTALL_ROOT" install &&

install -vm 644 doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8" &&
@@ -6,8 +8,8 @@ install -vm 644 doc/docbook/*.5
"$INSTALL_ROOT/usr/share/man/man5" &&
install -vm 755 -d "$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&
install -vm 644 wpa_supplicant.conf
"$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&

-if is_depends_enabled $SPELL qt-x11; then
- install -vm 755 wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin"
+if is_depends_enabled $SPELL qt4; then
+ install -vm 755 wpa_gui-qt4/wpa_gui "$INSTALL_ROOT/usr/sbin"
fi &&

if is_depends_enabled $SPELL dbus; then
diff --git a/utils/less/DETAILS b/utils/less/DETAILS
index 590036f..c6dd576 100755
--- a/utils/less/DETAILS
+++ b/utils/less/DETAILS
@@ -1,5 +1,5 @@
SPELL=less
- VERSION=444
+ VERSION=451
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/less/HISTORY b/utils/less/HISTORY
index 7e6d336..e944d24 100644
--- a/utils/less/HISTORY
+++ b/utils/less/HISTORY
@@ -1,3 +1,6 @@
+2012-09-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 451
+
2011-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 444

diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index 068c7d2..7255991 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1,9 +1,3 @@
export QTDIR=${INSTALL_ROOT}/usr &&
-local QMAKE &&
-if spell_ok qt4;then
- QMAKE=${TRACK_ROOT}/usr/bin/qt4/qmake
-else
- QMAKE=${TRACK_ROOT}/usr/bin/qmake
-fi &&
-$QMAKE &&
+$TRACK_ROOT/usr/bin/qt4/qmake &&
make
diff --git a/x11-toolkits/qwt5/CONFLICTS b/x11-toolkits/qwt5/CONFLICTS
new file mode 100755
index 0000000..b69e67d
--- /dev/null
+++ b/x11-toolkits/qwt5/CONFLICTS
@@ -0,0 +1,3 @@
+# Shall not be present during build. Stupid, I know.
+# See:
http://sourceforge.net/tracker/?func=detail&aid=3470306&group_id=13693&atid=113693
+conflicts qwt5
diff --git a/x11-toolkits/qwt5/DEPENDS b/x11-toolkits/qwt5/DEPENDS
index 4cdd0bb..028837c 100755
--- a/x11-toolkits/qwt5/DEPENDS
+++ b/x11-toolkits/qwt5/DEPENDS
@@ -1 +1 @@
-depends QT
+depends qt4
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 792f7b2..706b929 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,9 +1,9 @@
SPELL=qwt5
- VERSION=5.2.0
+ VERSION=6.0.1
SOURCE=qwt-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/qwt/${SOURCE}
-
SOURCE_HASH=sha512:15e1fd4eb5e3f1bd3f91ac1ce26358f69f67a81e5207aca81414d408591c112b7b3071fd58b8f226b495fc9d2cbe1f67c44db631ef0c759b8b6376c80e866562
+
SOURCE_HASH=sha512:36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610
WEB_SITE=http://qwt.sourceforge.net
ENTERED=20061003
LICENSE[0]=http://qwt.sourceforge.net/qwtlicense.html
diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY
index 2fe2fe0..f623d90 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,3 +1,8 @@
+2012-08-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, BUILD, DEPENDS, PRE_BUILD: update to qt4-only 6.0.1 ...
qwt5
+ name is suboptimal now.
+ * CONFLICTS: stupid qmake makes build conflict with installed version
+
2009-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.0

diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD
index e73fe2a..9ac9b76 100755
--- a/x11-toolkits/qwt5/PRE_BUILD
+++ b/x11-toolkits/qwt5/PRE_BUILD
@@ -1,17 +1,13 @@
default_pre_build &&
-sedit "s: INSTALLBASE = /usr/local/qwt-${VERSION}: INSTALLBASE =
$INSTALL_ROOT/usr:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-sedit "s:#CONFIG += QwtSVGItem:CONFIG += QwtSVGItem:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-#sedit "s:#CONFIG += QwtExamples:CONFIG += QwtExamples:" \
-# $SOURCE_DIRECTORY/qwtconfig.pri &&
-sedit "s:doc.path = \$\$INSTALLBASE/doc:doc.path =
\$\$INSTALLBASE/share/doc:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&

-sed -e '/realtime_plot \\/d' \
- -e '/bode \\/d' \
- -e '/svgmap/d' \
- -i $SOURCE_DIRECTORY/examples/examples.pro &&
+# Those messy droppings of this QT4 lib are annoying!
+# Trying to get things into some system-like order.

-sed -i -e '/INSTALLS/ s,doc,,' $SOURCE_DIRECTORY/src/src.pro
+sedit "s: QWT_INSTALL_PREFIX = /usr/local/qwt-\$\$QWT_VERSION:
QWT_INSTALL_PREFIX = $INSTALL_ROOT/usr:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri &&
+
+sedit "s:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/doc:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/share/doc/qwt:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri &&

+sedit "s:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/features:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features:" \
+ $SOURCE_DIRECTORY/qwtconfig.pri



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (011dd035d78172d4ddbac21733a2d28e2aa6c676), Eric Sandall, 09/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page