Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 devel/qbs/BUILD        |    8 ++------
 devel/qbs/DETAILS      |   10 +++++-----
 devel/qbs/HISTORY      |    5 +++++
 devel/qbs/PRE_BUILD    |    4 ++++
 utils/dbus/DETAILS     |    4 ++--
 utils/dbus/HISTORY     |    4 ++++
 utils/dbus/UP_TRIGGERS |    2 +-
 7 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 7f39c70944e19b27c30f9a9e6ab010114cf67c4e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qbs: => 1.4.2

commit a1b76088b98cb81b4fca98f199874f7440095fd2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    dbus: => 1.10.0

diff --git a/devel/qbs/BUILD b/devel/qbs/BUILD
index 32709b6..a839ab4 100755
--- a/devel/qbs/BUILD
+++ b/devel/qbs/BUILD
@@ -1,10 +1,6 @@
 if is_depends_enabled $SPELL qtbase;then
- QTDIR=$QT5DIR
+  qt5_build
 else
- QTDIR=$QT4DIR
+  qt4_build
 fi
-export PKG_CONFIG_PATH="$QTDIR/lib/pkgconfig"
-PATH="$QTDIR/bin:$PATH:$SOURCE_DIRECTORY"
-qmake -r PREFIX=$QTDIR $OPTS qbs.pro &&
-make
 
diff --git a/devel/qbs/DETAILS b/devel/qbs/DETAILS
index dcecd85..0847df3 100755
--- a/devel/qbs/DETAILS
+++ b/devel/qbs/DETAILS
@@ -1,10 +1,10 @@
-QT_URL=http://download.qt-project.org/official_releases/
+QT_URL=http://download.qt.io/official_releases/
            SPELL=qbs
-         VERSION=1.1.1
-     
SOURCE_HASH=sha512:4837d9344d37e87421d0664297f6816365fb61487f55b1fbf0bbb88a6e4248049ccc48c21563f23970c2a70da1a7038cdbb91b3a92550e5ee23c09af8a36ccb0
-          SOURCE=qbs-$VERSION.src.tar.gz
+         VERSION=1.4.2
+     
SOURCE_HASH=sha512:dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec
+          SOURCE=qbs-src-$VERSION.tar.gz
       SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.src
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
         WEB_SITE=http://qt-project.org
          ENTERED=20120821
       LICENSE[0]=LGPL
diff --git a/devel/qbs/HISTORY b/devel/qbs/HISTORY
index 2e87817..f4e70ca 100644
--- a/devel/qbs/HISTORY
+++ b/devel/qbs/HISTORY
@@ -1,3 +1,8 @@
+2015-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.4.2
+       * PRE_BUILD: added
+       * BUILD: improve
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: depends -sub CXX gcc (half-automated)
 
diff --git a/devel/qbs/PRE_BUILD b/devel/qbs/PRE_BUILD
new file mode 100755
index 0000000..c16eb55
--- /dev/null
+++ b/devel/qbs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+sed -i 's|/usr/local||' share/qbs/imports/qbs/Probes/FrameworkProbe.qbs \
+    doc/qbs.qdoc src/install_prefix.pri
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 168488f..f7442c6 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbus
-         VERSION=1.8.20
-     
SOURCE_HASH=sha512:d63c29267e0445e329dc811e72d7858847fbae260920fd359b1fa889f08dead2a8b380e372718994daa92a262af970d1fcc58034fbcb8ffb3026ab5f30f63067
+         VERSION=1.10.0
+     
SOURCE_HASH=sha512:bc622cc322df031d18946dc3f340fe918f995caf4356078ecf41106d0e1ec62a3520f97c682937e529a8787608d754a699da7c051cc51d052a04fd63115a2f05
   SECURITY_PATCH=15
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 96879e3..41ed231 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,7 @@
+2015-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.10.0
+       * UP_TRIGGERS: adjust for longer version number
+
 2015-07-22 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8.20
 
diff --git a/utils/dbus/UP_TRIGGERS b/utils/dbus/UP_TRIGGERS
index abc755c..4d87cd5 100755
--- a/utils/dbus/UP_TRIGGERS
+++ b/utils/dbus/UP_TRIGGERS
@@ -3,7 +3,7 @@
 local OLD_SPELL_VERSION=""
 if spell_ok  $SPELL; then
   OLD_SPELL_VERSION="$(installed_version $SPELL)"
-  if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+  if test "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}"; then
     message "This is a possibly incompatible update of libdbus..."
     message "Figuring out what spells need to be recast, this may take a 
while."
     for each in $(show_up_depends $SPELL); do