sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (a0c980afe16a01d804981034f46b5f0fd1a7ba23)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (a0c980afe16a01d804981034f46b5f0fd1a7ba23)
- Date: Mon, 1 Feb 2010 00:39:31 -0600
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
x11-toolkits/qt4/BUILD | 2 ++
x11-toolkits/qt4/CONFIGURE | 13 +++++++------
x11-toolkits/qt4/DETAILS | 7 +++----
x11-toolkits/qt4/HISTORY | 19 +++++++++++++++++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 2 ++
x11-toolkits/qt4/SUB_DEPENDS | 10 ++++++++++
6 files changed, 43 insertions(+), 10 deletions(-)
New commits:
commit a0c980afe16a01d804981034f46b5f0fd1a7ba23
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "qt4 4.6.1""
This reverts commit 5bbebbfc9da0f6a3c70da6861b131af5763a8233.
Seems this will require more work to properly downgrade to qt4 4.5.x,
leaves many applications broken just reverting with a quick fix of `cast
-c $(gaze depends --fast qt4 1)` (which we could do with triggers). I
hear KDE 4.4 will come out this week, which will also fix Bug #15031
without all this mess.
Sorry for the noise.
commit 4fc29733cc88baac23d78e53fc549dadb00f6490
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "qt4: => 4.6.0""
This reverts commit 541ab0e9f66fde875eaf7fd0d35fa84f1e09ca2c.
Seems this will require more work to properly downgrade to qt4 4.5.x,
leaves many applications broken just reverting with a quick fix of `cast
-c $(gaze depends --fast qt4 1)` (which we could do with triggers). I
hear KDE 4.4 will come out this week, which will also fix Bug #15031
without all this mess.
Sorry for the noise.
commit 1d1a673004616943c59c37aaa3a32301bed8069c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "qt4: => 4.6.0-rc1""
This reverts commit 6b2ad3c77ca9860f60eca3973f93549b41604401.
Seems this will require more work to properly downgrade to qt4 4.5.x,
leaves many applications broken just reverting with a quick fix of
`cast -c $(gaze depends --fast qt4 1)` (which we could do with triggers).
I hear KDE 4.4 will come out this week, which will also fix Bug #15031
without all this mess.
Sorry for the noise.
commit b0024b370c6b6b00d5ed3ae37086cbc33820597c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Revert "Revert "qt4: => 4.6.0-beta1""
This reverts commit 611a3c95f6d4d11686084b858b35239e3c53a18f.
Seems this will require more work to properly downgrade to qt4 4.5.x,
leaves many applications broken just reverting with a quick fix of `cast
-c $(gaze depends --fast qt4 1)` (which we could do with triggers). I
hear KDE 4.4 will come out this week, which will also fix Bug #15031
without all this mess.
Sorry for the noise.
diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 3fdd41d..eaefd4f 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -13,6 +13,8 @@ OPTS="$QT_DEBUG \
$QT_TOOLS tools \
$QT_TRANS translations \
$QT_WEBKIT \
+ $QT_MEDIA \
+ $QT_GTK \
$QT_ACCESS \
$OPTS" &&
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index ba6456b..bdaf1ed 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -52,12 +52,13 @@ config_query_option QT_WEBKIT 'Build the WebKit
module?' y \
'-webkit' \
'-no-webkit' &&
+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'
-
-# 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/}"
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index bed45d3..7dbc0a5 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.1
+
SOURCE_HASH=sha512:a3c16a138a578e4016279627e933bdbb87923770e5c877c83a3cbdb15a5575fe7fefcb63c39faaed30cdb7d36aeec0d1bc3b5d8d3902a6ce5763c5f9e91919bc
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 1c5b7e5..04aa80f 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -4,6 +4,9 @@
2010-01-21 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Looks like qt4 needs to conflict even for minor revisions
+2010-01-22 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.6.1
+
2009-12-01 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: SELF -> SPELL, there is no SELF
Remove debug message, corrupted conflict message to:
@@ -11,9 +14,16 @@
Instead of:
qt4 conflicts with qt4. Dispel qt4? [y]
+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
@@ -21,6 +31,15 @@
* 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_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index b7eac17..47abc86 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -11,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 fb162d9..c6b963c 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -48,6 +48,16 @@ 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"
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (a0c980afe16a01d804981034f46b5f0fd1a7ba23), Eric Sandall, 02/01/2010
Archive powered by MHonArc 2.6.24.