[Lunar-commits] <moonbase> qt4-apps: A few version bumps but mainly its the move to /usr

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Fri Sep 3 16:51:02 CEST 2010


commit 8c6bcfa8d80f9366d34ea6092c68f44a7cba210f
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 3 10:51:02 2010 -0400

    qt4-apps: A few version bumps but mainly its the move to /usr
---
 qt4-apps/Sigil/BUILD                |    2 +-
 qt4-apps/Sigil/DETAILS              |    8 ++++----
 qt4-apps/cutecom/DETAILS            |    2 +-
 qt4-apps/klatexformula/DETAILS      |    2 +-
 qt4-apps/lyx/DETAILS                |    2 +-
 qt4-apps/polkit-qt/DETAILS          |    2 +-
 qt4-apps/qca2-cyrus-sasl/DETAILS    |    2 +-
 qt4-apps/qca2-gnupg/BUILD           |    4 +++-
 qt4-apps/qca2-gnupg/DETAILS         |    2 +-
 qt4-apps/qca2-ossl/BUILD            |    4 +++-
 qt4-apps/qca2-ossl/DETAILS          |    2 +-
 qt4-apps/qca2/BUILD                 |    6 ++++--
 qt4-apps/qca2/DETAILS               |    2 +-
 qt4-apps/qedje/BUILD                |   10 ++++++++--
 qt4-apps/qedje/DETAILS              |   11 +++++------
 qt4-apps/qgis4/DETAILS              |    1 -
 qt4-apps/qgit4/BUILD                |    1 +
 qt4-apps/qgit4/DETAILS              |    2 +-
 qt4-apps/qscintilla2/DETAILS        |    2 +-
 qt4-apps/qshaderedit/DETAILS        |    2 +-
 qt4-apps/qsynth/BUILD               |    4 ++--
 qt4-apps/qsynth/DETAILS             |    2 +-
 qt4-apps/qt-creator/BUILD           |    2 ++
 qt4-apps/qt-creator/DETAILS         |   10 +++++-----
 qt4-apps/qt-recordmydesktop/DETAILS |    2 +-
 qt4-apps/qtpfsgui/BUILD             |    4 ++--
 qt4-apps/qtpfsgui/DETAILS           |    2 +-
 qt4-apps/qtscriptgenerator/BUILD    |    2 +-
 qt4-apps/qtscriptgenerator/DETAILS  |    2 +-
 qt4-apps/qwt/BUILD                  |   13 ++++++++-----
 qt4-apps/qwtplot3d/DETAILS          |    2 +-
 qt4-apps/qzion/BUILD                |   11 +++++++++--
 qt4-apps/qzion/DEPENDS              |    2 ++
 qt4-apps/qzion/DETAILS              |   11 +++++------
 qt4-apps/stellarium/BUILD           |    6 +++---
 qt4-apps/stellarium/DETAILS         |    4 ++--
 qt4-apps/tapioca-qt/BUILD           |    4 ++--
 qt4-apps/tapioca-qt/DETAILS         |    4 ++--
 qt4-apps/telepathy-qt4/DETAILS      |    8 ++++----
 qt4-apps/tulip/DEPENDS              |    2 +-
 qt4-apps/tulip/DETAILS              |    2 +-
 41 files changed, 96 insertions(+), 72 deletions(-)

diff --git a/qt4-apps/Sigil/BUILD b/qt4-apps/Sigil/BUILD
index ecc3a57..3cbc2ce 100644
--- a/qt4-apps/Sigil/BUILD
+++ b/qt4-apps/Sigil/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
 
   mkdir $OOTB_DIR &&
   cd $OOTB_DIR    &&
diff --git a/qt4-apps/Sigil/DETAILS b/qt4-apps/Sigil/DETAILS
index ab4f367..6f1ed72 100644
--- a/qt4-apps/Sigil/DETAILS
+++ b/qt4-apps/Sigil/DETAILS
@@ -1,14 +1,14 @@
           MODULE=Sigil
