Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (744bbb38bed25fda328f07e35955dec42a0b4605)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (744bbb38bed25fda328f07e35955dec42a0b4605)
  • Date: Sat, 30 Jan 2010 12:51:44 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/qca2/CONFLICTS | 1 +
crypto/qca2/HISTORY | 5 +++++
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 ----------
8 files changed, 16 insertions(+), 43 deletions(-)

New commits:
commit 744bbb38bed25fda328f07e35955dec42a0b4605
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qca2: Auto-conflict or it links against the current
/usr/lib/libqca.so, which may have undefined references if it
has been recently broken by an API change (e.g. qt4 4.5 -> 4.6)

commit 611a3c95f6d4d11686084b858b35239e3c53a18f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "qt4: => 4.6.0-beta1"

This reverts commit aa053bfe2e947a188abc138192198f71e4b798b2.

qt4 4.6.x causes issues with KDE 4.3
e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031

Upstream recommends using qt 4.5 for KDE 4.3.

Conflicts:

x11-toolkits/qt4/BUILD
x11-toolkits/qt4/CONFIGURE
x11-toolkits/qt4/HISTORY
x11-toolkits/qt4/PRE_SUB_DEPENDS
x11-toolkits/qt4/SUB_DEPENDS

commit 6b2ad3c77ca9860f60eca3973f93549b41604401
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "qt4: => 4.6.0-rc1"

This reverts commit 023e80df99efc2b63e3886988aa5383d7928cb8c.

qt4 4.6.x causes issues with KDE 4.3
e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031

Upstream recommends using qt 4.5 for KDE 4.3.

Conflicts:

x11-toolkits/qt4/HISTORY

commit 541ab0e9f66fde875eaf7fd0d35fa84f1e09ca2c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "qt4: => 4.6.0"

This reverts commit 6e73f3ec1de82aea5e40cd15b30cb07eb299ce6e.

qt4 4.6.x causes issues with KDE 4.3
e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031

Upstream recommends using qt 4.5 for KDE 4.3.

Conflicts:

x11-toolkits/qt4/HISTORY

commit 5bbebbfc9da0f6a3c70da6861b131af5763a8233
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "qt4 4.6.1"

This reverts commit c5a9def0593caeb97924225720bd30fa580f73d2.

qt4 4.6.x causes issues with KDE 4.3
e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031

Upstream recommends using qt 4.5 for KDE 4.3.

Conflicts:

x11-toolkits/qt4/HISTORY

diff --git a/crypto/qca2/CONFLICTS b/crypto/qca2/CONFLICTS
new file mode 100755
index 0000000..24b1c64
--- /dev/null
+++ b/crypto/qca2/CONFLICTS
@@ -0,0 +1 @@
+conflicts qca2 y
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 4df6d80..c0310e0 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,8 @@
+2010-01-29 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflict or it links against the current
+ /usr/lib/libqca.so, which may have undefined references if it has
been
+ recently broken by an API change (e.g. qt4 4.5 -> 4.6)
+
2009-05-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.2

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index eaefd4f..3fdd41d 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -13,8 +13,6 @@ 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 bdaf1ed..ba6456b 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -52,13 +52,12 @@ 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 7dbc0a5..bed45d3 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,9 +3,10 @@ persistent_remove QT_VER
if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
- SPELLX=qt-everywhere-opensource-src
- VERSION=4.6.1
-
SOURCE_HASH=sha512:a3c16a138a578e4016279627e933bdbb87923770e5c877c83a3cbdb15a5575fe7fefcb63c39faaed30cdb7d36aeec0d1bc3b5d8d3902a6ce5763c5f9e91919bc
+ SPELLX=qt-x11-opensource-src
+ VERSION=4.5.3
+
SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2
+ PATCHLEVEL=1
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 04aa80f..1c5b7e5 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -4,9 +4,6 @@
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:
@@ -14,16 +11,9 @@
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

@@ -31,15 +21,6 @@
* 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 47abc86..b7eac17 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -11,8 +11,6 @@ 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 c6b963c..fb162d9 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -48,16 +48,6 @@ 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 (744bbb38bed25fda328f07e35955dec42a0b4605), Eric Sandall, 01/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page