Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (256c9292dc9e6f4768996fbf828252901a7a226d)

Chronological Thread  
    < 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 (256c9292dc9e6f4768996fbf828252901a7a226d)
  • Date: Tue, 1 Dec 2009 11:42:08 -0600
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

x11-toolkits/qt4/BUILD | 3 +++
x11-toolkits/qt4/CONFIGURE | 15 ++++++++++-----
x11-toolkits/qt4/CONFLICTS | 8 ++++++++
x11-toolkits/qt4/DEPENDS | 12 +-----------
x11-toolkits/qt4/DETAILS | 7 +++----
x11-toolkits/qt4/HISTORY | 26 ++++++++++++++++++++++++++
x11-toolkits/qt4/PRE_BUILD | 8 ++++++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 3 +++
x11-toolkits/qt4/SUB_DEPENDS | 16 ++++++++++++++++
9 files changed, 78 insertions(+), 20 deletions(-)

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

qt4: => 4.6.0
(cherry picked from commit e9a53589af4514979b366195eab15ca9da77ad35)

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

qt4 - always needs zlib
(cherry picked from commit 37465c10ae481de13a9bebea9485195ee37c48fb)
(cherry picked from commit bd0b3eb4f39f967e03d15c0803e74be3353c0505)

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

qt4: => 4.6.0-rc1
(cherry picked from commit e6846300b281875f72c9c6e2ba581cde805967a9)

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

qt4 - fix SUB_DEPENDS for accessiblity
(cherry picked from commit 906a19391697dda1db0d17e999ca8adefcffae84)

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

qt4 - fix build of TOOLS
(cherry picked from commit 5ca839d5e5471724f18f247b19b01df042e14900)

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

qt4 - add more configure options
(cherry picked from commit 90193a6ef8d01afcd4dcbcbfbffea61d1f20f680)

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

qt4: => 4.6.0-beta1
(cherry picked from commit 7dfe64550a2bc1cce5871f3b485d61d94f820d08)

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 9ac4c56..eaefd4f 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -13,6 +13,9 @@ OPTS="$QT_DEBUG \
$QT_TOOLS tools \
$QT_TRANS translations \
$QT_WEBKIT \
+ $QT_MEDIA \
+ $QT_GTK \
+ $QT_ACCESS \
$OPTS" &&

./configure -opensource -confirm-license
\
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index 9a693fb..bdaf1ed 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -52,8 +52,13 @@ config_query_option QT_WEBKIT 'Build the WebKit module?'
y \
'-webkit' \
'-no-webkit' &&

-# change the old options to the new, can be removed after a year --20080105
-QT_DEMO="${QT_DEMO//demos/}" &&
-QT_EXAMPLE="${QT_EXAMPLE//examples/}" &&
-QT_TOOLS="${QT_TOOLS//tools/}" &&
-QT_TRANS="${QT_TRANS//translations/}"
+config_query_option QT_MEDIA 'Build Multimedia support?' y \
+ '-multimedia' \
+ '-no-multimedia' &&
+config_query_option QT_GTK 'Build the GTK theme integration?' y \
+ '-gtkstyle' \
+ '-no-gtkstyle' &&
+
+config_query_option QT_ACCESS 'Compile Accessibility support' n \
+ '-accessibility' \
+ '-no-accessibility'
diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
new file mode 100755
index 0000000..60697dd
--- /dev/null
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -0,0 +1,8 @@
+if spell_ok $SELF;then
+ OLDQT=`installed_version $SELF| cut -c-3` &&
+ NEWQT=`echo $VERSION | cut -c-3`
+message "old=$OLDQT, new=$NEWQT" &&
+ if [[ $OLDQT != $NEWQT ]];then
+ conflicts qt4 y
+ fi
+fi
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index dbdd68e..46addd9 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -1,4 +1,5 @@
depends g++ &&
+depends zlib &&
depends libx11 &&
depends libxcursor &&
depends libxfixes &&
@@ -17,11 +18,6 @@ optional_depends jpeg \
'-qt-libjpeg' \
'to use the system jpeg library' &&

-optional_depends zlib \
- '-system-zlib' \
- '-qt-zlib' \
- 'to use the system zlib library' &&
-
optional_depends openssl \
'-openssl' \
'-no-openssl' \
@@ -55,12 +51,6 @@ optional_depends sqlite
\
'-no-sql-sqlite' \
'for sqlite 3.x database support' &&

