Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-split-qt5 grimoire by Treeve Jelbert (18c844640d1f95fae9e440434fa45d6b05169124)

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 devel-split-qt5 grimoire by Treeve Jelbert (18c844640d1f95fae9e440434fa45d6b05169124)
  • Date: Tue, 12 Feb 2013 09:50:54 -0600

GIT changes to devel-split-qt5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 11 +++++++++++
qt5/FUNCTIONS | 8 --------
qt5/qtbase/BUILD | 4 +++-
qt5/qtbase/CONFIGURE | 8 ++++++++
qt5/qtbase/DETAILS | 7 ++++---
qt5/qtbase/HISTORY | 6 ++++++
qt5/qtbase/SUB_DEPENDS | 6 ++----
qt5/qtdeclarative/DETAILS | 7 ++++---
qt5/qtdeclarative/HISTORY | 3 +++
qt5/qtjsbackend/DETAILS | 7 ++++---
qt5/qtjsbackend/HISTORY | 4 ++++
qt5/qtjsbackend/PRE_BUILD | 9 +++++++++
qt5/qtxmlpatterns/DETAILS | 7 ++++---
qt5/qtxmlpatterns/HISTORY | 3 +++
15 files changed, 68 insertions(+), 25 deletions(-)

New commits:
commit 18c844640d1f95fae9e440434fa45d6b05169124
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtdeclarative: => 5.0.1

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

qtjsbackend: => 5.0.1

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

qtxmlpatterns: => 5.0.1

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

FUNCTIONS: move qt5build to global level

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

qtbase: => 5.0.1

diff --git a/ChangeLog b/ChangeLog
index 4775048..7d7a3fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS, qt5/FUNCTIONS: move qt5build to global level
+
2013-02-10 Sukneet Basuta <sukneet AT sourcemage.org>
* audio-libs/sbc: new spell, Bluetooth Subband Codec (SBC) library

diff --git a/FUNCTIONS b/FUNCTIONS
index 2fbe0f1..573d06a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -2,6 +2,17 @@
. $GRIMOIRE/libgcc
. $GRIMOIRE/config_query_multi.function

+QT5DIR=$INSTALL_ROOT/opt/qt5
+qt5_build() {
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ cd $SOURCE_DIRECTORY &&
+ QMAKEPATH="$QT5DIR/bin"
+ PATH="$QMAKEPATH:$PATH"
+ qmake $OPTS *.pro &&
+ make
+}
+
+
#---------------------------------------------------------------------
## This function automatically fixes any known bad paths
#---------------------------------------------------------------------
diff --git a/qt5/FUNCTIONS b/qt5/FUNCTIONS
index 46335ec..52ec5a9 100755
--- a/qt5/FUNCTIONS
+++ b/qt5/FUNCTIONS
@@ -1,11 +1,3 @@
-qt5_build() {
- cd $SOURCE_DIRECTORY &&
- QMAKEPATH="$INSTALL_ROOT/opt/qt5/bin"
- PATH="$QMAKEPATH:$PATH"
- qmake $OPTS *.pro &&
- make
-}
-
default_build() {
qt5_build
}
diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index ca79090..150a9f8 100755
--- a/qt5/qtbase/BUILD
+++ b/qt5/qtbase/BUILD
@@ -12,6 +12,8 @@ OPTS="$QT_DEBUG \
$QT_GIF \
$QT_PCH \
$QT_EXAMPLE examples \
+ $QT_DEMOS demos \
+ $QT_TESTS tests \
$QT_ACCESS \
$QT_AUDIO \
$QT_JVS \
@@ -20,6 +22,6 @@ cd $SOURCE_DIRECTORY &&

./configure -opensource -confirm-license \
-prefix $QTDIR -platform linux-g++ \
- -fast -reduce-relocations -reduce-exports $OPTS -v &&
+ -reduce-relocations -reduce-exports $OPTS -v &&
make

diff --git a/qt5/qtbase/CONFIGURE b/qt5/qtbase/CONFIGURE
index 87c38d2..eae64f7 100755
--- a/qt5/qtbase/CONFIGURE
+++ b/qt5/qtbase/CONFIGURE
@@ -4,6 +4,14 @@ config_query_option QT_EXAMPLE 'install examples?' n
\
'-make' \
'-nomake' &&

