From: Caleb Tennis Date: Thu, 22 Feb 2007 14:10:18 +0000 (+0000) Subject: Qt 3.3.8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f58fd7ea60b1d6f4181d3c3e9332b243a7c5d200;p=gentoo.git Qt 3.3.8 Package-Manager: portage-2.1.2-r8 --- diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index f43d4176226f..cdea71a53849 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.413 2007/02/18 15:43:00 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.414 2007/02/22 14:10:18 caleb Exp $ + +*qt-3.3.8 (22 Feb 2007) + + 22 Feb 2007; Caleb Tennis + +files/qt-3.3.8-seli-xinerama.patch, +files/qt-3.3.8-uic-fix.patch, + +files/qt-3.3.8-visibility.patch, +qt-3.3.8.ebuild: + Bump to latest version 18 Feb 2007; Fabian Groffen -files/qt-3.3.4-macos.patch, -files/qt-3.3.5-macos.patch, diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 3557b947eeca..bcb9e43704fc 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -74,6 +74,18 @@ AUX qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.6-visibility.patch 5554 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.6-visibility.patch 5554 +AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 +MD5 5a809da59debd0d8242c25c1f5ae7697 files/qt-3.3.8-seli-xinerama.patch 1960 +RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 files/qt-3.3.8-seli-xinerama.patch 1960 +SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 files/qt-3.3.8-seli-xinerama.patch 1960 +AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 +MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.8-uic-fix.patch 711 +RMD160 19964cfc6714e2ad38659e268ef248501db606aa files/qt-3.3.8-uic-fix.patch 711 +SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 files/qt-3.3.8-uic-fix.patch 711 +AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 +MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.8-visibility.patch 5554 +RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.8-visibility.patch 5554 +SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.8-visibility.patch 5554 AUX qt-4.1.4-CVE-2006-4811-bis.patch 6884 RMD160 b6d321e1e6fa6520a4e5c67d6dd259610d6f057d SHA1 791f8d80ce24ca63372b0ec013bdbf54ea737a22 SHA256 89bad02c95f3ca7471581a4f879d31a0300bf809042e9b67fb1514f64588fe25 MD5 118a9449bf90cce72da95598ae303b55 files/qt-4.1.4-CVE-2006-4811-bis.patch 6884 RMD160 b6d321e1e6fa6520a4e5c67d6dd259610d6f057d files/qt-4.1.4-CVE-2006-4811-bis.patch 6884 @@ -104,6 +116,7 @@ RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae +DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c @@ -121,6 +134,10 @@ EBUILD qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced MD5 9e4b234be100199e8a74f09e748ecd52 qt-3.3.6-r5.ebuild 11117 RMD160 464d1a225f2ba385cc80e662046de4998c720ced qt-3.3.6-r5.ebuild 11117 SHA256 0f6a74ff4f067f7a68a3629548258ef027514d97f7cf52ab864f8b21f39e6225 qt-3.3.6-r5.ebuild 11117 +EBUILD qt-3.3.8.ebuild 11129 RMD160 6f3dd843fece34ec8d82eb3e257155050ed5882f SHA1 d7d2461539bd5eacaafee894b4bc9489a7827d8d SHA256 613b3b2b0e903f0b81a2e0a9dd08302a522000f141d08190b2ff4d46684dbe4a +MD5 573bebfe75835d941660b7b27c5a8401 qt-3.3.8.ebuild 11129 +RMD160 6f3dd843fece34ec8d82eb3e257155050ed5882f qt-3.3.8.ebuild 11129 +SHA256 613b3b2b0e903f0b81a2e0a9dd08302a522000f141d08190b2ff4d46684dbe4a qt-3.3.8.ebuild 11129 EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff SHA1 dffa6d4bae33a49c7c75e6d75736b70f0228fb25 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855 @@ -133,10 +150,10 @@ EBUILD qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 SHA1 MD5 fe911ce7afaeeb22c93d7b6b02a633cb qt-4.2.2.ebuild 7691 RMD160 c22f499f93702a0000325da515c14f3d26c72175 qt-4.2.2.ebuild 7691 SHA256 9a283ff88292c02772d2b5cd508d4c510ccfe318f09ab15f1179f77416138ae2 qt-4.2.2.ebuild 7691 -MISC ChangeLog 24407 RMD160 bbfe1578cafdaef89b240984e99696ad1cb2c1c5 SHA1 c48b3e9286e1c498ff0bfacb96fa9c3dce136579 SHA256 3f1c19a168f5ad28494330b49d3518de7c362cfdcb8598f5e39ee70feaabf311 -MD5 658c0c8e818cec0a59ea8cc8e59bd5db ChangeLog 24407 -RMD160 bbfe1578cafdaef89b240984e99696ad1cb2c1c5 ChangeLog 24407 -SHA256 3f1c19a168f5ad28494330b49d3518de7c362cfdcb8598f5e39ee70feaabf311 ChangeLog 24407 +MISC ChangeLog 24627 RMD160 3b8e8ee56467b9c0af41e562d15510e958db0c89 SHA1 a8cfd8dad4078623bbae74ef414a648411a30d3d SHA256 3c174f088027db1d940556ce53c4436f3c9319c0754ceed68dbfd0fea4f2738b +MD5 039119a63fbb9da7169407e21a21464e ChangeLog 24627 +RMD160 3b8e8ee56467b9c0af41e562d15510e958db0c89 ChangeLog 24627 +SHA256 3c174f088027db1d940556ce53c4436f3c9319c0754ceed68dbfd0fea4f2738b ChangeLog 24627 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 @@ -150,6 +167,9 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r5 611 RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r5 611 SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r5 611 +MD5 cf87e67df16b90795b2313a0a0bf3acb files/digest-qt-3.3.8 608 +RMD160 c11ee954e00866f191758810ed4ef8d8ebda0102 files/digest-qt-3.3.8 608 +SHA256 b7e595acecd8a41b6d405b6a71225eaff8c5fbb00d3ee6ebff968c9ae2f5d55a files/digest-qt-3.3.8 608 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289 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 ++#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 <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 *availableWidgetMap = 0; + static QStringList *availableWidgetList = 0; + +-QMap *qwf_forms = 0; ++Q_EXPORT QMap *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 ); diff --git a/x11-libs/qt/qt-3.3.8.ebuild b/x11-libs/qt/qt-3.3.8.ebuild new file mode 100644 index 000000000000..d5a75071423d --- /dev/null +++ b/x11-libs/qt/qt-3.3.8.ebuild @@ -0,0 +1,381 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8.ebuild,v 1.1 2007/02/22 14:10:18 caleb Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +SRCTYPE="free" +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." +HOMEPAGE="http://www.trolltech.com/" + +IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo" + +SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz + immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 ) + immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )" +LICENSE="|| ( QPL-1.0 GPL-2 )" + +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86 ~x86-fbsd" +IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc" + +DEPEND="|| ( ( x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libSM + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama ) + + ) + =media-libs/libmng-1.0.9 + >=media-libs/freetype-2 + sys-libs/zlib + nas? ( >=media-libs/nas-1.5 ) + mysql? ( virtual/mysql ) + firebird? ( dev-db/firebird ) + opengl? ( virtual/opengl virtual/glu ) + postgres? ( dev-db/libpq ) + cups? ( net-print/cups )" +PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )" + +S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} + +QTBASE=/usr/qt/3 + +pkg_setup() { + if use immqt && use immqt-bc ; then + ewarn + ewarn "immqt and immqt-bc are exclusive. You cannot set both." + ewarn "Please specify either immqt or immqt-bc." + ewarn + die + elif use immqt ; then + ewarn + ewarn "You are going to compile binary imcompatible immodule for Qt. This means" + ewarn "you have to recompile everything depending on Qt after you install it." + ewarn "Be aware." + ewarn + fi + + export QTDIR=${S} + + CXX=$(tc-getCXX) + if [[ ${CXX/g++/} != ${CXX} ]]; then + PLATCXX="g++" + elif [[ ${CXX/icpc/} != ${CXX} ]]; then + PLATCXX="icc" + else + die "Unknown compiler ${CXX}." + fi + + case ${CHOST} in + *-freebsd*|*-dragonfly*) + PLATNAME="freebsd" ;; + *-openbsd*) + PLATNAME="openbsd" ;; + *-netbsd*) + PLATNAME="netbsd" ;; + *-darwin*) + PLATNAME="darwin" ;; + *-linux-*|*-linux) + PLATNAME="linux" ;; + *) + die "Unknown CHOST, no platform choosed." + esac + + # probably this should be '*-64' for 64bit archs + # in a fully multilib environment (no compatibility symlinks) + export PLATFORM="${PLATNAME}-${PLATCXX}" +} + +src_unpack() { + unpack ${A} + cd ${S} + + sed -i -e 's:read acceptance:acceptance=yes:' configure + + # Do not link with -rpath. See bug #75181. + find ${S}/mkspecs -name qmake.conf | xargs \ + sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:' + + # Patch for uic includehint errors (aseigo patch) + epatch ${FILESDIR}/${P}-uic-fix.patch + + # KDE related patches + epatch ${FILESDIR}/0001-dnd_optimization.patch + epatch ${FILESDIR}/0002-dnd_active_window_fix.patch + epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch + epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff + epatch ${FILESDIR}/0047-fix-kmenu-widget.diff + epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch + + # ulibc patch (bug #100246) + epatch ${FILESDIR}/qt-ulibc.patch + + # xinerama patch: http://ktown.kde.org/~seli/xinerama/ + epatch "${FILESDIR}/${P}-seli-xinerama.patch" + + # Visibility patch, apply only on GCC 4.1 and later for safety + # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \ + epatch "${FILESDIR}/${P}-visibility.patch" + + if use immqt || use immqt-bc ; then + epatch ../${IMMQT_P}.diff + sh make-symlinks.sh || die "make symlinks failed" + fi + + if use ppc-macos ; then + epatch "${FILESDIR}/${PN}-3.3.5-macos.patch" + fi + + # known working flags wrt #77623 + use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" + # set c/xxflags and ldflags + strip-flags + append-flags -fno-strict-aliasing + sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ + -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ + -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ + -e "s:\.*=.*:QMAKE_CC=$(tc-getCC):" \ + -e "s:\.*=.*:QMAKE_CXX=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK=$(tc-getCXX):" \ + -e "s:\.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ + ${S}/mkspecs/${PLATFORM}/qmake.conf || die + + if [ $(get_libdir) != "lib" ] ; then + sed -i -e "s:/lib$:/$(get_libdir):" \ + ${S}/mkspecs/${PLATFORM}/qmake.conf || die + fi +} + +src_compile() { + export SYSCONF=${D}${QTBASE}/etc/settings + + # Let's just allow writing to these directories during Qt emerge + # as it makes Qt much happier. + addwrite "${QTBASE}/etc/settings" + addwrite "${HOME}/.qt" + + [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" + + # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. + use nas && myconf="${myconf} -system-nas-sound" + use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis" + use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" + use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql" + use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" + use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" + use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" + use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" + use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" + use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" + use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" + + myconf="${myconf} -system-zlib" + + use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" + use immqt-bc && myconf="${myconf} -inputmethod" + use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" + + if use ppc-macos ; then + myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared" + myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" + myconf="${myconf} -L${S}/lib -I${S}/include" + sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die + fi + + export YACC='byacc -d' + tc-export CC CXX + export LINK="$(tc-getCXX)" + + ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ + -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ + -system-libpng -xft -platform ${PLATFORM} -xplatform \ + ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ + -fast -no-sql-odbc ${myconf} -dlopen-opengl || die + + emake src-qmake src-moc sub-src || die + + export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + emake sub-tools || die + + if use examples; then + emake sub-tutorial sub-examples || die + fi + + # Make the msg2qm utility (not made by default) + cd ${S}/tools/msg2qm + ../../bin/qmake + emake + + # Make the qembed utility (not made by default) + cd ${S}/tools/qembed + ../../bin/qmake + emake + +} + +src_install() { + # binaries + into ${QTBASE} + dobin bin/* + dobin tools/msg2qm/msg2qm + dobin tools/qembed/qembed + + # libraries + if use ppc-macos; then + # dolib is broken on BSD because of missing readlink(1) + dodir ${QTBASE}/$(get_libdir) + cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die + + cd ${D}/${QTBASE}/$(get_libdir) + for lib in libqt-mt* ; do + ln -s ${lib} ${lib/-mt/} + done + else + dolib.so lib/lib{editor,qassistantclient,designercore}.a + dolib.so lib/libqt-mt.la + dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0 + cd ${D}/${QTBASE}/$(get_libdir) + + for x in libqui.so ; do + ln -s $x.1.0.0 $x.1.0 + ln -s $x.1.0 $x.1 + ln -s $x.1 $x + done + + # version symlinks - 3.3.5->3.3->3->.so + ln -s libqt-mt.so.${PV} libqt-mt.so.3.3 + ln -s libqt-mt.so.3.3 libqt-mt.so.3 + ln -s libqt-mt.so.3 libqt-mt.so + + # libqt -> libqt-mt symlinks + ln -s libqt-mt.so.${PV} libqt.so.${PV} + ln -s libqt-mt.so.3.3 libqt.so.3.3 + ln -s libqt-mt.so.3 libqt.so.3 + ln -s libqt-mt.so libqt.so + fi + + # plugins + cd ${S} + local plugins=$(find plugins -name "lib*.so" -print) + for x in ${plugins}; do + exeinto ${QTBASE}/$(dirname ${x}) + doexe ${x} + done + + # Past this point just needs to be done once + is_final_abi || return 0 + + # includes + cd ${S} + dodir ${QTBASE}/include/private + cp include/* ${D}/${QTBASE}/include/ + cp include/private/* ${D}/${QTBASE}/include/private/ + + # prl files + sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl + insinto ${QTBASE}/$(get_libdir) + doins ${S}/lib/*.prl + + # pkg-config file + insinto ${QTBASE}/$(get_libdir)/pkgconfig + doins ${S}/lib/*.pc + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:${QTBASE}/${libdir}" + done + + # environment variables + if use ppc-macos; then + cat < ${T}/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +DYLD_LIBRARY_PATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig +EOF + else + cat < ${T}/45qt3 +PATH=${QTBASE}/bin +ROOTPATH=${QTBASE}/bin +LDPATH=${libdirs:1} +QMAKESPEC=${PLATFORM} +MANPATH=${QTBASE}/doc/man +PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig +EOF + fi + cat < ${T}/50qtdir3 +QTDIR=${QTBASE} +EOF + + cat < ${T}/50-qt3-revdep +SEARCH_DIRS="${QTBASE}" +EOF + + insinto /etc/revdep-rebuild + doins ${T}/50-qt3-revdep + + insinto /etc/env.d + doins ${T}/45qt3 ${T}/50qtdir3 + + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib + fi + + insinto ${QTBASE}/tools/designer + doins -r tools/designer/templates + + insinto ${QTBASE} + doins -r translations + + keepdir ${QTBASE}/etc/settings + + if use doc; then + insinto ${QTBASE} + doins -r ${S}/doc + fi + + if use examples; then + find ${S}/examples ${S}/tutorial -name Makefile | \ + xargs sed -i -e "s:${S}:${QTBASE}:g" + + cp -r ${S}/examples ${D}${QTBASE}/ + cp -r ${S}/tutorial ${D}${QTBASE}/ + fi + + # misc build reqs + insinto ${QTBASE}/mkspecs + doins -r ${S}/mkspecs/${PLATFORM} + + sed -e "s:${S}:${QTBASE}:g" \ + ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache + + dodoc FAQ README README-QT.TXT changes* + if use immqt || use immqt-bc ; then + dodoc ${S}/README.immodule + fi +} + +pkg_postinst() { + echo + elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles," + elog "or widgets for the Qt designer) are no longer recognized. If this situation" + elog "occurs you should recompile the packages providing these plugins," + elog "and you should also make sure that Qt and its plugins were compiled with the" + elog "same version of gcc. Packages that may need to be rebuilt are, for instance," + elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles." + elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos." + echo +}