-         VERSION=0.2.3
+         VERSION=0.2.4
            MINOR=Code
           SOURCE=$MODULE-$VERSION-$MINOR.zip
       SOURCE_URL=http://sigil.googlecode.com/files/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-$MINOR
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
-      SOURCE_VFY=sha1:8a709c4515fbdd22e8f245546ab4196dd729a128
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
+      SOURCE_VFY=sha1:b8fa0280e621166ec31b6c85a476fb01fd5fadc2
         WEB_SITE=http://code.google.com/p/sigil/
          ENTERED=20091107
-         UPDATED=20100712
+         UPDATED=20100824
            SHORT="qt4 WYSIWYG ebook editor"
 
 cat << EOF
diff --git a/qt4-apps/cutecom/DETAILS b/qt4-apps/cutecom/DETAILS
index ec44277..fc93678 100644
--- a/qt4-apps/cutecom/DETAILS
+++ b/qt4-apps/cutecom/DETAILS
@@ -2,7 +2,7 @@
          VERSION=0.22.0
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://cutecom.sourceforge.net/
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
       SOURCE_VFY=sha1:a23f9ddf3d1a4467568c872477fc8c6da07c1711
         WEB_SITE=http://cutecom.sourceforge.net/
          ENTERED=20080419
diff --git a/qt4-apps/klatexformula/DETAILS b/qt4-apps/klatexformula/DETAILS
index a70f661..aed0052 100644
--- a/qt4-apps/klatexformula/DETAILS
+++ b/qt4-apps/klatexformula/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE/$MODULE/$MODULE-$VERSION
       SOURCE_VFY=sha1:520dc25429a33a3e1229af4b9710fc444fb28fb8
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://klatexformula.sourceforge.net/
          ENTERED=20091118
          UPDATED=20091123
diff --git a/qt4-apps/lyx/DETAILS b/qt4-apps/lyx/DETAILS
index 74171bf..864ec96 100644
--- a/qt4-apps/lyx/DETAILS
+++ b/qt4-apps/lyx/DETAILS
@@ -4,7 +4,7 @@
    SOURCE_URL[0]=ftp://ftp.ntua.gr/pub/X11/LyX/stable/1.6.x
    SOURCE_URL[1]=ftp://ftp.lyx.org/pub/lyx/stable/1.6.x
       SOURCE_VFY=sha1:24f4edff7f31dd75c47862351ece0d1906cf2e75
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.lyx.org
       MAINTAINER=jannis at lunar-linux.org
          ENTERED=20020904
diff --git a/qt4-apps/polkit-qt/DETAILS b/qt4-apps/polkit-qt/DETAILS
index 6c50dab..613ff76 100644
--- a/qt4-apps/polkit-qt/DETAILS
+++ b/qt4-apps/polkit-qt/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$KDE_URL/stable/apps/KDE4.x/admin
       SOURCE_VFY=sha1:cb0542b78e7a36afb403fba94afe25bbed9dc894
-   MODULE_PREFIX=${QTDIR:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QTDIR:-/usr}
         WEB_SITE=http://www.kde.org
          ENTERED=20090628
          UPDATED=20091226
diff --git a/qt4-apps/qca2-cyrus-sasl/DETAILS b/qt4-apps/qca2-cyrus-sasl/DETAILS
index 1d3ec18..d37c3e6 100644
--- a/qt4-apps/qca2-cyrus-sasl/DETAILS
+++ b/qt4-apps/qca2-cyrus-sasl/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_URL=http://delta.affinix.com/download/qca/$MAJOR/plugins/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-cyrus-sasl-$VERSION
       SOURCE_VFY=sha1:b3c1153d91c5de52c58dd403ddde43cb022b599a
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://delta.affinix.com/qca/
          ENTERED=20080922
          UPDATED=20080922