+config_query_option QT_DEMOS 'install demos?' n \
+ '-make' \
+ '-nomake' &&
+
+config_query_option QT_TESTS 'install tests?' n \
+ '-make' \
+ '-nomake' &&
+
config_query_option QT_DEBUG 'Compile with debugging symbols?' n \
'-debug' \
'-no-separate-debug-info' &&
diff --git a/qt5/qtbase/DETAILS b/qt5/qtbase/DETAILS
index b05ef74..ec568fa 100755
--- a/qt5/qtbase/DETAILS
+++ b/qt5/qtbase/DETAILS
@@ -1,9 +1,10 @@
+QT_URL=http://origin.releases.qt-project.org
SPELL=qtbase
SPELLX=$SPELL-opensource-src
- VERSION=5.0.0-beta1
-
SOURCE_HASH=sha512:45083ce9565525046d34b921199a1e4ef1d222084833e91e95a103d1db479b6d2c65a35d76be17500d17f0a475a0514cfa1171e95f352a5b06973754e3b6cacb
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:ed3a8621da1823ac639ad72242f7cf155a43bc14f9b3daf762d1203f031d65207efff19f0492b62c963ae8008be35d5d8d66ec88bbd019cb75b1bd2a6ecfed9f
SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL=http://releases.qt-project.org/qt5.0/beta1/split_sources/$SOURCE
+ SOURCE_URL=$QT_URL/qt5/$VERSION/submodules_tar/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
# SECURITY_PATCH=3
WEB_SITE=http://qt-project.org/
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 8502a30..af3c6ab 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,9 @@
+2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+ * CONFIGURE, BUILD: disable demos, tests
+ remove obsolete -fast
+ * SUB_DEPENDS: mathc flags with those in DEPENDS
+
2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.0.0-beta1
spell created
diff --git a/qt5/qtbase/SUB_DEPENDS b/qt5/qtbase/SUB_DEPENDS
index a2495ed..facf1cf 100755
--- a/qt5/qtbase/SUB_DEPENDS
+++ b/qt5/qtbase/SUB_DEPENDS
@@ -12,15 +12,13 @@ SQL) echo "SQL support requested, forcing it" &&
QT_SQL="y"
;;
FIREBIRD) echo "Firebird support requested, forcing it" &&
- depends FIREBIRD \
- "-plugin-sql-ibase -I$INSTALL_ROOT/opt/firebird/include \
- -L$INSTALL_ROOT/opt/firebird/lib"
+ depends FIREBIRD "-plugin-sql-ibase" &&
;;
POSTGRESQL) echo "Postresql support requested, forcing it" &&
depends postgresql '-plugin-sql-psql'
;;
SQLITE) echo "Sqlite support requested, forcing it" &&
- depends sqlite '-plugin-sql-sqlite'
+ depends sqlite '-system-sqlite'
;;
ODBC) echo "Odbc support requested, forcing it" &&
depends ODBC-MGR '-plugin-sql-odbc'
diff --git a/qt5/qtdeclarative/DETAILS b/qt5/qtdeclarative/DETAILS
index ed87e59..fe5abae 100755
--- a/qt5/qtdeclarative/DETAILS
+++ b/qt5/qtdeclarative/DETAILS
@@ -1,9 +1,10 @@
+QT_URL=http://origin.releases.qt-project.org
SPELL=qtdeclarative
SPELLX=$SPELL-opensource-src
- VERSION=5.0.0-beta1
-
SOURCE_HASH=sha512:5583ae3f2d21845d56873affb518e932837cbe620053f36339ba449643de62762e11b45cf1ccf90eebb15f553e5e4f5263bb90c8c32ade875b2394f9b0afe36f
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:82ea9b28266e8e7f7b08847c9973ba0ad851313e8e987b5de92dbac830c4672df5960cccfba7ef495b28a2cc510d65d72867056afdaf6d4db68f02de7445879d
SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL=http://releases.qt-project.org/qt5.0/beta1/split_sources/$SOURCE
+ SOURCE_URL=$QT_URL/qt5/$VERSION/submodules_tar/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://qt-project.org
ENTERED=20120901
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index 8502a30..c28943e 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+
2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.0.0-beta1
spell created
diff --git a/qt5/qtjsbackend/DETAILS b/qt5/qtjsbackend/DETAILS
index 7e98653..7570bef 100755
--- a/qt5/qtjsbackend/DETAILS
+++ b/qt5/qtjsbackend/DETAILS
@@ -1,9 +1,10 @@
+QT_URL=http://origin.releases.qt-project.org
SPELL=qtjsbackend
SPELLX=$SPELL-opensource-src
- VERSION=5.0.0-beta1
-
SOURCE_HASH=sha512:f880ae9fe90e1dfb2b0bd44f95c799fb05af069251c5d0c490eab14b201b4b5008859f868734ef513a3852e047cb0728820884d1d2dbd76160f69e0eae22be72
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:99a5cb019feb99bc9bb090624d35f20ed57139e8292a7a9c1ec2be14ec290654d97650cffd2d922879b42a85fb96e2d610779138376a823476c67534a826ff2a
SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL=http://releases.qt-project.org/qt5.0/beta1/split_sources/$SOURCE
+ SOURCE_URL=$QT_URL/qt5/$VERSION/submodules_tar/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://qt-project.org
ENTERED=20120901
diff --git a/qt5/qtjsbackend/HISTORY b/qt5/qtjsbackend/HISTORY
index 8502a30..9a9528e 100644
--- a/qt5/qtjsbackend/HISTORY
+++ b/qt5/qtjsbackend/HISTORY
@@ -1,3 +1,7 @@
+2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+ * PRE_BUILD: added, support multiple versions of python
+
2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.0.0-beta1
spell created
diff --git a/qt5/qtjsbackend/PRE_BUILD b/qt5/qtjsbackend/PRE_BUILD
new file mode 100755
index 0000000..ad71fa1
--- /dev/null
+++ b/qt5/qtjsbackend/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+ cd $SOURCE_DIRECTORY &&
+ if is_depends_enabled $SPELL python;then
+ ln -s /usr/bin/python2 python
+ fi
+ if is_depends_enabled $SPELL python3;then
+ ln -s /usr/bin/python3 python
+ fi
+
diff --git a/qt5/qtxmlpatterns/DETAILS b/qt5/qtxmlpatterns/DETAILS
index 6ef972a..3f2b112 100755
--- a/qt5/qtxmlpatterns/DETAILS
+++ b/qt5/qtxmlpatterns/DETAILS
@@ -1,9 +1,10 @@
+QT_URL=http://origin.releases.qt-project.org
SPELL=qtxmlpatterns
SPELLX=$SPELL-opensource-src
- VERSION=5.0.0-beta1
-
SOURCE_HASH=sha512:0c39bd1baa7549853b7ac00b4b74d408d9014b77b0c875e6c8abec600301f356ebdcac3e49e5cd511309838deb6ceae7d833867278a50a91a0e78a40ffefce32
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:16a1d42348495b860fb01a7bb27d18d1b486a4d0fba68e5ef470b8197842032a3040b6991d07b66ea902c3ab03f09eecb9ad25b52725f7afc5ef6e66bba2760b
SOURCE=$SPELLX-$VERSION.tar.xz
-
SOURCE_URL=http://releases.qt-project.org/qt5.0/beta1/split_sources/$SOURCE
+ SOURCE_URL=$QT_URL/qt5/$VERSION/submodules_tar/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=http://qt-project.org
ENTERED=20120901
diff --git a/qt5/qtxmlpatterns/HISTORY b/qt5/qtxmlpatterns/HISTORY
index 8502a30..c28943e 100644
--- a/qt5/qtxmlpatterns/HISTORY
+++ b/qt5/qtxmlpatterns/HISTORY
@@ -1,3 +1,6 @@
+2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+
2012-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.0.0-beta1
spell created



  • [SM-Commit] GIT changes to devel-split-qt5 grimoire by Treeve Jelbert (18c844640d1f95fae9e440434fa45d6b05169124), Treeve Jelbert, 02/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page