Skip to Content.
Sympa Menu

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

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 (60312ab05827ba7614829ae29e4de6924eabed55)
  • Date: Thu, 6 Feb 2014 02:48:44 -0600

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

ChangeLog | 3 +++
devel/qbs/BUILD | 10 ++++++++++
devel/qbs/DEPENDS | 4 ++++
devel/qbs/DETAILS | 15 +++++++++++++++
devel/qbs/HISTORY | 8 ++++++++
devel/qbs/INSTALL | 1 +
qt5/qbs/BUILD | 5 -----
qt5/qbs/DEPENDS | 2 --
qt5/qbs/DETAILS | 15 ---------------
qt5/qbs/HISTORY | 4 ----
qt5/qbs/INSTALL | 1 -
11 files changed, 41 insertions(+), 27 deletions(-)

New commits:
commit 60312ab05827ba7614829ae29e4de6924eabed55
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qbs: => 1.1.1

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

qbs - move to devel section

diff --git a/ChangeLog b/ChangeLog
index 4fae9d4..cee39a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * qbs: move to devel, it is not just for qt5
+
2014-02-05 Vlad Glagolev <stealth AT sourcemage.org>
* accounts, groups: added account data for gnarwl spell
* mail/gnarwl: new spell, LDAP based email autoresponder
diff --git a/devel/qbs/BUILD b/devel/qbs/BUILD
new file mode 100755
index 0000000..32709b6
--- /dev/null
+++ b/devel/qbs/BUILD
@@ -0,0 +1,10 @@
+if is_depends_enabled $SPELL qtbase;then
+ QTDIR=$QT5DIR
+else
+ QTDIR=$QT4DIR
+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/DEPENDS b/devel/qbs/DEPENDS
new file mode 100755
index 0000000..bf276b1
--- /dev/null
+++ b/devel/qbs/DEPENDS
@@ -0,0 +1,4 @@
+depends QT &&
+if is_depends_enabled $SPELL qtbase;then
+ depends qtscript
+fi
diff --git a/devel/qbs/DETAILS b/devel/qbs/DETAILS
new file mode 100755
index 0000000..dcecd85
--- /dev/null
+++ b/devel/qbs/DETAILS
@@ -0,0 +1,15 @@
+QT_URL=http://download.qt-project.org/official_releases/
+ SPELL=qbs
+ VERSION=1.1.1
+
SOURCE_HASH=sha512:4837d9344d37e87421d0664297f6816365fb61487f55b1fbf0bbb88a6e4248049ccc48c21563f23970c2a70da1a7038cdbb91b3a92550e5ee23c09af8a36ccb0
+ SOURCE=qbs-$VERSION.src.tar.gz
+ SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.src
+ WEB_SITE=http://qt-project.org
+ ENTERED=20120821
+ LICENSE[0]=LGPL
+ KEYWORDS="qt5"
+ SHORT="build system for qt"
+cat << EOF
+build system for qt
+EOF
diff --git a/devel/qbs/HISTORY b/devel/qbs/HISTORY
new file mode 100644
index 0000000..89eb74b
--- /dev/null
+++ b/devel/qbs/HISTORY
@@ -0,0 +1,8 @@
+2014-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.1
+ * DEPENDS, BUILD: add support for qt4
+
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+ spell created
+
diff --git a/devel/qbs/INSTALL b/devel/qbs/INSTALL
new file mode 100755
index 0000000..b2e3c17
--- /dev/null
+++ b/devel/qbs/INSTALL
@@ -0,0 +1 @@
+make install INSTALL_ROOT=$QT5DIR
diff --git a/qt5/qbs/BUILD b/qt5/qbs/BUILD
deleted file mode 100755
index 38423e1..0000000
--- a/qt5/qbs/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- PATH="$QT5DIR/bin:$PATH:$SOURCE_DIRECTORY"
- qmake -r PREFIX=$QT5DIR $OPTS qbs.pro &&
- make
-
diff --git a/qt5/qbs/DEPENDS b/qt5/qbs/DEPENDS
deleted file mode 100755
index dda21ac..0000000
--- a/qt5/qbs/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends qtbase &&
-depends qtscript
diff --git a/qt5/qbs/DETAILS b/qt5/qbs/DETAILS
deleted file mode 100755
index 42eabdd..0000000
--- a/qt5/qbs/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-QT_URL=http://download.qt-project.org/official_releases/
- SPELL=qbs
- VERSION=1.1.0
-
SOURCE_HASH=sha512:4bf93ffdc5f459de84f5316641f279fcadacbbd7fd0635922d10911173706a4dc7e9f1a63c0f4226c063d927c4f00317d76248fd374cff83948995d1f54d8463
- SOURCE=qbs-$VERSION.src.tar.gz
- SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.src
- WEB_SITE=http://qt-project.org
- ENTERED=20120821
- LICENSE[0]=LGPL
- KEYWORDS="qt5"
- SHORT="build system for qt"
-cat << EOF
-build system for qt
-EOF
diff --git a/qt5/qbs/HISTORY b/qt5/qbs/HISTORY
deleted file mode 100644
index 5d763bc..0000000
--- a/qt5/qbs/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.1.0
- spell created
-
diff --git a/qt5/qbs/INSTALL b/qt5/qbs/INSTALL
deleted file mode 100755
index b2e3c17..0000000
--- a/qt5/qbs/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install INSTALL_ROOT=$QT5DIR



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (60312ab05827ba7614829ae29e4de6924eabed55), Treeve Jelbert, 02/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page