diff --git a/qt4-apps/qca2-gnupg/BUILD b/qt4-apps/qca2-gnupg/BUILD
index 7eabccf..13ea3f1 100644
--- a/qt4-apps/qca2-gnupg/BUILD
+++ b/qt4-apps/qca2-gnupg/BUILD
@@ -1,9 +1,11 @@
 (
 
-  . /etc/profile.d/qt4.rc   
+  . /etc/profile.d/qt4.rc &&
+
   sedit "s/^WHICH=.*/WHICH=which/" configure &&
 
   ./configure &&
+
   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/qca2-gnupg/DETAILS b/qt4-apps/qca2-gnupg/DETAILS
index 93f0258..cab90f2 100644
--- a/qt4-apps/qca2-gnupg/DETAILS
+++ b/qt4-apps/qca2-gnupg/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_URL=http://delta.affinix.com/download/qca/$MAJOR/plugins/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-gnupg-$VERSION
       SOURCE_VFY=sha1:77e3874b9ed427e281b23b9bf41ecc95e74f7053
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://delta.affinix.com/qca/
          ENTERED=20080922
          UPDATED=20080922
diff --git a/qt4-apps/qca2-ossl/BUILD b/qt4-apps/qca2-ossl/BUILD
index 7ca6fe9..f8dff08 100644
--- a/qt4-apps/qca2-ossl/BUILD
+++ b/qt4-apps/qca2-ossl/BUILD
@@ -6,10 +6,12 @@
   # Remove this patch on next update.
   patch_it $SOURCE2 3 &&
 
-  . /etc/profile.d/qt4.rc
+  . /etc/profile.d/qt4.rc &&
+
   sedit "s/^WHICH=.*/WHICH=which/" configure &&
 
   ./configure &&
+
   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/qca2-ossl/DETAILS b/qt4-apps/qca2-ossl/DETAILS
index b83fccc..bfa616e 100644
--- a/qt4-apps/qca2-ossl/DETAILS
+++ b/qt4-apps/qca2-ossl/DETAILS
@@ -8,7 +8,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-ossl-$VERSION
       SOURCE_VFY=sha1:dd925e8732ff76f24f9f90f4094abaf2f0ac27bf
      SOURCE2_VFY=sha1:0068f8637b8d5bd487c76d4f918a417c2ec2244c
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://delta.affinix.com/qca/
          ENTERED=20080303
          UPDATED=20080303
diff --git a/qt4-apps/qca2/BUILD b/qt4-apps/qca2/BUILD
index b54bebf..6a7e3ff 100644
--- a/qt4-apps/qca2/BUILD
+++ b/qt4-apps/qca2/BUILD
@@ -1,9 +1,11 @@
 (
 
-  . /etc/profile.d/qt4.rc
+  . /etc/profile.d/qt4.rc &&
+
   sedit "s/^WHICH=.*/WHICH=which/" configure &&
 
-  ./configure --prefix=/usr &&
+  ./configure --prefix=${MODULE_PREFIX} &&
+
   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/qca2/DETAILS b/qt4-apps/qca2/DETAILS
index 6dedfbf..2329964 100644
--- a/qt4-apps/qca2/DETAILS
+++ b/qt4-apps/qca2/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_URL=http://delta.affinix.com/download/qca/$MAJOR/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
       SOURCE_VFY=sha1:5a414c3296cd37d1ec34182be0d089c5073f55a8
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://delta.affinix.com/qca/
          ENTERED=20071106
          UPDATED=20090826
diff --git a/qt4-apps/qedje/BUILD b/qt4-apps/qedje/BUILD
index 1ed1744..08536c0 100644
--- a/qt4-apps/qedje/BUILD
+++ b/qt4-apps/qedje/BUILD
@@ -1,9 +1,15 @@
 (
 
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
 
-  . /etc/profile.d/qt4.rc           &&
+  mkdir $OOTB_DIR  &&
+  cd $OOTB_DIR     &&
 
-  qmake -unix PREFIX=$MODULE_PREFIX &&
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
+                           -DCMAKE_BUILD_TYPE=RELEASE              \
+                           $OPTS                                  &&
+
+  cp src/qedje.pc . &&
 
   default_make
 
diff --git a/qt4-apps/qedje/DETAILS b/qt4-apps/qedje/DETAILS
index f744a17..623c9d3 100644
--- a/qt4-apps/qedje/DETAILS
+++ b/qt4-apps/qedje/DETAILS
@@ -1,12 +1,11 @@
           MODULE=qedje
-         VERSION=0.3.0
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://dev.openbossa.org/qedje/downloads/source/$MODULE/
-      SOURCE_VFY=sha1:82a602ae768d75640d4b1f4b1a0aecfb136c73c2
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+         VERSION=0.4.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$MIRROR_URL
+      SOURCE_VFY=sha1:ebd4073b8ea61c07486113864a6dd0cb68170274
         WEB_SITE=http://dev.openbossa.org/trac/qedje/
          ENTERED=20090125
-         UPDATED=20090125
+         UPDATED=20100812
            SHORT="a declarative language"
 
 cat << EOF
diff --git a/qt4-apps/qgis4/DETAILS b/qt4-apps/qgis4/DETAILS
index 03921ea..b9f391b 100644
--- a/qt4-apps/qgis4/DETAILS
+++ b/qt4-apps/qgis4/DETAILS
@@ -4,7 +4,6 @@
       SOURCE_URL=http://download.osgeo.org/qgis/src/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/qgis-$VERSION
       SOURCE_VFY=sha1:44fc9c2717646b89d5f369908cad9d102119618d
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://qgis.org/
          ENTERED=20090212
          UPDATED=20100118
diff --git a/qt4-apps/qgit4/BUILD b/qt4-apps/qgit4/BUILD
index 6c1135f..422f0c7 100644
--- a/qt4-apps/qgit4/BUILD
+++ b/qt4-apps/qgit4/BUILD
@@ -1,6 +1,7 @@
 (
 
   . /etc/profile.d/qt4.rc  &&
+
   $QTDIR/bin/qmake qgit.pro &&
 
   make  &&
diff --git a/qt4-apps/qgit4/DETAILS b/qt4-apps/qgit4/DETAILS
index dfe33ed..434f2c1 100644
--- a/qt4-apps/qgit4/DETAILS
+++ b/qt4-apps/qgit4/DETAILS
@@ -4,7 +4,7 @@
           SOURCE=$MOD-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MOD
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
       SOURCE_VFY=sha1:6a75079e786a55d1d23a2752c0d93099af8aafd3
         WEB_SITE=http://digilander.libero.it/mcostalba
          ENTERED=20080719
diff --git a/qt4-apps/qscintilla2/DETAILS b/qt4-apps/qscintilla2/DETAILS
index bca77cc..61f2e44 100644
--- a/qt4-apps/qscintilla2/DETAILS
+++ b/qt4-apps/qscintilla2/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
       SOURCE_URL=http://www.riverbankcomputing.com/static/Downloads/QScintilla2
       SOURCE_VFY=sha1:4b6ecb8090a546b14fa4c0ce86ff2c7e97261005
-   MODULE_PREFIX=${QTDIR:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QTDIR:-/usr}
         WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
          ENTERED=20070528
          UPDATED=20100713
diff --git a/qt4-apps/qshaderedit/DETAILS b/qt4-apps/qshaderedit/DETAILS
index 08cecf9..1b44a36 100644
--- a/qt4-apps/qshaderedit/DETAILS
+++ b/qt4-apps/qshaderedit/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
       SOURCE_URL=http://qshaderedit.googlecode.com/files
       SOURCE_VFY=sha1:e908c9a15e564cd6007bd8d1d2fffa9a9ef47945
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://code.google.com/p/qshaderedit
          ENTERED=20090411
          UPDATED=20090411
diff --git a/qt4-apps/qsynth/BUILD b/qt4-apps/qsynth/BUILD
index 2093f4b..c59fd0c 100644
--- a/qt4-apps/qsynth/BUILD
+++ b/qt4-apps/qsynth/BUILD
@@ -1,8 +1,8 @@
 (
 
-  . /etc/profile.d/qt4.rc
+  . /etc/profile.d/qt4.rc &&
 
-  OPTS+=" --with-qt=${MODULE_PREFIX}"
+  OPTS+=" --with-qt=${MODULE_PREFIX}" &&
 
   default_build
 
diff --git a/qt4-apps/qsynth/DETAILS b/qt4-apps/qsynth/DETAILS
index ae4f8ce..2558a39 100644
--- a/qt4-apps/qsynth/DETAILS
+++ b/qt4-apps/qsynth/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE
       SOURCE_VFY=sha1:482960612dbc1ff921ff4e3dc6c61f82b9fb9d83
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://qsynth.sourceforge.net/
          ENTERED=20060317
          UPDATED=20100427
diff --git a/qt4-apps/qt-creator/BUILD b/qt4-apps/qt-creator/BUILD
index 952485d..a5126c1 100644
--- a/qt4-apps/qt-creator/BUILD
+++ b/qt4-apps/qt-creator/BUILD
@@ -10,6 +10,8 @@
 
   qmake $SOURCE_DIRECTORY/qtcreator.pro &&
 
+  sedit "s:qdoc3 -creator:qdoc3:" Makefile &&
+
   make            &&
   prepare_install &&
 
diff --git a/qt4-apps/qt-creator/DETAILS b/qt4-apps/qt-creator/DETAILS
index 56d5fe4..9200b46 100644
--- a/qt4-apps/qt-creator/DETAILS
+++ b/qt4-apps/qt-creator/DETAILS
@@ -1,12 +1,12 @@
           MODULE=qt-creator
-         VERSION=1.3.1-src
-          SOURCE=$MODULE-$VERSION.tar.gz
+         VERSION=2.0.1-src
+          SOURCE=$MODULE-$VERSION.tgz
       SOURCE_URL=http://get.qt.nokia.com/qtcreator
-      SOURCE_VFY=sha1:49b61c3e8010d94d6d595fef38d3da737b26cd80
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+      SOURCE_VFY=sha1:605bfe7876c4fa322544bc2314b059767eae407f
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://qt.nokia.com/products/developer-tools
          ENTERED=20090303
-         UPDATED=20100217
+         UPDATED=20100825
            SHORT="cross-platform integrated development environment"
 
 cat << EOF
diff --git a/qt4-apps/qt-recordmydesktop/DETAILS b/qt4-apps/qt-recordmydesktop/DETAILS
index e072027..dcfa5f7 100644
--- a/qt4-apps/qt-recordmydesktop/DETAILS
+++ b/qt4-apps/qt-recordmydesktop/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/recordmydesktop/
       SOURCE_VFY=sha1:50fc62a9475f3894f2503e4767b3eb89d041f15e
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://recordmydesktop.sourceforge.net/about.php
          ENTERED=20090213
          UPDATED=20090213
diff --git a/qt4-apps/qtpfsgui/BUILD b/qt4-apps/qtpfsgui/BUILD
index 0854504..181fe3a 100644
--- a/qt4-apps/qtpfsgui/BUILD
+++ b/qt4-apps/qtpfsgui/BUILD
@@ -1,10 +1,10 @@
 (
 
-  . /etc/profile.d/qt4.rc
+  . /etc/profile.d/qt4.rc &&
 
   lrelease project.pro &&
 
-  qmake PREFIX=/usr &&
+  qmake PREFIX=${MODULE_PREFIX} &&
 
   default_make
 
diff --git a/qt4-apps/qtpfsgui/DETAILS b/qt4-apps/qtpfsgui/DETAILS
index cc90bf4..734c859 100644
--- a/qt4-apps/qtpfsgui/DETAILS
+++ b/qt4-apps/qtpfsgui/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE/$MODULE/$VERSION
       SOURCE_VFY=sha1:adf037c54f55be50d931fa484cca169c01d0384d
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://qtpfsgui.sourceforge.net/
          ENTERED=20091001
          UPDATED=20091001
diff --git a/qt4-apps/qtscriptgenerator/BUILD b/qt4-apps/qtscriptgenerator/BUILD
index 6f99033..35e2766 100644
--- a/qt4-apps/qtscriptgenerator/BUILD
+++ b/qt4-apps/qtscriptgenerator/BUILD
@@ -1,6 +1,6 @@
 (
 
-  . /etc/profile.d/qt4.rc
+  . /etc/profile.d/qt4.rc &&
 
 # A qucik gcc-4.4.1 hack. Revisit when this module gets a version bump
   sed -i "33i #include <cstdio>" generator/parser/rpp/pp.h &&
diff --git a/qt4-apps/qtscriptgenerator/DETAILS b/qt4-apps/qtscriptgenerator/DETAILS
index 1a39426..2a1cdae 100644
--- a/qt4-apps/qtscriptgenerator/DETAILS
+++ b/qt4-apps/qtscriptgenerator/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-$VERSION
    SOURCE_URL[0]=http://qtscriptgenerator.googlecode.com/files/
       SOURCE_VFY=sha1:eeae733106369e289f257b754822bc372fd6ba75
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://code.google.com/p/qtscriptgenerator/
          ENTERED=20090307
          UPDATED=20090924
diff --git a/qt4-apps/qwt/BUILD b/qt4-apps/qwt/BUILD
index 64cce92..ab08f81 100644
--- a/qt4-apps/qwt/BUILD
+++ b/qt4-apps/qwt/BUILD
@@ -1,11 +1,14 @@
 (
 
-  source /etc/profile.d/qt4.rc
-  MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
-  sedit "s:/usr/local:$MODULE_PREFIX:" qwt.prf
-  sedit "s:/usr/local:$MODULE_PREFIX:" qwtconfig.pri
+  source /etc/profile.d/qt4.rc &&
+
+  sedit "s:/usr/local/qwt-$${QwtVersion}:$QTDIR/:" qwt.prf &&
+  sedit "s:/usr/local/qwt-5.2.1:$QTDIR/:" qwtconfig.pri    &&
 
   qmake &&
-  default_make
+  default_make &&
+
+# Its install misses a header.
+  install -m 644 -p src/qwt_plot_svgitem.h /usr/include/
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/qwtplot3d/DETAILS b/qt4-apps/qwtplot3d/DETAILS
index 2a8c707..40e62c5 100644
--- a/qt4-apps/qwtplot3d/DETAILS
+++ b/qt4-apps/qwtplot3d/DETAILS
@@ -4,7 +4,7 @@
       SOURCE_URL=$SFORGE_URL/$MODULE/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
       SOURCE_VFY=sha1:4463fafb8420a91825e165da7a296aaabd70abea
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://qwtplot3d.sourceforge.net/
          ENTERED=20091019
          UPDATED=20091019
diff --git a/qt4-apps/qzion/BUILD b/qt4-apps/qzion/BUILD
index 4cf7de4..464f600 100644
--- a/qt4-apps/qzion/BUILD
+++ b/qt4-apps/qzion/BUILD
@@ -1,8 +1,15 @@
 (
 
-  . /etc/profile.d/qt4.rc           &&
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
 
-  qmake -unix PREFIX=$MODULE_PREFIX &&
+  mkdir $OOTB_DIR  &&
+  cd $OOTB_DIR     &&
+
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
+                           -DCMAKE_BUILD_TYPE=RELEASE              \
+                           $OPTS                                  &&
+
+  cp src/qzion.pc . &&
 
   default_make
 
diff --git a/qt4-apps/qzion/DEPENDS b/qt4-apps/qzion/DEPENDS
index 428f269..f53196c 100644
--- a/qt4-apps/qzion/DEPENDS
+++ b/qt4-apps/qzion/DEPENDS
@@ -1 +1,3 @@
 depends qt4
+
+optional_depends Python "-DSKIP_PYTHON_BINDINGS=OFF" "-DSKIP_PYTHON_BINDINGS=ON" "for Python bindings support"
diff --git a/qt4-apps/qzion/DETAILS b/qt4-apps/qzion/DETAILS
index 517acc6..0410143 100644
--- a/qt4-apps/qzion/DETAILS
+++ b/qt4-apps/qzion/DETAILS
@@ -1,12 +1,11 @@
           MODULE=qzion
-         VERSION=0.3.0
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://dev.openbossa.org/qedje/downloads/source/$MODULE/
-      SOURCE_VFY=sha1:13ab37280c9b8c92f560e3c447c3fd2caa92ef8a
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+         VERSION=0.4.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$MIRROR_URL
+      SOURCE_VFY=sha1:5db5d4f84177b9daf665ca9773641978a02dbee8
         WEB_SITE=http://dev.openbossa.org/trac/qedje/
          ENTERED=20090125
-         UPDATED=20090125
+         UPDATED=20100812
            SHORT="canvas abstraction for QEdje"
 
 cat << EOF
diff --git a/qt4-apps/stellarium/BUILD b/qt4-apps/stellarium/BUILD
index d201745..07c87f9 100644
--- a/qt4-apps/stellarium/BUILD
+++ b/qt4-apps/stellarium/BUILD
@@ -1,9 +1,9 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
-
   source /etc/profile.d/qt4.rc   &&
 
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
+
   mkdir $OOTB_DIR  &&
   cd $OOTB_DIR     &&
 
@@ -11,7 +11,7 @@
                            -DCMAKE_BUILD_TYPE=RELEASE              \
                            $OPTS                                  &&
 
-  default_make
+  default_make &&
 
   # Desktop menu entry
   cat > ${MODULE}.desktop << EOF  &&
diff --git a/qt4-apps/stellarium/DETAILS b/qt4-apps/stellarium/DETAILS
index 5b62491..f96a84f 100644
--- a/qt4-apps/stellarium/DETAILS
+++ b/qt4-apps/stellarium/DETAILS
@@ -3,10 +3,10 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE
       SOURCE_VFY=sha1:584ab8e3618bf9a0b15619260fbe240843a8f5e1
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://stellarium.free.fr
          ENTERED=20040420
-         UPDATED=20100609
+         UPDATED=20100903
            SHORT="Stellarium astronomy software"
 
 cat << EOF
diff --git a/qt4-apps/tapioca-qt/BUILD b/qt4-apps/tapioca-qt/BUILD
index c3db041..4e28224 100644
--- a/qt4-apps/tapioca-qt/BUILD
+++ b/qt4-apps/tapioca-qt/BUILD
@@ -1,12 +1,12 @@
 (
 
+  source /etc/profile.d/qt4.rc &&
+
   OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
 
   mkdir $OOTB_DIR &&
   cd $OOTB_DIR &&
 
-  source /etc/profile.d/qt4.rc &&
-
   cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
                            -DCMAKE_BUILD_TYPE=RELEASE             \
                            $OPTS                                 &&
diff --git a/qt4-apps/tapioca-qt/DETAILS b/qt4-apps/tapioca-qt/DETAILS
index 2f65703..91d88c3 100644
--- a/qt4-apps/tapioca-qt/DETAILS
+++ b/qt4-apps/tapioca-qt/DETAILS
@@ -3,10 +3,10 @@
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/tapioca-voip
       SOURCE_VFY=sha1:37814550cf8b5071e733378011656ee38cb6211c
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://tapioca-voip.sourceforge.net/wiki/index.php/Tapioca
          ENTERED=20080112
-         UPDATED=20080112
+         UPDATED=20100903
            SHORT="convenience libraries to easily integrate VoIP and IM"
 
 cat << EOF
diff --git a/qt4-apps/telepathy-qt4/DETAILS b/qt4-apps/telepathy-qt4/DETAILS
index a548191..0d969f5 100644
--- a/qt4-apps/telepathy-qt4/DETAILS
+++ b/qt4-apps/telepathy-qt4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=telepathy-qt4
-         VERSION=0.2.2
+         VERSION=0.3.8
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://telepathy.freedesktop.org/releases/$MODULE/
-      SOURCE_VFY=sha1:01702eb60df41f3deab78953c1180d83791f5317
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+      SOURCE_VFY=sha1:e9d6d736a437b3ddd201dc91a62cc7ff962d3694
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://telepathy.freedesktop.org/wiki/Telepathy-Qt4
          ENTERED=20080112
-         UPDATED=20100410
+         UPDATED=20100827
            SHORT="unified framework for all forms of real time conversations"
 
 cat << EOF
diff --git a/qt4-apps/tulip/DEPENDS b/qt4-apps/tulip/DEPENDS
index 028837c..988fc80 100644
--- a/qt4-apps/tulip/DEPENDS
+++ b/qt4-apps/tulip/DEPENDS
@@ -1 +1 @@
-depends  qt4
+depends qt-assistant
diff --git a/qt4-apps/tulip/DETAILS b/qt4-apps/tulip/DETAILS
index 36dad4d..e9b872c 100644
--- a/qt4-apps/tulip/DETAILS
+++ b/qt4-apps/tulip/DETAILS
@@ -2,7 +2,7 @@
          VERSION=3.3.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/auber/$MODULE/tulip-3.3.1/
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
       SOURCE_VFY=sha1:81198868f104ec558980c102a6914025c29b6a7d
         WEB_SITE=http://tulip.labri.fr/TulipDrupal/
          ENTERED=20100507


More information about the Lunar-commits mailing list