[Lunar-commits] <moonbase> libs: Adjusting a few of these for the qt/kde move.

[Dennis `stumbles` Veatch]

commit 449200bf4713c7b5bcf59c2cce74918c36598f6c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 3 10:56:22 2010 -0400

    libs: Adjusting a few of these for the qt/kde move.
---
 libs/libQtGTL/BUILD         |    4 ++--
 libs/libQtGTL/DETAILS       |    2 +-
 libs/libdbusmenu/DEPENDS    |    1 +
 libs/libdbusmenu/DETAILS    |    2 +-
 libs/libindicate-qt/BUILD   |    4 ++--
 libs/libindicate-qt/DETAILS |    6 +++---
 libs/libindicate/DEPENDS    |    5 ++++-
 libs/libindicate/DETAILS    |    9 +++++----
 libs/libiodbc/BUILD         |    3 ++-
 libs/libiodbc/DEPENDS       |    4 +++-
 10 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/libs/libQtGTL/BUILD b/libs/libQtGTL/BUILD
index 47b770a..6e0d8a9 100644
--- a/libs/libQtGTL/BUILD
+++ b/libs/libQtGTL/BUILD
@@ -1,10 +1,10 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
+
   mkdir $OOTB_DIR &&
   cd $OOTB_DIR &&
 
diff --git a/libs/libQtGTL/DETAILS b/libs/libQtGTL/DETAILS
index 82a6c41..5bd7bac 100644
--- a/libs/libQtGTL/DETAILS
+++ b/libs/libQtGTL/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://www.opengtl.org/download/
       SOURCE_VFY=sha1:6ea167cf4b8ae06010eb3e19e358fbf1b786f7d1
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://bitbucket.org/opengtl/libqtgtl/
          ENTERED=20090324
          UPDATED=20100621
diff --git a/libs/libdbusmenu/DEPENDS b/libs/libdbusmenu/DEPENDS
index 8c0afaa..152a9ea 100644
--- a/libs/libdbusmenu/DEPENDS
+++ b/libs/libdbusmenu/DEPENDS
@@ -1,2 +1,3 @@
 depends dbus-glib
 depends json-glib
+depends gir-repository
diff --git a/libs/libdbusmenu/DETAILS b/libs/libdbusmenu/DETAILS
index fd0c805..1403ebc 100644
--- a/libs/libdbusmenu/DETAILS
+++ b/libs/libdbusmenu/DETAILS
@@ -8,7 +8,7 @@
          ENTERED=20100825
          UPDATED=20100829
            SHORT="dbus menu"
-
+PSAFE=no
 cat << EOF
 A small little library that was created by pulling out some comon code out of 
 indicator-applet. It passes a menu structure across DBus so that a program can
diff --git a/libs/libindicate-qt/BUILD b/libs/libindicate-qt/BUILD
index 9aba137..a925e95 100644
--- a/libs/libindicate-qt/BUILD
+++ b/libs/libindicate-qt/BUILD
@@ -1,9 +1,9 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   . /etc/profile.d/qt4.rc &&
 
+  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
+
   mkdir $OOTB_DIR &&
   cd $OOTB_DIR    &&
 
diff --git a/libs/libindicate-qt/DETAILS b/libs/libindicate-qt/DETAILS
index 1b7d122..66e0485 100644
--- a/libs/libindicate-qt/DETAILS
+++ b/libs/libindicate-qt/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libindicate-qt
-         VERSION=0.2.2
+         VERSION=0.2.5
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=http://launchpad.net/libindicate-qt/trunk/$VERSION/+download/
-   MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
       SOURCE_VFY=sha1:46e21b9b5c1d76689e29ab48ff8d66416b6907a0
+   MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=https://launchpad.net/libindicate-qt
          ENTERED=20091230
-         UPDATED=20091230
+         UPDATED=20100825
            SHORT="Qt bindings for libindicate"
 
 cat << EOF
diff --git a/libs/libindicate/DEPENDS b/libs/libindicate/DEPENDS
index 626e2af..05fc0c1 100644
--- a/libs/libindicate/DEPENDS
+++ b/libs/libindicate/DEPENDS
@@ -1 +1,4 @@
-optional_depends gobject-introspection "--enable-gobject-introspection" "--disable-gobject-introspection" "for API collection support"
+optional_depends gobject-introspection        \
+                 "--enable-introspection"     \
+                 "--disable-introspection"    \
+                 "for API collection support"
diff --git a/libs/libindicate/DETAILS b/libs/libindicate/DETAILS
index f200c79..37863e1 100644
--- a/libs/libindicate/DETAILS
+++ b/libs/libindicate/DETAILS
@@ -1,14 +1,15 @@
           MODULE=libindicate
-           MAJOR=0.2
-         VERSION=${MAJOR}.3
+           MAJOR=0.3
+         VERSION=${MAJOR}.6
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://launchpad.net/libindicate/$MAJOR/$VERSION/+download/
-      SOURCE_VFY=sha1:46ff8ff837bac175c72f3ee66761d1f549a71547
+      SOURCE_VFY=sha1:c4d10bc07f4dfbb912cd661a45c0803e39bc8e1e
         WEB_SITE=https://launchpad.net/libindicate
          ENTERED=20091230
-         UPDATED=20091230
+         UPDATED=20100825
            SHORT="raise flags on DBus for other components"
 
+PSAFE=no
 cat << EOF
 A small library for applications to raise "flags" on DBus for other components 
 of the desktop to pick up and visualize. Currently used by the messaging 
diff --git a/libs/libiodbc/BUILD b/libs/libiodbc/BUILD
index ee724d9..538683b 100644
--- a/libs/libiodbc/BUILD
+++ b/libs/libiodbc/BUILD
@@ -1,6 +1,7 @@
 (
 
-  OPTS+=" --includedir=/usr/include/$MODULE --libdir=/usr/lib/$MODULE" &&
+  OPTS+=" --includedir=/usr/include/$MODULE --libdir=/usr/lib/$MODULE  \
+          --with-iodbc-inidir=/etc/unixODBC --disable-static" &&
 
   default_build
 
diff --git a/libs/libiodbc/DEPENDS b/libs/libiodbc/DEPENDS
index a12f68d..05db4ac 100644
--- a/libs/libiodbc/DEPENDS
+++ b/libs/libiodbc/DEPENDS
@@ -1 +1,3 @@
-depends  gtk+-2
+depends gtk+-2
+depends unixODBC
+