Qt 3.3.8

Package-Manager: portage-2.1.2-r8

4 files changed, 232 insertions, 0 deletions

diff --git a/x11-libs/qt/files/digest-qt-3.3.8 b/x11-libs/qt/files/digest-qt-3.3.8
new file mode 100644
index 000000000000..e43c710dd190
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.8
@@ -0,0 +1,6 @@
+MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124
+RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124
+SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124
+MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
diff --git a/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch b/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch
new file mode 100644
index 000000000000..9fdd97a3d3ef
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-seli-xinerama.patch
@@ -0,0 +1,49 @@
+--- src/kernel/qapplication_x11.cpp.sav	2006-06-01 13:31:04.000000000 +0200
++++ src/kernel/qapplication_x11.cpp	2006-06-01 13:33:07.000000000 +0200
+@@ -271,6 +271,7 @@ Atom		qt_net_wm_frame_strut		= 0;	// KDE
+ Atom		qt_net_wm_state_stays_on_top	= 0;	// KDE extension
+ Atom		qt_net_wm_pid		= 0;
+ Atom		qt_net_wm_user_time	= 0;
++Atom            qt_net_wm_full_placement = 0; // KDE extension
+ // Enlightenment support
+ Atom		qt_enlightenment_desktop	= 0;
+ 
+@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha
+ 			    &qt_net_wm_state_stays_on_top );
+ 	qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
+ 	qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
++	qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
+ 	qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
+ 	qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
+ 	qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
+--- src/dialogs/qdialog.cpp.sav	2006-03-17 14:33:44.000000000 +0100
++++ src/dialogs/qdialog.cpp	2006-06-01 13:38:00.000000000 +0200
+@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e )
+ 
+ #if defined(Q_WS_X11)
+ extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
++#include <private/qt_x11_p.h>
++#undef FocusIn
++// defined in qapplication_x11.cpp
++extern Atom qt_net_wm_full_placement;
++extern bool qt_net_supports(Atom atom);
+ #endif // Q_WS_X11
+ 
+ /*!
+@@ -691,10 +696,12 @@ void QDialog::show()
+ 
+     if ( !did_resize )
+ 	adjustSize();
+-    if ( has_relpos && !did_move ) {
+-	adjustPositionInternal( parentWidget(), TRUE );
+-    } else if ( !did_move ) {
+-	adjustPositionInternal( parentWidget() );
++    if( !qt_net_supports( qt_net_wm_full_placement )) {
++	if ( has_relpos && !did_move ) {
++	    adjustPositionInternal( parentWidget(), TRUE );
++	} else if ( !did_move ) {
++	    adjustPositionInternal( parentWidget() );
++	}
+     }
+ 
+     if (windowState() != state)
diff --git a/x11-libs/qt/files/qt-3.3.8-uic-fix.patch b/x11-libs/qt/files/qt-3.3.8-uic-fix.patch
new file mode 100644
index 000000000000..8e5bd5590874
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-uic-fix.patch
@@ -0,0 +1,18 @@
+Index: tools/designer/uic/form.cpp
+===================================================================
+--- tools/designer/uic/form.cpp	(revision 460038)
++++ tools/designer/uic/form.cpp	(working copy)
+@@ -731,6 +731,13 @@
+             while ( !n2.isNull() ) {
+                 if ( n2.tagName() == "includehint" ) {
+                     QString file = n2.firstChild().toText().data();
++                    int colons = file.find("::");
++
++                    if (colons != -1)
++                    {
++                        file = file.right(file.length() - colons - 2);
++                    }
++
+                     localIncludes += file;
+                 }
+                 n2 = n2.nextSibling().toElement();
diff --git a/x11-libs/qt/files/qt-3.3.8-visibility.patch b/x11-libs/qt/files/qt-3.3.8-visibility.patch
new file mode 100644
index 000000000000..a5246b9ff0e1
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-visibility.patch
@@ -0,0 +1,159 @@
+Index: configure
+===================================================================
+--- configure	(revision 471775)
++++ configure	(working copy)
+@@ -1053,6 +1053,7 @@
+ [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
+ cat > $outpath/src/tools/qconfig.cpp.new <<EOF
+ /* Install paths from configure */
++#include "qglobal.h"
+ 
+ static const char QT_INSTALL_PREFIX      [267] = "qt_nstpath=$QT_INSTALL_PREFIX";
+ static const char QT_INSTALL_BINS        [267] = "qt_binpath=$QT_INSTALL_BINS";
+Index: src/kernel/qgplugin.h
+===================================================================
+--- src/kernel/qgplugin.h	(revision 471775)
++++ src/kernel/qgplugin.h	(working copy)
+@@ -90,35 +90,19 @@
+ 	    return i->iface(); \
+ 	}
+ 
+-#    ifdef Q_WS_WIN
+-#	ifdef Q_CC_BOR
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char * __stdcall qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
+-                __stdcall ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	else
+-#	    define Q_EXPORT_PLUGIN(PLUGIN) \
+-	        Q_PLUGIN_VERIFICATION_DATA \
+-		Q_EXTERN_C __declspec(dllexport) \
+-                const char *qt_ucm_query_verification_data() \
+-                { return qt_ucm_verification_data; } \
+-		Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
+-		Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#	endif
+-#    else
+-#	define Q_EXPORT_PLUGIN(PLUGIN) \
++#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
++#   define Q_STDCALL __stdcall
++#else
++#   define Q_STDCALL
++#endif
++
++#define Q_EXPORT_PLUGIN(PLUGIN) \
+ 	    Q_PLUGIN_VERIFICATION_DATA \
+-	    Q_EXTERN_C \
+-            const char *qt_ucm_query_verification_data() \
++	    Q_EXTERN_C Q_EXPORT \
++            const char * Q_STDCALL qt_ucm_query_verification_data() \
+             { return qt_ucm_verification_data; } \
+-	    Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
++	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
+             Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#    endif
+-
+ #endif
+ 
+ struct QUnknownInterface;
+Index: src/kernel/qapplication_x11.cpp
+===================================================================
+--- src/kernel/qapplication_x11.cpp	(revision 471775)
++++ src/kernel/qapplication_x11.cpp	(working copy)
+@@ -314,7 +314,7 @@
+ 
+ // flags for extensions for special Languages, currently only for RTL languages
+ static bool 	qt_use_rtl_extensions = FALSE;
+-bool qt_hebrew_keyboard_hack = FALSE;
++Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE;
+ 
+ static Window	mouseActWindow	     = 0;	// window where mouse is
+ static int	mouseButtonPressed   = 0;	// last mouse button pressed
+@@ -3800,7 +3800,7 @@
+ }
+ 
+ 
+-bool qt_try_modal( QWidget *widget, XEvent *event )
++Q_EXPORT bool qt_try_modal( QWidget *widget, XEvent *event )
+ {
+     if (qt_xdnd_dragging) {
+ 	// allow mouse events while DnD is active
+Index: src/kernel/qtextengine_p.h
+===================================================================
+--- src/kernel/qtextengine_p.h	(revision 471775)
++++ src/kernel/qtextengine_p.h	(working copy)
+@@ -280,7 +280,7 @@
+ 
+ class QFontPrivate;
+ 
+-class QTextEngine {
++class Q_EXPORT QTextEngine {
+ public:
+     QTextEngine( const QString &str, QFontPrivate *f );
+     ~QTextEngine();
+Index: src/tools/qglobal.h
+===================================================================
+--- src/tools/qglobal.h	(revision 471775)
++++ src/tools/qglobal.h	(working copy)
+@@ -865,6 +865,10 @@
+ #    define Q_TEMPLATE_EXTERN
+ #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+ #  endif
++#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
++#    define Q_EXPORT __attribute__((visibility("default")))
++#    undef QT_MAKEDLL		/* ignore these for other platforms */
++#    undef QT_DLL
+ #else
+ #  undef QT_MAKEDLL		/* ignore these for other platforms */
+ #  undef QT_DLL
+Index: tools/designer/uilib/qwidgetfactory.h
+===================================================================
+--- tools/designer/uilib/qwidgetfactory.h	(revision 471775)
++++ tools/designer/uilib/qwidgetfactory.h	(working copy)
+@@ -48,7 +48,7 @@
+ class QWidgetFactoryPrivate;
+ class UibStrTable;
+ 
+-class QWidgetFactory
++class Q_EXPORT QWidgetFactory
+ {
+ public:
+     QWidgetFactory();
+Index: tools/designer/uilib/qwidgetfactory.cpp
+===================================================================
+--- tools/designer/uilib/qwidgetfactory.cpp	(revision 471775)
++++ tools/designer/uilib/qwidgetfactory.cpp	(working copy)
+@@ -113,13 +113,13 @@
+ static QMap<QString, bool> *availableWidgetMap = 0;
+ static QStringList *availableWidgetList = 0;
+ 
+-QMap<QWidget*, QString> *qwf_forms = 0;
++Q_EXPORT QMap<QWidget*, QString> *qwf_forms = 0;
+ QString *qwf_language = 0;
+-bool qwf_execute_code = TRUE;
++Q_EXPORT bool qwf_execute_code = TRUE;
+ bool qwf_stays_on_top = FALSE;
+ QString qwf_currFileName = "";
+ QObject *qwf_form_object = 0;
+-QString *qwf_plugin_dir = 0;
++Q_EXPORT QString *qwf_plugin_dir = 0;
+ 
+ static void setupPluginDir()
+ {
+Index: tools/designer/shared/domtool.h
+===================================================================
+--- tools/designer/shared/domtool.h	(revision 471775)
++++ tools/designer/shared/domtool.h	(working copy)
+@@ -33,7 +33,7 @@
+ class QDomElement;
+ class QDomDocument;
+ 
+-class DomTool : public Qt
++class Q_EXPORT DomTool : public Qt
+ {
+ public:
+     static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue );