[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b867e3505c3e7e18f340eba2868f7aeb7ab6966b)

Treeve Jelbert scm at mail.sourcemage.org
Tue Jan 9 08:22:20 EST 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 x11-toolkits/qwt5/BUILD   |   11 +++++++++--
 x11-toolkits/qwt5/DEPENDS |    2 +-
 x11-toolkits/qwt5/DETAILS |    4 ++--
 x11-toolkits/qwt5/HISTORY |    7 +++++++
 x11-toolkits/qwt5/INSTALL |    2 ++
 5 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit e5bc5e2445761a60a1636fe167a9794074f599b7
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    qwt5-5.0.0rc1

diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index 00f2e3b..483934a 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1,7 +1,14 @@
 export QTDIR=${INSTALL_ROOT}/usr               &&
-${TRACK_ROOT}/usr/bin/qt4/qmake qwt.pro        &&
+local QMAKE                                    &&
+if spell_ok qt4;then 
+  QMAKE=${TRACK_ROOT}/usr/bin/qt4/qmake
+else
+  QMAKE=${TRACK_ROOT}/usr/bin/qmake
+fi                                             &&
+$QMAKE qwt.pro                                 &&
+
 make                                           &&
 cd designer                                    &&
-${TRACK_ROOT}/usr/bin/qt4/qmake qwtplugin.pro  &&
+$QMAKE qwtplugin.pro                           &&
 make                                           &&
 cd ..
diff --git a/x11-toolkits/qwt5/DEPENDS b/x11-toolkits/qwt5/DEPENDS
index 028837c..4cdd0bb 100755
--- a/x11-toolkits/qwt5/DEPENDS
+++ b/x11-toolkits/qwt5/DEPENDS
@@ -1 +1 @@
-depends  qt4
+depends  QT
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 5e1757e..e990b28 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,9 +1,9 @@
            SPELL=qwt5
-         VERSION=5.0.0rc0
+         VERSION=5.0.0rc1
           SOURCE=qwt-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION
    SOURCE_URL[0]=${SOURCEFORGE_URL}/qwt/${SOURCE}
-     SOURCE_HASH=sha512:e02224ea18804dc6e88172a17d653f42e7640c97b81b94552310002ba2de01b7be76e9dfe944b49e1b3a81708a42f264c2bdcfc7a16cb47d0b92ad6e4b49b3c8
+     SOURCE_HASH=sha512:f0485b5c2663656274669f7f037f33ef4d2faa62fc35af808a603219115a50dd268b5e3a4569c53564c13b021eeacdbf1566264b31682ff55b738ac6d7c154e4
         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 789d766..4730b74 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,2 +1,9 @@
+2007-01-09 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 5.0.0rc1
+	* DEPENDS: qt4 -> QT
+	* BUILD: support ether qt3 or qt4
+	* INSTALL: define QWTVER
+	  fixes bug #13383
+
 2006-10-03 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD, DETAILS, DEPENDS, INSTALL: spell created
diff --git a/x11-toolkits/qwt5/INSTALL b/x11-toolkits/qwt5/INSTALL
index cad8138..b8418c2 100755
--- a/x11-toolkits/qwt5/INSTALL
+++ b/x11-toolkits/qwt5/INSTALL
@@ -1,3 +1,5 @@
+local QWTVER           &&
+QWTVER=${VERSION/rc?/} &&
 cp ${SOURCE_DIRECTORY}/lib/libqwt.so.${QWTVER} ${INSTALL_ROOT}/usr/lib                             &&
 ln -s ${INSTALL_ROOT}/usr/lib/libqwt.so.${QWTVER} \
 	   ${INSTALL_ROOT}/usr/lib/libqwt.so.`echo ${QWTVER}|cut -d '.' -f 1,2` &&



More information about the SM-Commit mailing list