rpms/qt/devel qt-visibility.patch,NONE,1.1 qt.spec,1.77,1.78

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11385

Modified Files:
	qt.spec 
Added Files:
	qt-visibility.patch 
Log Message:
add visibility patch


qt-visibility.patch:
 kernel/qgplugin.h |   36 ++++++++++--------------------------
 tools/qglobal.h   |    4 ++++
 2 files changed, 14 insertions(+), 26 deletions(-)

--- NEW FILE qt-visibility.patch ---
Index: src/kernel/qgplugin.h
===================================================================
--- qt-x11-free-3.3.4/src/kernel/qgplugin.h	(revision 423270)
+++ qt-x11-free-3.3.4/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/tools/qglobal.h
===================================================================
---  qt-x11-free-3.3.4/src/tools/qglobal.h	(revision 423270)
+++  qt-x11-free-3.3.4/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: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- qt.spec	20 Jul 2005 11:56:40 -0000	1.77
+++ qt.spec	1 Aug 2005 13:01:06 -0000	1.78
@@ -37,6 +37,9 @@
 # cups support
 %define cups 1
 
+# visibility
+%define enable_hidden_visibility 1
+
 %define debug 0
 
 %define sover %{ver}
@@ -82,7 +85,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 17
+Release: 18
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -107,6 +110,7 @@
 Patch20: qt-x11-free-3.3.4-qtlocale.patch
 Patch21: qt-x11-free-3.3.3-Punjabi.patch
 Patch22: qt-x11-free-3.3.4-assistant_de.patch
+Patch23: qt-visibility.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2
@@ -314,6 +318,10 @@
 %patch21 -p1 -b .punjabi
 %patch22 -p1 -b .trans
 
+%if %{enable_hidden_visibility}
+%patch23 -p1 -b .hidden_visibility
+%endif
+
 %if %{immodule}
 %patch50 -p1
 %patch51 -p0 -b .qximinputcontext_x11
@@ -696,6 +704,9 @@
 
 
 %changelog
+* Mon Aug 01 2005 Than Ngo <than at redhat.com> 1:3.3.4-18
+- add visibility patch
+
 * Wed Jul 20 2005 Than Ngo <than at redhat.com> 1:3.3.4-17
 - fix German translation of the Qt Assistent #161558