-optional_depends sqlite2 \
- "-plugin-sql-sqlite2 -I$INSTALL_ROOT/usr/include \
- -L$INSTALL_ROOT/usr/lib -lsqlite" \
- '-no-sql-sqlite2' \
- 'for sqlite 2.x database support' &&
-
optional_depends postgresql
\
"-plugin-sql-psql -I$INSTALL_ROOT/src/include/postgresql
\
-I$INSTALL_ROOT/usr/include/server/libpq
-L$INSTALL_ROOT/usr/lib -lpq" \
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index bed45d3..09a1fb7 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,10 +3,9 @@ persistent_remove QT_VER
if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
- SPELLX=qt-x11-opensource-src
- VERSION=4.5.3
-
SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2
- PATCHLEVEL=1
+ SPELLX=qt-everywhere-opensource-src
+ VERSION=4.6.0
+
SOURCE_HASH=sha512:fb67e20426565723757cd12fbe130352fb04817b508bf35df79ba5545d3b7bfd7af4016206d8070ce4a85209849886968db2519621f3b96e2f5c6a28934b2386
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 9cccb00..263a4a0 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,29 @@
+2009-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.6.0
+ * CONFLICTS: check old version before forcing conflict
+
+2009-11-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: zlib is always required now
+
+2009-11-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.6.0-rc1
+
+2009-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: add ACCESS
+
+2009-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix for not linking clucene correctly (4.6.0-beta1)
+ needed in order to build TOOLS, which in turn is needed by kde4
+
+2009-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.6.0-beta1
+ * CONFLICTS: add it back again unfortunately. when going from 4.5 to
4.6
+ tries to link old modules which don't have the new entrypoints
+ * BUILD HISTORY SUB_DEPENDS PRE_SUB_DEPENDS:
+ add multimedia, Accessibility and gtk options
+ * CONFIGURE: delete obsolete stuff
+ * DEPENDS: remove obsolete sqlite2 support
+
2009-10-10 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: No longer seems to need a self-conflict during upgrades

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 27d53a0..be45191 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,5 +1,13 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# fix bad .pro file for 4.6.0-beta1
+sed -i '/CONFIG +=/ a\
+LIBS += -lQtCLucene
+' tools/assistant/tools/qhelpgenerator/*.pro \
+ tools/assistant/tools/qcollectiongenerator/*.pro \
+ tools/assistant/tools/qhelpconverter/*.pro \
+ tools/assistant/tools/assistant/*.pro &&
+

# add better optimisation flags
sed -i "s|-O2||" mkspecs/common/g++.conf \
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index bde8deb..47abc86 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ ACCESS) [[ $QT_ACCESS == "-accessibility" ]] && return 0;;
DBUS) is_depends_enabled $SPELL dbus && return 0;;
OPENGL) is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL) &&
return 0;;
FIREBIRD) is_depends_enabled $SPELL firebird && return 0;;
@@ -10,6 +11,8 @@ case $THIS_SUB_DEPENDS in
STL) [[ $QT_STL == "-stl" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
+ MEDIA) [[ $QT_MEDIA == "-multimedia" ]] && return 0;;
+ GTK ) [[ $QT_GTK == "-gtkstyle" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index 81a17ec..c6b963c 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -48,5 +48,21 @@ MYSQL) echo "MySQL support requested, forcing mysql
dependency." &&
depends mysql "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
-L$INSTALL_ROOT/usr/lib -lmysqlclient"
;;
+MEDIA) if [[ $QT_MEDIA == "-no-multimedia" ]]; then
+ echo "Multimedia module requested, forcing build." &&
+ QT_MEDIA="-multimedia"
+ fi
+ ;;
+GTK) if [[ $QT_GTK == "-no-gtkstyle" ]]; then
+ echo "GTK theme integration requested, forcing build." &&
+ QT_GTK="-gtkstyle"
+ fi
+ ;;
+ACCESS) if [[ $QT_ACCESS == "-no-accessibility" ]]; then
+ echo "Accessiblity support requested, forcing build." &&
+ QT_ACCESS="-accessibility"
+ fi
+ ;;
+
*) echo unknown sub-depends!!! ; return 1 ;;
esac


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (256c9292dc9e6f4768996fbf828252901a7a226d), Treeve Jelbert, 12/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page