Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6f0044160593331561e484e81c0ce38e369277da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6f0044160593331561e484e81c0ce38e369277da)
  • Date: Fri, 6 Oct 2017 14:08:09 +0000

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

devel/qbs/BUILD | 2 +-
devel/qbs/DETAILS | 6 +++---
devel/qbs/HISTORY | 4 ++++
devel/qbs/INSTALL | 2 +-
devel/qbs/PRE_BUILD | 2 +-
qt5-qmake/qt-creator/DETAILS | 8 ++++----
qt5-qmake/qt-creator/HISTORY | 3 +++
7 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 6f0044160593331561e484e81c0ce38e369277da
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qbs: => 1.9.1

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

qt-creator: => 4.4.1

diff --git a/devel/qbs/BUILD b/devel/qbs/BUILD
index e6e1e61..caee442 100755
--- a/devel/qbs/BUILD
+++ b/devel/qbs/BUILD
@@ -1,4 +1,4 @@
# do not use qt5_build
-cd $SOURCE_DIRECTORY/$SPELL-src-$VERSION &&
+cd $SOURCE_DIRECTORY &&
$QT5DIR/bin/qmake -recursive qbs.pro &&
make
diff --git a/devel/qbs/DETAILS b/devel/qbs/DETAILS
index aa685e2..3c30218 100755
--- a/devel/qbs/DETAILS
+++ b/devel/qbs/DETAILS
@@ -1,10 +1,10 @@
QT_URL=https://download.qt.io/official_releases/
SPELL=qbs
- VERSION=1.9.0
-
SOURCE_HASH=sha512:a6cfd3a79d30e6eaa7e1048357ac1decb9a9b3b47d6b7d0e5b4a7b9131df94a41b0faeaa97547ba5ba563d686552297472d7104df06254330601fb6216f3392a
+ VERSION=1.9.1
+
SOURCE_HASH=sha512:6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd
SOURCE=qbs-src-$VERSION.tar.gz
SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/dist
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qbs-src-$VERSION
WEB_SITE=https://qt-project.org
ENTERED=20120821
LICENSE[0]=LGPL
diff --git a/devel/qbs/HISTORY b/devel/qbs/HISTORY
index d35c219..7a8c8bb 100644
--- a/devel/qbs/HISTORY
+++ b/devel/qbs/HISTORY
@@ -1,3 +1,7 @@
+2017-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.1
+ * BUILD INSTALL PRE_BUILD: adjust
+
2017-09-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.0
* BUILD INSTALL PRE_BUILD: adjust
diff --git a/devel/qbs/INSTALL b/devel/qbs/INSTALL
index 5b6c888..7bf0a56 100755
--- a/devel/qbs/INSTALL
+++ b/devel/qbs/INSTALL
@@ -1,2 +1,2 @@
-cd $SOURCE_DIRECTORY/$SPELL-src-$VERSION &&
+cd $SOURCE_DIRECTORY &&
make install INSTALL_ROOT=$QT5DIR
diff --git a/devel/qbs/PRE_BUILD b/devel/qbs/PRE_BUILD
index 1efbb62..3777eb6 100755
--- a/devel/qbs/PRE_BUILD
+++ b/devel/qbs/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY/$SPELL-src-$VERSION
+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/qt5-qmake/qt-creator/DETAILS b/qt5-qmake/qt-creator/DETAILS
index 11eadaf..5f20e1c 100755
--- a/qt5-qmake/qt-creator/DETAILS
+++ b/qt5-qmake/qt-creator/DETAILS
@@ -1,14 +1,14 @@
SPELL=qt-creator
if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
VERSION=4.2.2
-
SOURCE_HASH=sha512:cab23a75b3b8ef68cadf4fe57b81e96ef647bb48ab4c57618bf6dd25aed50abb412ac7fa76848b97da01f2df589ec763c95321956506aa4f159383f188efbf2d
+
SOURCE_HASH=sha512:f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
SOURCE=$SPELL-opensource-src-$VERSION.tar.gz

SOURCE_URL[0]=http://download.qt.io/development_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
else
- VERSION=4.4.0
-
SOURCE_HASH=sha512:918b167cbc0d04f38f6cb693f481c9a6f724260a4e35000570b05f7be9bec9ae220bc914ea0fcda265a374c132c0edb7d76335803291f7a511f280fee00af63c
+ VERSION=4.4.1
+
SOURCE_HASH=sha512:f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
SOURCE=$SPELL-opensource-src-$VERSION.tar.xz
-
SOURCE_URL[0]=http://download.qt.io/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
+
SOURCE_URL[0]=https://download.qt.io/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-opensource-src-$VERSION
WEB_SITE=http://www.qt.io/developers
diff --git a/qt5-qmake/qt-creator/HISTORY b/qt5-qmake/qt-creator/HISTORY
index 76b6cfa..aa5f416 100644
--- a/qt5-qmake/qt-creator/HISTORY
+++ b/qt5-qmake/qt-creator/HISTORY
@@ -1,3 +1,6 @@
+2017-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4.1
+
2017-09-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6f0044160593331561e484e81c0ce38e369277da), Treeve Jelbert, 10/06/2017

Archive powered by MHonArc 2.6.24.

Top of Page