diff options
38 files changed, 2693 insertions, 0 deletions
diff --git a/mageia/components.txt b/mageia/components.txt new file mode 120000 index 000000000..ed946a049 --- /dev/null +++ b/mageia/components.txt @@ -0,0 +1 @@ +../redhat/components-3.5.13.txt
\ No newline at end of file diff --git a/mageia/dependencies/qt3/0017-qiconview-ctrl_rubber.patch b/mageia/dependencies/qt3/0017-qiconview-ctrl_rubber.patch new file mode 100644 index 000000000..8679a54bf --- /dev/null +++ b/mageia/dependencies/qt3/0017-qiconview-ctrl_rubber.patch @@ -0,0 +1,64 @@ +--- src/iconview/qiconview.cpp 2009-06-10 17:50:47.000000000 +0200 ++++ src/iconview/qiconview.cpp.new 2009-06-10 17:56:38.000000000 +0200 +@@ -261,6 +261,7 @@ + uint dragging :1; + uint drawActiveSelection :1; + uint inMenuMode :1; ++ uint controlPressed :1; + + QIconViewToolTip *toolTip; + QPixmapCache maskCache; +@@ -2758,6 +2759,7 @@ + d->lastItem = 0; + d->count = 0; + d->mousePressed = FALSE; ++ d->controlPressed = FALSE; + d->selectionMode = Single; + d->currentItem = 0; + d->highlightedItem = 0; +@@ -3325,7 +3327,18 @@ + for ( ; item; item = c->items.next() ) { + if ( d->selectedItems.find( item ) ) + continue; +- if ( !item->intersects( nr ) ) { ++ if ( d->selectedItems.find( item ) ) { ++ if ( item->intersects( nr ) && item->isSelected() && d->controlPressed ) { ++ item->setSelected( FALSE ); ++ changed = TRUE; ++ rr = rr.unite( item->rect() ); ++ } else if ( !item->intersects( nr ) && !item->isSelected() && d->controlPressed ) { ++ item->setSelected( TRUE, TRUE ); ++ changed = TRUE; ++ rr = rr.unite( item->rect() ); ++ } else ++ continue; ++ } else if ( !item->intersects( nr ) ) { + if ( item->isSelected() ) { + item->setSelected( FALSE ); + changed = TRUE; +@@ -4551,7 +4564,7 @@ + } + } + } else if ( ( d->selectionMode != Single || e->button() == RightButton ) +- && !( e->state() & ControlButton ) ) ++ && !( e->state() & ControlButton ) && !( e->state() & ShiftButton ) ) + selectAll( FALSE ); + + setCurrentItem( item ); +@@ -4567,7 +4580,7 @@ + d->rubber = 0; + d->rubber = new QRect( e->x(), e->y(), 0, 0 ); + d->selectedItems.clear(); +- if ( ( e->state() & ControlButton ) == ControlButton ) { ++ if ( ( e->state() & ControlButton ) == ControlButton || ( e->state() & ShiftButton ) == ShiftButton ) { + for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() ) + if ( i->isSelected() ) + d->selectedItems.insert( i, i ); +@@ -4575,6 +4588,7 @@ + } + + d->mousePressed = TRUE; ++ d->controlPressed = ( ( e->state() & ControlButton ) == ControlButton ); + } + + emit_signals: diff --git a/mageia/dependencies/qt3/0035-qvaluelist-streaming-operator.patch b/mageia/dependencies/qt3/0035-qvaluelist-streaming-operator.patch new file mode 100644 index 000000000..f4c225a85 --- /dev/null +++ b/mageia/dependencies/qt3/0035-qvaluelist-streaming-operator.patch @@ -0,0 +1,27 @@ +qt-bugs@ issue: 40192 +applied: no +author: Frerich Raabe <raabe@kde.org> + +This patch should fix QValueList's streaming operator>> for cases where +the stream operates on a byte array smaller than a Q_UINT32 (for instance, +QByteArray objects which are 0-3 bytes in size). It used to read one bogus +item because the loop would get executed once even if reading the 'c' +variable failed. + +--- src/tools/qvaluelist.h.orig 2004-01-27 21:10:52.000000000 +0000 ++++ src/tools/qvaluelist.h 2004-01-27 21:11:35.000000000 +0000 +@@ -636,13 +636,11 @@ + l.clear(); + Q_UINT32 c; + s >> c; +- for( Q_UINT32 i = 0; i < c; ++i ) ++ for( Q_UINT32 i = 0; i < c && !s.atEnd(); ++i ) + { + T t; + s >> t; + l.append( t ); +- if ( s.atEnd() ) +- break; + } + return s; + } diff --git a/mageia/dependencies/qt3/0078-argb-visual-hack.patch b/mageia/dependencies/qt3/0078-argb-visual-hack.patch new file mode 100644 index 000000000..f7b2cbc79 --- /dev/null +++ b/mageia/dependencies/qt3/0078-argb-visual-hack.patch @@ -0,0 +1,71 @@ +qt-bugs@ issue : none +bugs.kde.org number : 83974 +applied: no +author: Lubos Lunak <l.lunak@kde.org> + +An ugly hack to get real transparency in Konsole working somehow, with Qt not having +any support for the ARGB visual. QApplication has one ctor that allows passing +any X connection and X visual, but that has some side effects, so this patch +adds a magic flag to turn the side effects off. + + +--- src/kernel/qapplication.cpp.sav 2007-02-23 14:01:19.000000000 +0100 ++++ src/kernel/qapplication.cpp 2007-05-29 15:42:39.000000000 +0200 +@@ -317,6 +317,7 @@ void qt_init( int *, char **, QApplicati + void qt_cleanup(); + #if defined(Q_WS_X11) + void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE ); ++void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE ); + #endif + Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop ); + +@@ -905,7 +906,7 @@ QApplication::QApplication(Display *dpy, + + qt_init( &argc, argv, GuiClient ); + } else { +- qt_init(dpy, visual, colormap); ++ qt_init( &argc, argv, dpy, visual, colormap); + } + + process_cmdline( &argc, argv ); +--- src/kernel/qapplication_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200 ++++ src/kernel/qapplication_x11.cpp 2007-05-29 16:24:58.000000000 +0200 +@@ -196,6 +196,7 @@ static bool noxim = FALSE; // connect t + static Display *appDpy = 0; // X11 application display + static char *appDpyName = 0; // X11 display name + static bool appForeignDpy = FALSE; // we didn't create display ++Q_EXPORT bool qt_no_foreign_hack = false; + static bool appSync = FALSE; // X11 synchronization + #if defined(QT_DEBUG) + static bool appNoGrab = FALSE; // X11 grabbing enabled +@@ -1541,7 +1542,7 @@ void qt_init_internal( int *argcptr, cha + setlocale( LC_ALL, "" ); // use correct char set mapping + setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work + +- if ( display ) { ++ if ( display && !qt_no_foreign_hack ) { + // Qt part of other application + + appForeignDpy = TRUE; +@@ -1698,7 +1699,9 @@ void qt_init_internal( int *argcptr, cha + // Connect to X server + + if( qt_is_gui_used ) { +- if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { ++ if( display != NULL && qt_no_foreign_hack ) ++ appDpy = display; ++ else if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { + qWarning( "%s: cannot connect to X server %s", appName, + XDisplayName(appDpyName) ); + qApp = 0; +@@ -2345,6 +2348,10 @@ void qt_init( Display *display, Qt::HAND + qt_init_internal( 0, 0, display, visual, colormap ); + } + ++void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap ) ++{ ++ qt_init_internal( argcptr, argv, display, visual, colormap ); ++} + + /***************************************************************************** + qt_cleanup() - cleans up when the application is finished diff --git a/mageia/dependencies/qt3/90qtrc-jp b/mageia/dependencies/qt3/90qtrc-jp new file mode 100644 index 000000000..9f568327a --- /dev/null +++ b/mageia/dependencies/qt3/90qtrc-jp @@ -0,0 +1,15 @@ +# fix .qtrc for Japanese +if [ "$LANG" = ja_JP ]; then + [ ! -d $HOME/.qt ] && mkdir $HOME/.qt + + if [ ! -r $HOME/.qt/qtrc ] || ! grep -q '[General]' $HOME/.qt/qtrc; then + cat >> $HOME/.qt/qtrc <<EOF +[General] +XIMInputStyle=Over The Spot +EOF + elif ! grep -q XIMInputStyle $HOME/.qt/qtrc; then + rm -f $HOME/.qt/qtrc.$$ + sed "s/\[General\]/[General]\nXIMInputStyle=Over The Spot/" < $HOME/.qt/qtrc > $HOME/.qt/qtrc.$$ + mv -f $HOME/.qt/qtrc.$$ $HOME/.qt/qtrc + fi +fi diff --git a/mageia/dependencies/qt3/fix-im-crash-on-exit.diff b/mageia/dependencies/qt3/fix-im-crash-on-exit.diff new file mode 100644 index 000000000..1a37cddb3 --- /dev/null +++ b/mageia/dependencies/qt3/fix-im-crash-on-exit.diff @@ -0,0 +1,15 @@ +--- src/kernel/qwidget_x11.cpp 2006-02-17 15:45:54.000000000 -0500 ++++ src/kernel/qwidget_x11.cpp.orig 2006-02-17 16:27:07.000000000 -0500 +@@ -2753,10 +2753,8 @@ + */ + void QWidget::createInputContext() + { +-#if !defined(QT_NO_IM_EXTENSIONS) +- if( !isInputMethodEnabled() ) +- return; +-#endif ++ if( !isInputMethodEnabled() || QApplication::closingDown() ) ++ return; + + QWidget *icWidget = icHolderWidget(); + #ifndef QT_NO_IM diff --git a/mageia/dependencies/qt3/fix-key-release-event-with-imm.diff b/mageia/dependencies/qt3/fix-key-release-event-with-imm.diff new file mode 100644 index 000000000..f9192f60c --- /dev/null +++ b/mageia/dependencies/qt3/fix-key-release-event-with-imm.diff @@ -0,0 +1,17 @@ +--- ./src/kernel/qapplication_x11.cpp 2006-02-17 15:45:55.000000000 -0500 ++++ ./src/kernel/qapplication_x11.cpp.orig 2006-02-17 16:05:43.000000000 -0500 +@@ -5217,11 +5217,12 @@ + } else { + key = (int)(long)keyDict->find( keycode ); + if ( key ) +- if( !willRepeat ) // Take out key of dictionary only if this call. ++ if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call. + keyDict->take( keycode ); + long s = (long)textDict->find( keycode ); + if ( s ) { +- textDict->take( keycode ); ++ if( statefulTranslation ) ++ textDict->take( keycode ); + ascii = (char)(s-256); + } + } diff --git a/mageia/dependencies/qt3/fix-x11-immodule.diff b/mageia/dependencies/qt3/fix-x11-immodule.diff new file mode 100644 index 000000000..e6e3ef609 --- /dev/null +++ b/mageia/dependencies/qt3/fix-x11-immodule.diff @@ -0,0 +1,18 @@ +--- src/kernel/qinputcontext.cpp ++++ src/kernel/qinputcontext.cpp 2004/09/03 15:27:45 +@@ -769,6 +769,7 @@ + */ + QCString QInputContext::identifierName() + { ++ return ""; + } + + +@@ -790,6 +791,7 @@ + */ + QCString QInputContext::language() + { ++ return ""; + } + + diff --git a/mageia/dependencies/qt3/qt-3.1.1-fix-xft2-compile.patch b/mageia/dependencies/qt3/qt-3.1.1-fix-xft2-compile.patch new file mode 100644 index 000000000..001b73efc --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.1.1-fix-xft2-compile.patch @@ -0,0 +1,13 @@ +--- qt-x11-free-3.1.1/config.tests/x11/xfreetype.test-- 2002-12-17 17:26:19.000000000 +0100 ++++ qt-x11-free-3.1.1/config.tests/x11/xfreetype.test 2002-12-17 17:36:31.000000000 +0100 +@@ -6,8 +6,8 @@ VERBOSE=$2 + SRCDIR=$3 + OUTDIR=$4 + shift 4 +-IN_LIBDIRS="" +-IN_INCDIRS="" ++IN_LIBDIRS="/usr/lib/" ++IN_INCDIRS="/usr/include/fontconfig /usr/include/Xft2 /usr/include/Xft2/X11/Xft" + PARAMS=$@ + for PARAM in $PARAMS; do + PREFIX=`echo $PARAM | sed 's/^\(..\).*/\1/'` diff --git a/mageia/dependencies/qt3/qt-3.2.3-fix-cupslib.patch b/mageia/dependencies/qt3/qt-3.2.3-fix-cupslib.patch new file mode 100644 index 000000000..5c3d5bdd3 --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.2.3-fix-cupslib.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.2.3/src/dialogs/qprintdialog.cpp-- 2004-04-28 14:29:11.943776549 +0200 ++++ qt-x11-free-3.2.3/src/dialogs/qprintdialog.cpp 2004-04-28 14:30:22.202024626 +0200 +@@ -779,7 +779,7 @@ static char * parseCupsOutput( QListView + cups_dest_t * d; + QLibrary lib( "cups" ); + typedef int (*CupsGetDests)(cups_dest_t **dests); +- CupsGetDests _cupsGetDests = (CupsGetDests)lib.resolve( "cupsGetDests" ); ++ CupsGetDests _cupsGetDests = (CupsGetDests)QLibrary::resolve( "libcups.so.2", "cupsGetDests" ); + if ( _cupsGetDests ) { + nd = _cupsGetDests( &d ); + if ( nd < 1 ) diff --git a/mageia/dependencies/qt3/qt-3.3.2-fix-configure.patch b/mageia/dependencies/qt3/qt-3.3.2-fix-configure.patch new file mode 100644 index 000000000..d567126c9 --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.3.2-fix-configure.patch @@ -0,0 +1,11 @@ +--- qt-x11-free-3.3.2/configure-- 2004-06-03 09:44:18.137414194 +0200 ++++ qt-x11-free-3.3.2/configure 2004-06-03 09:44:54.007847860 +0200 +@@ -3189,7 +3189,7 @@ if [ -n "$QCONFIG_FLAGS" ]; then + + cat >>$outpath/include/qconfig.h.new << EOF + #ifndef $cfg +-# define $cfg ++#define $cfg + #endif + + EOF diff --git a/mageia/dependencies/qt3/qt-3.3.3-fix-accessible.patch b/mageia/dependencies/qt3/qt-3.3.3-fix-accessible.patch new file mode 100644 index 000000000..74af77bad --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.3.3-fix-accessible.patch @@ -0,0 +1,10 @@ +--- qt-x11-free-3.3.3/plugins/src/accessible/widgets/widgets.pro-- 2004-08-26 12:04:30.408520889 +0200 ++++ qt-x11-free-3.3.3/plugins/src/accessible/widgets/widgets.pro 2004-08-26 12:04:47.606921352 +0200 +@@ -13,3 +13,7 @@ SOURCES += main.cpp \ + + HEADERS += qaccessiblewidget.h \ + qaccessiblemenu.h ++ ++target.path += $$plugins.path/accessible ++INSTALLS += target ++ diff --git a/mageia/dependencies/qt3/qt-3.3.5-lib64-plugins.patch b/mageia/dependencies/qt3/qt-3.3.5-lib64-plugins.patch new file mode 100644 index 000000000..384673269 --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.3.5-lib64-plugins.patch @@ -0,0 +1,12 @@ +--- src/tools/qgpluginmanager.cpp ++++ src/tools/qgpluginmanager.cpp 2004/09/25 11:46:41 +@@ -377,6 +377,9 @@ + QString basename = (*git).left( (*git).find( QChar(0xfffd) ) ); + ++git; + ++ // WARNING: this line should only exist on lib64 systems ! ++ basename += ".lib64"; ++ + QStringList sameBasename; + while( git != group.end() && + basename == (*git).left( (*git).find( QChar(0xfffd) ) ) ) { diff --git a/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error.patch b/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error.patch new file mode 100644 index 000000000..e26fb89f2 --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error.patch @@ -0,0 +1,24 @@ +--- qt-x11-free-3.3.6/src/tools/qfile_unix.cpp-- 2006-07-31 09:03:52.000000000 +0200 ++++ qt-x11-free-3.3.6/src/tools/qfile_unix.cpp 2006-07-31 09:06:52.000000000 +0200 +@@ -164,8 +164,9 @@ + bool QFile::open( int m ) + { + if ( isOpen() ) { // file already open +-#if defined(QT_CHECK_STATE) +- qWarning( "QFile::open: File already open" ); ++#if defined(QT_CHECK_STATE) ++ QString error = QString("QFile::open: File (%1) already open").arg(fn); ++ qWarning( error ); + #endif + return FALSE; + } +@@ -179,7 +180,8 @@ + setMode( m ); + if ( !(isReadable() || isWritable()) ) { + #if defined(QT_CHECK_RANGE) +- qWarning( "QFile::open: File access not specified" ); ++ QString error = QString("QFile::open: File access (%1) not specified").arg(fn); ++ qWarning( error ); + #endif + return FALSE; + } diff --git a/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error2.patch b/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error2.patch new file mode 100644 index 000000000..4e0ffbe5a --- /dev/null +++ b/mageia/dependencies/qt3/qt-3.3.6-fix-qfile-message-error2.patch @@ -0,0 +1,67 @@ +--- qt-x11-free-3.3.6/src/tools/qfile_unix.cpp-- 2006-08-10 09:55:59.000000000 +0200 ++++ qt-x11-free-3.3.6/src/tools/qfile_unix.cpp 2006-08-10 10:06:42.000000000 +0200 +@@ -339,7 +339,8 @@ + { + if ( isOpen() ) { + #if defined(QT_CHECK_RANGE) +- qWarning( "QFile::open: File already open" ); ++ QString error = QString("QFile::open: File (%1) already open").arg(fn); ++ qWarning( error ); + #endif + return FALSE; + } +@@ -411,7 +412,8 @@ + { + if ( isOpen() ) { + #if defined(QT_CHECK_RANGE) +- qWarning( "QFile::open: File already open" ); ++ QString error = QString("QFile::open: File (%1) already open").arg(fn); ++ qWarning( error ); + #endif + return FALSE; + } +@@ -507,7 +509,8 @@ + { + if ( !isOpen() ) { + #if defined(QT_CHECK_STATE) +- qWarning( "QFile::at: File is not open" ); ++ QString error = QString("QFile::at: File (%1) is not open").arg(fn); ++ qWarning( error ); + #endif + return FALSE; + } +@@ -563,11 +566,14 @@ + #endif + #if defined(QT_CHECK_STATE) + if ( !isOpen() ) { +- qWarning( "QFile::readBlock: File not open" ); ++ QString error = QString("QFile::readBlock: File (%1) not open").arg(fn); ++ qWarning( error ); ++ + return -1; + } + if ( !isReadable() ) { +- qWarning( "QFile::readBlock: Read operation not permitted" ); ++ QString error = QString("QFile::readBlock: Read operation not permitted in file %1 ").arg(fn); ++ qWarning( error ); + return -1; + } + #endif +@@ -632,11 +638,15 @@ + #endif + #if defined(QT_CHECK_STATE) + if ( !isOpen() ) { // file not open +- qWarning( "QFile::writeBlock: File not open" ); ++ QString error = QString("QFile::writeBlock: File (%1) not open").arg(fn); ++ qWarning( error ); ++ + return -1; + } + if ( !isWritable() ) { // writing not permitted +- qWarning( "QFile::writeBlock: Write operation not permitted" ); ++ QString error = QString("QFile::writeBlock: Write operation not permitted in file %1 ").arg(fn); ++ qWarning( error ); ++ + return -1; + } + #endif diff --git a/mageia/dependencies/qt3/qt-visibility.patch b/mageia/dependencies/qt3/qt-visibility.patch new file mode 100644 index 000000000..3fb52f54f --- /dev/null +++ b/mageia/dependencies/qt3/qt-visibility.patch @@ -0,0 +1,65 @@ +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 diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.4-linux32.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.4-linux32.patch new file mode 100644 index 000000000..3a294408f --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.4-linux32.patch @@ -0,0 +1,50 @@ +--- qt-x11-free-3.3.4/qmake/project.cpp.linux32 2005-01-21 12:16:26.000000000 -0500 ++++ qt-x11-free-3.3.4/qmake/project.cpp 2005-04-11 08:18:48.734289865 -0400 +@@ -47,6 +47,13 @@ + #include <stdio.h> + #include <stdlib.h> + ++#if defined(__linux__) && defined(__x86_64__) ++#include <sys/syscall.h> ++#include <sys/personality.h> ++ ++#define is_linux32() ((syscall(SYS_personality, 0xffffffff) & PER_MASK) == PER_LINUX32) ++#endif ++ + #ifdef Q_OS_WIN32 + #define QT_POPEN _popen + #else +@@ -63,6 +70,15 @@ static void qmake_error_msg(const char * + fprintf(stderr, "%s:%d: %s\n", parser.file.latin1(), parser.line_no, msg); + } + ++static QString qmake_mkspecs_default() ++{ ++#ifdef is_linux32 ++ if (!is_linux32()) ++ return "default64"; ++#endif ++ return "default"; ++} ++ + QStringList qmake_mkspec_paths() + { + QStringList ret; +@@ -552,7 +568,7 @@ QMakeProject::read(uchar cmd) + QStringList mkspec_roots = qmake_mkspec_paths(); + if(Option::mkfile::qmakespec.isEmpty()) { + for(QStringList::Iterator it = mkspec_roots.begin(); it != mkspec_roots.end(); ++it) { +- QString mkspec = (*it) + QDir::separator() + "default"; ++ QString mkspec = (*it) + QDir::separator() + qmake_mkspecs_default(); + QFileInfo default_info(mkspec); + if(default_info.exists() && default_info.isSymLink()) { + Option::mkfile::qmakespec = mkspec; +@@ -717,7 +733,7 @@ QMakeProject::isActiveConfig(const QStri + if((regex && re.exactMatch(spec)) || (!regex && spec == x)) + return TRUE; + #ifdef Q_OS_UNIX +- else if(spec == "default") { ++ else if(spec == qmake_mkspecs_default()) { + static char *buffer = NULL; + if(!buffer) + buffer = (char *)malloc(1024); diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.5-makelibshared.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.5-makelibshared.patch new file mode 100644 index 000000000..fd4adf7f0 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.5-makelibshared.patch @@ -0,0 +1,48 @@ +--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig 2005-10-21 10:09:12.000000000 -0200 ++++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro 2005-10-21 10:09:34.000000000 -0200 +@@ -3,8 +3,7 @@ + VERSION = 1.0 + + CONFIG += qt warn_on release +-CONFIG += staticlib +-CONFIG -= dll ++CONFIG += dll + + SOURCES = qassistantclient.cpp + HEADERS += $$QT_SOURCE_TREE/include/qassistantclient.h +*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro 2003-12-20 22:48:51.000000000 -0200 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new 2005-12-06 18:47:04.000000000 -0200 +*************** +*** 1,6 **** + TEMPLATE = lib +! CONFIG += qt warn_on staticlib +! CONFIG -= dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +--- 1,6 ---- + TEMPLATE = lib +! CONFIG += qt warn_on +! CONFIG += dll + HEADERS = editor.h \ + parenmatcher.h \ + completion.h \ +*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro 2004-04-29 19:31:32.000000000 -0300 +--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new 2005-12-06 18:46:29.000000000 -0200 +*************** +*** 1,7 **** + TEMPLATE = lib + +! CONFIG += qt warn_on staticlib qmake_cache +! CONFIG -= dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll +--- 1,7 ---- + TEMPLATE = lib + +! CONFIG += qt warn_on qmake_cache +! CONFIG += dll + !force_static:!win32:contains(QT_PRODUCT,qt-internal) { + CONFIG -= staticlib + CONFIG += dll diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.5-no-rpath.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.5-no-rpath.patch new file mode 100644 index 000000000..440862776 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.5-no-rpath.patch @@ -0,0 +1,21 @@ +--- mkspecs/linux-g++-64/qmake.conf ++++ mkspecs/linux-g++-64/qmake.conf +@@ -59,7 +59,7 @@ + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +--- mkspecs/linux-g++/qmake.conf ++++ mkspecs/linux-g++/qmake.conf +@@ -56,7 +56,6 @@ + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.5-qtranslator-crash.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.5-qtranslator-crash.patch new file mode 100644 index 000000000..a6b896664 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.5-qtranslator-crash.patch @@ -0,0 +1,11 @@ +--- src/kernel/qtranslator.cpp.sav 2004-08-12 14:32:07.000000000 +0200 ++++ src/kernel/qtranslator.cpp 2005-03-15 18:05:29.620141650 +0100 +@@ -990,7 +990,7 @@ QTranslatorMessage QTranslator::findMess + char con[256]; + for ( ;; ) { + t >> len; +- if ( len == 0 ) ++ if ( len == 0 || t.atEnd()) + return QTranslatorMessage(); + t.readRawBytes( con, len ); + con[len] = '\0'; diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.6-lib64.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.6-lib64.patch new file mode 100644 index 000000000..a0dc20e9e --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.6-lib64.patch @@ -0,0 +1,56 @@ +--- qt-x11-free-3.3.6/config.tests/unix/checkavail.lib64 2003-05-27 11:19:12.000000000 -0400 ++++ qt-x11-free-3.3.6/config.tests/unix/checkavail 2006-09-01 10:50:28.000000000 -0400 +@@ -9,11 +9,41 @@ SUCCESS= + MODULE_NAME=$1 + VERBOSE=$2 + shift 2 +-LIBDIRS="/lib /usr/lib" + LIBNAMES="" + INCLUDEDIRS="/usr/include" + INCLUDES="" + ++# Detect libdir name for Linux systems (*/lib or */lib64) ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` ++case "$UNAME_SYSTEM" in ++Linux) ++ tmpc="conftest.c" ++ tmpo="conftest.o" ++ echo 'int i;' > $tmpc ++ is_64bit_output=no ++ if gcc -c $tmpc -o $tmpo; then ++ case `/usr/bin/file $tmpo` in ++ *"ELF 64"*) ++ is_64bit_output=yes ++ ;; ++ esac ++ fi ++ rm -rf $tmpc $tmpo ++ ;; ++esac ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` ++case $UNAME_MACHINE:$is_64bit_output in ++ ppc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++ LIB="lib64" ++ ;; ++*:*) ++ LIB="lib" ++ ;; ++esac ++ ++LIBDIRS="/$LIB /usr/$LIB" ++ + PARAMS=$@ + for PARAM in $PARAMS + do +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.lib64 2006-09-01 10:28:16.000000000 -0400 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-09-01 10:37:41.000000000 -0400 +@@ -46,7 +46,7 @@ QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = /usr/X11R6/include + QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 + QMAKE_INCDIR_QT = $(QTDIR)/include +-QMAKE_LIBDIR_QT = $(QTDIR)/lib ++QMAKE_LIBDIR_QT = $(QTDIR)/lib64 + QMAKE_INCDIR_OPENGL = /usr/X11R6/include + QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 + diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.8-qmo35263.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.8-qmo35263.patch new file mode 100644 index 000000000..1d63754c2 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.8-qmo35263.patch @@ -0,0 +1,41 @@ +--- src/kernel/qfontdatabase_x11.cpp 2006-12-28 21:40:34.000000000 +0200 ++++ src/kernel/qfontdatabase_x11.cpp 2006-12-28 21:43:44.000000000 +0200 +@@ -1504,13 +1504,24 @@ + convert the pixel size to a point size and request that. + */ + double size_value = request.pixelSize; ++ double dpi = QPaintDevice::x11AppDpiY(fp->screen); + double scale = 1.; + if ( size_value > MAXFONTSIZE_XFT ) { + scale = (double)size_value/(double)MAXFONTSIZE_XFT; + size_value = MAXFONTSIZE_XFT; + } +- +- size_value = size_value*72./QPaintDevice::x11AppDpiY(fp->screen); ++#ifdef QT_XFT2 ++ /* ++ 2006-12-28 If QT is not compiled against xft1, there is no need ++ for the workaround above (confirmed). Thus, in addition, add ++ font pixelsize to the pattern to avoid fontconfig making wrong ++ guesses. Also provide a DPI value for fontconfig so it never ++ attempts to fallback to its default. ++ */ ++ XftPatternAddDouble(pattern, XFT_PIXEL_SIZE, size_value); ++ XftPatternAddDouble(pattern, XFT_DPI, dpi); ++#endif ++ size_value = size_value*72./dpi; + XftPatternAddDouble( pattern, XFT_SIZE, size_value ); + + #ifdef XFT_MATRIX +@@ -1875,6 +1886,11 @@ + FcResult result; + FcFontSet *fs = 0; + FcPattern *fsp = 0; ++ ++ // Properly conform to fontconfig API. We need to call FcDefaultSubstitute() ++ // before FcFontSort()/FcFontMatch(). ++ FcDefaultSubstitute(pattern); ++ + if( use_fontsort ) { + fs = FcFontSort(0, pattern, FcFalse, 0, &result); + if (!fs) diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.8b-cstddef.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-cstddef.patch new file mode 100644 index 000000000..bcbffcea6 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-cstddef.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch new file mode 100644 index 000000000..621b7c996 --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-force-png12.patch @@ -0,0 +1,35 @@ +--- configure.libpng 2011-09-15 07:20:32.000000000 +0200 ++++ configure 2011-09-15 07:21:36.000000000 +0200 +@@ -2971,8 +2971,8 @@ + if [ "$CFG_LIBPNG" = "system" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG system-png" + if [ "$CFG_PNG" = "yes" ]; then +- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng\"" +- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng\"" ++ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng12\"" ++ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng12\"" + fi + fi + if [ "$CFG_PNG" = "no" ]; then +--- plugins/src/imageformats/png/png.pro.libpng 2011-09-15 07:20:46.000000000 +0200 ++++ plugins/src/imageformats/png/png.pro 2011-09-15 07:21:56.000000000 +0200 +@@ -10,7 +10,7 @@ + SOURCES += main.cpp + + system-png { +- unix:LIBS += -lpng ++ unix:LIBS += -lpng12 + win32:LIBS += libpng.lib + } + !system-png { +--- src/kernel/qt_gfx.pri.libpng 2011-09-15 07:21:19.000000000 +0200 ++++ src/kernel/qt_gfx.pri 2011-09-15 07:22:13.000000000 +0200 +@@ -102,7 +102,7 @@ + SOURCES+=$$KERNEL_CPP/qpngio.cpp + png { + system-png { +- unix:LIBS += -lpng ++ unix:LIBS += -lpng12 + win32:LIBS += libpng.lib + } else { + INCLUDEPATH += 3rdparty/libpng diff --git a/mageia/dependencies/qt3/qt-x11-free-3.3.8b-unixodb-64.patch b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-unixodb-64.patch new file mode 100644 index 000000000..6ee381d6a --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-free-3.3.8b-unixodb-64.patch @@ -0,0 +1,111 @@ +--- src/sql/drivers/odbc/qsql_odbc.cpp 2008-01-15 17:09:13.000000000 -0200 ++++ src/sql/drivers/odbc/qsql_odbc.cpp.new 2009-02-09 16:02:25.000000000 -0200 +@@ -263,8 +263,7 @@ + { + QString fieldVal; + SQLRETURN r = SQL_ERROR; +- QSQLLEN lengthIndicator = 0; +- ++ SQLLEN lengthIndicator = 0; + if ( colSize <= 0 ) { + colSize = 256; + } else if ( colSize > 65536 ) { // limit buffer size to 64 KB +@@ -319,14 +318,14 @@ + return fieldVal; + } + +-static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, QSQLLEN& lengthIndicator, bool& isNull ) ++static QByteArray qGetBinaryData( SQLHANDLE hStmt, int column, SQLLEN& lengthIndicator, bool& isNull ) + { + QByteArray fieldVal; + SQLSMALLINT colNameLen; + SQLSMALLINT colType; +- QSQLULEN colSize; +- SQLSMALLINT colScale; ++ SQLULEN colSize; + SQLSMALLINT nullable; ++ SQLSMALLINT colScale; + SQLRETURN r = SQL_ERROR; + + SQLTCHAR colName[COLNAMESIZE]; +@@ -356,7 +355,7 @@ + column+1, + SQL_C_BINARY, + (SQLPOINTER) buf, +- (QSQLLEN)colSize, ++ (SQLLEN)colSize, + &lengthIndicator ); + if ( r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO ) { + if ( lengthIndicator == SQL_NULL_DATA ) { +@@ -393,7 +392,7 @@ + { + QSQLLEN intbuf = 0; + isNull = FALSE; +- QSQLLEN lengthIndicator = 0; ++ SQLLEN lengthIndicator = 0; + SQLRETURN r = SQLGetData( hStmt, + column+1, + SQL_C_SLONG, +@@ -410,7 +409,7 @@ + static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull ) + { + SQLDOUBLE dblbuf; +- QSQLLEN lengthIndicator = 0; ++ SQLLEN lengthIndicator = 0; + isNull = FALSE; + SQLRETURN r = SQLGetData( hStmt, + column+1, +@@ -430,7 +429,7 @@ + { + SQLBIGINT lngbuf = Q_INT64_C( 0 ); + isNull = FALSE; +- QSQLLEN lengthIndicator = 0; ++ SQLLEN lengthIndicator = 0; + SQLRETURN r = SQLGetData( hStmt, + column+1, + SQL_C_SBIGINT, +@@ -468,7 +467,7 @@ + { + SQLSMALLINT colNameLen; + SQLSMALLINT colType; +- QSQLULEN colSize; ++ SQLULEN colSize; + SQLSMALLINT colScale; + SQLSMALLINT nullable; + SQLRETURN r = SQL_ERROR; +@@ -866,7 +865,7 @@ + if ( fieldCache.contains( field ) ) + return fieldCache[ field ]; + SQLRETURN r(0); +- QSQLLEN lengthIndicator = 0; ++ SQLLEN lengthIndicator = 0; + bool isNull = FALSE; + int current = fieldCache.count(); + for ( ; current < (field + 1); ++current ) { +@@ -930,7 +929,7 @@ + break; + case QVariant::ByteArray: { + isNull = FALSE; +- QByteArray val = qGetBinaryData( d->hStmt, current, lengthIndicator, isNull ); ++ QByteArray val = qGetBinaryData( d->hStmt, current, (SQLLEN&)lengthIndicator, isNull ); + fieldCache[ current ] = QVariant( val ); + nullCache[ current ] = isNull; + break; } +@@ -979,7 +978,7 @@ + + int QODBCResult::numRowsAffected() + { +- QSQLLEN affectedRowCount(0); ++ SQLLEN affectedRowCount(0); + SQLRETURN r = SQLRowCount( d->hStmt, &affectedRowCount ); + if ( r == SQL_SUCCESS ) + return affectedRowCount; +@@ -1084,7 +1083,7 @@ + QVariant val; + for ( it = extension()->index.begin(); it != extension()->index.end(); ++it ) { + val = extension()->values[ it.data() ].value; +- QSQLLEN *ind = new QSQLLEN( SQL_NTS ); ++ SQLLEN *ind = new SQLLEN( SQL_NTS ); + tmpStorage.append( qAutoDeleter(ind) ); + if ( val.isNull() ) { + *ind = SQL_NULL_DATA; diff --git a/mageia/dependencies/qt3/qt-x11-immodule-nodebug.diff b/mageia/dependencies/qt3/qt-x11-immodule-nodebug.diff new file mode 100644 index 000000000..68337cfae --- /dev/null +++ b/mageia/dependencies/qt3/qt-x11-immodule-nodebug.diff @@ -0,0 +1,85 @@ +--- plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp.orig 2006-02-17 16:15:21.000000000 -0500 ++++ plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp 2006-02-17 16:17:55.000000000 -0500 +@@ -306,8 +306,8 @@ + + currentIMKey = key; + +- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", +- imIndex, (const char *)_slave->identifierName() ); ++ //qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s", ++ // imIndex, (const char *)_slave->identifierName() ); + } + } + +--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp.orig 2006-02-17 16:15:33.000000000 -0500 ++++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp 2006-02-17 16:18:49.000000000 -0500 +@@ -140,7 +140,7 @@ + // only one character. See description of + // QInputContext::filterEvent() about key compression. + val = text[0].unicode(); +- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); ++ //qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); + } + + // Store value +@@ -164,14 +164,14 @@ + + void QSimpleInputContext::setFocus() + { +- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ //qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p", ++ // this, focusWidget() ); + } + + void QSimpleInputContext::unsetFocus() + { +- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", +- this, focusWidget() ); ++ //qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", ++ // this, focusWidget() ); + reset(); + } + +@@ -188,8 +188,8 @@ + case QEvent::MouseButtonRelease: + case QEvent::MouseButtonDblClick: + case QEvent::MouseMove: +- qDebug( "QSimpleInputContext::mouseHandler: " +- "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); ++ //qDebug( "QSimpleInputContext::mouseHandler: " ++ // "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); + break; + default: + break; +@@ -240,7 +240,7 @@ + + // no entries were found + if ( p == composeTable->data + composeTable->size ) { +- qDebug( "no match" ); ++ //qDebug( "no match" ); + clearComposeBuffer(); + return FALSE; + } +@@ -250,18 +250,18 @@ + + // check if partial match + if ( composeBuffer[i] == 0 && p->keys[i] ) { +- qDebug("partial match"); ++ //qDebug("partial match"); + return TRUE; + } + + if ( composeBuffer[i] != p->keys[i] ) { +- qDebug("different entry"); ++ //qDebug("different entry"); + clearComposeBuffer(); + return i!=0; + } + } + +- qDebug("match exactly"); ++ //qDebug("match exactly"); + + // match exactly + commitChar( p->value ); diff --git a/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch b/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch new file mode 100644 index 000000000..b360a40e4 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-3.3.6-fix-xorg7.0.patch @@ -0,0 +1,57 @@ +--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.xorg7.1 2006-03-08 11:48:20.000000000 -0500 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-09-01 13:14:19.000000000 -0400 +@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usr/include ++QMAKE_LIBDIR_X11 = /usr/lib + QMAKE_INCDIR_QT = $(QTDIR)/include + QMAKE_LIBDIR_QT = $(QTDIR)/lib +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/include ++QMAKE_LIBDIR_OPENGL = /usr/lib + + QMAKE_LINK = g++ + QMAKE_LINK_SHLIB = g++ +--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-09-01 12:50:46.000000000 -0400 +@@ -43,12 +43,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 ++QMAKE_INCDIR_X11 = /usr/include ++QMAKE_LIBDIR_X11 = /usr/lib64 + QMAKE_INCDIR_QT = $(QTDIR)/include + QMAKE_LIBDIR_QT = $(QTDIR)/lib64 +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 ++QMAKE_INCDIR_OPENGL = /usr/include ++QMAKE_LIBDIR_OPENGL = /usr/lib64 + + QMAKE_LINK = g++ + QMAKE_LINK_SHLIB = g++ +--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.xorg7.1 2006-09-01 12:50:46.000000000 -0400 ++++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-09-01 13:13:00.000000000 -0400 +@@ -40,12 +40,12 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = /usr/include ++QMAKE_LIBDIR_X11 = /usr/lib + QMAKE_INCDIR_QT = $(QTDIR)/include + QMAKE_LIBDIR_QT = $(QTDIR)/lib +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_OPENGL = /usr/include ++QMAKE_LIBDIR_OPENGL = /usr/lib + + QMAKE_LINK = g++ + QMAKE_LINK_SHLIB = g++ diff --git a/mageia/dependencies/qt3/qt3-README-Mageia b/mageia/dependencies/qt3/qt3-README-Mageia new file mode 100644 index 000000000..08014e381 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-README-Mageia @@ -0,0 +1,21 @@ +You should not need to set QTDIR because it should already been automatically +configured (in '/etc/profile.d/qt.sh' and '/etc/profile.d/qt.csh'). + +To check if it is the case, do 'echo $QTDIR'. Answer should be '/usr/lib/qt3'. + +If it is not the case, do 'export QTDIR=/usr/lib/qt3' if you use bash or +'setenv QTDIR /usr/lib/qt3/' if you use csh. + +Qt documentation is in /usr/lib/doc/qt3-QtVersion/ (you need to +install package libqt3-devel-PackageVersion if it is not already +done). + +Other Qt things are in /usr/lib/qt3/ (which contains needed symlinks +to create a fake QTDIR). + +Examples and tutorials are compressed to save space. If you want to use them, +you need to uncompress them somewhere in your home directory using: +'tar jxf /usr/lib/doc/qt3--QtVersion your_directory'. + +XFT support (Anti Aliasing) is enable by default. The QT_XFT environmental +variable is setted in '/etc/profile.d/qt.sh' and '/etc/profile.d/qt.csh'. diff --git a/mageia/dependencies/qt3/qt3-assistant-sh b/mageia/dependencies/qt3/qt3-assistant-sh new file mode 100644 index 000000000..59a7642a7 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-assistant-sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Support script to properly set environments for Designer to run + +LIBSUFFIX="lib" + +if [ `uname -m` = "x86_64" ]; then + LIBSUFFIX="lib64" +fi + +export QTDIR=/usr/lib/qt3/ +export LD_LIBRARY_PATH=$QTDIR/$LIBSUFFIX:$LD_LIBRARY_PATH +export PATH=$QTDIR/bin:$PATH + +export MOC=$QTDIR/bin/moc +export UIC=$QTDIR/bin/uic + +exec $QTDIR/bin/assistant "$@" diff --git a/mageia/dependencies/qt3/qt3-assistant.desktop b/mageia/dependencies/qt3/qt3-assistant.desktop new file mode 100644 index 000000000..6275bc80d --- /dev/null +++ b/mageia/dependencies/qt3/qt3-assistant.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +TryExec=assistant +Exec=assistant-qt3 +Name=Qt Assistant 3 +Comment=Tool for online help doc +MapNotify=true +MimeType=application/x-assistant; +Terminal=false +Icon=assistant +Type=Application diff --git a/mageia/dependencies/qt3/qt3-designer-sh b/mageia/dependencies/qt3/qt3-designer-sh new file mode 100644 index 000000000..d66cd4f93 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-designer-sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Support script to properly set environments for Designer to run + +LIBSUFFIX="lib" + +if [ `uname -m` = "x86_64" ]; then + LIBSUFFIX="lib64" +fi + +export QTDIR=/usr/lib/qt3/ +export LD_LIBRARY_PATH=$QTDIR/$LIBSUFFIX:$LD_LIBRARY_PATH +export PATH=$QTDIR/bin:$PATH + +export MOC=$QTDIR/bin/moc +export UIC=$QTDIR/bin/uic + +exec $QTDIR/bin/designer "$@" diff --git a/mageia/dependencies/qt3/qt3-designer.desktop b/mageia/dependencies/qt3/qt3-designer.desktop new file mode 100644 index 000000000..cc6185e05 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-designer.desktop @@ -0,0 +1,77 @@ +[Desktop Entry] +Exec=/usr/bin/designer-qt3 +Name=Qt Designer +Name[bg]=Qt Дизайнер +Name[br]=Ergrafer Qt +Name[ca]=Dissenyador Qt +Name[cs]=Qt designer +Name[de]=Qt-Designer +Name[eo]=Qt-Desegnilo +Name[es]=Diseñador Qt +Name[et]=Qt disainer +Name[eu]=Qt Diseinatzailea +Name[gl]=Deseñador de Qt +Name[he]=Qt בצעמ +Name[it]=Designer Qt +Name[ja]=Qtデザイナー +Name[ko]=Qt 디자이너 +Name[lv]=Qt Dizainers +Name[mk]=Qt дизајнер +Name[no]=Qt-designer +Name[oc]=Dessinador Qt +Name[pl]=Projektant Qt +Name[sk]=Qt Dizajnér +Name[sl]=Snovalnik Qt +Name[ta]=Qt À¨¼ôÀ¡Ç÷ +Name[uk]=Дизайнер Qt +Name[zh_CN]=Qt 设计者 +Name[zh_TW]=Qt 設計器 +Comment=Qt interface designer +Comment[az]=Qt axtar üz dizayn proqramı +Comment[bg]=Qt interface дизайнер +Comment[br]=Ergrafer etrefas Qt +Comment[ca]=Dissenyador d'interfícies Qt +Comment[cs]=Editor UI pro Qt +Comment[da]=Qt grænseflade designer +Comment[de]=Schnittstellen-Designer für Qt +Comment[el]=Σχεδιασμός περιβάλλοντων Qt +Comment[eo]=Qt-Interfacdesegnilo +Comment[es]=Diseñador de interfaces de Qt +Comment[et]=Qt dialoogide redaktor +Comment[eu]=Qt interfaze diseinatzailea +Comment[fi]=Qt:n käyttöliittymäsuunnittelija +Comment[fr]=Conception d'interfaces avec Qt +Comment[gl]=Editor de interfaces de Qt +Comment[he]=Qt-ל םיקשממ בצעמ +Comment[hu]=Qt felülettervező +Comment[is]=Viðmótshönnunartól fyrir Qt +Comment[it]=Editor per le interfaccie Qt +Comment[ja]=Qtインターフェースデザイナー +Comment[ko]=Qt 인터페이스 디자이너 +Comment[lt]=Qt sąsajos redaktorius +Comment[lv]=Qt starsejas dizainers +Comment[mk]=Дизајнер на Qt дијалози +Comment[nl]=Qt interface-ontwerper +Comment[no]=Qt-grensesnittdesigner +Comment[no_NY]=Redigering av Qt-miljø +Comment[oc]=Dessinador d'interfacies Qt +Comment[pl]=Projektant interfejsu Qt +Comment[pt]=Editor de interfaces do Qt +Comment[pt_BR]=Designer de interface Qt +Comment[ro]=Dezvoltator de interfeţe Qt +Comment[ru]=редактор интерфейсов приложений Qt +Comment[sk]=Qt dizajnér rozhrania +Comment[sl]=Snovalnik vmesnikov za Qt +Comment[sr]=Dizajner Qt interfejsa +Comment[sv]=Editor för gränssnitt till Qt +Comment[ta]=Qt À¨¼ôÀ¡Ç÷ +Comment[tr]=Qt arayüz tasarım programı +Comment[uk]=Редактор інтерфейсу для Qt +Comment[zh_CN]=Qt 界面设计程序 +Comment[zh_TW]=Qt 介面編輯器 +MapNotify=true +MimeType=application/x-designer; +Icon=designer +Terminal=false +Type=Application + diff --git a/mageia/dependencies/qt3/qt3-linguist.desktop b/mageia/dependencies/qt3/qt3-linguist.desktop new file mode 100644 index 000000000..62473d1c0 --- /dev/null +++ b/mageia/dependencies/qt3/qt3-linguist.desktop @@ -0,0 +1,26 @@ +[Desktop Entry] +TryExec=linguist +Exec=linguist +Name=Qt Assistant - 3 +Name[de]=Qt-Linguist - 3 +Name[eo]=Qt-Lingvisto - 3 +Name[es]=Lingüista Qt - 3 +Name[ko]=Qt 언어학자 - 3 +Name[lv]=Qt Lingvists - 3 +Comment=Tool for translating message catalogues of Qt based programs +Comment[da]=Redskab til at oversætte Qt baserede programmer +Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt basieren +Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt-bazitaj programoj +Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt +Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ +Comment[hu]=Segédprogram a Qt-alapú programok üzenetfájljainak lefordításához +Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 +Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt bāzētās programmās +Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt +Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt +Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt-baserade program +MapNotify=true +MimeType=application/x-linguist; +Terminal=false +Icon=linguist +Type=Application diff --git a/mageia/dependencies/qt3/qt3-uic-sh b/mageia/dependencies/qt3/qt3-uic-sh new file mode 100644 index 000000000..bd4467a5d --- /dev/null +++ b/mageia/dependencies/qt3/qt3-uic-sh @@ -0,0 +1,7 @@ +#!/bin/sh +# Support script to properly set environments for uic to run + +export QTDIR=/usr/lib/qt3/ +export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH + +exec /usr/lib/qt3/bin/uic.real "$@" diff --git a/mageia/dependencies/qt3/qt3.macros b/mageia/dependencies/qt3/qt3.macros new file mode 100644 index 000000000..2d7f24625 --- /dev/null +++ b/mageia/dependencies/qt3/qt3.macros @@ -0,0 +1,36 @@ +%qt3dir %_prefix/lib/qt3 +%qt3lib %_libdir +%qt3bin %qt3dir/bin +%qt3include %{qt3dir}/include +%qt3plugins %_libdir/qt3/plugins + +%configure_qt3 \\\ + %before_configure ; \ + %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \ + [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \ + CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \ + PATH="%qt3bin:$PATH" ; export PATH ; \ + $CONFIGURE_TOP/configure --build=%{_target_platform} \\\ + --prefix=%{_prefix} \\\ + --exec-prefix=%{_exec_prefix} \\\ + --bindir=%{_bindir} \\\ + --sbindir=%{_sbindir} \\\ + --sysconfdir=%{_sysconfdir} \\\ + --datadir=%{_datadir} \\\ + --includedir=%{_includedir} \\\ + --libdir=%{_libdir} \\\ + --libexecdir=%{_libexecdir} \\\ + --localstatedir=%{_localstatedir} \\\ + --sharedstatedir=%{_sharedstatedir} \\\ + --mandir=%{_mandir} \\\ + --infodir=%{_infodir} \\\ + --disable-rpath \\\ + $CONFIGURE_XPATH + +%qmake_qt3 \ + CPPFLAGS="${CPPFLAGS:-%optflags -DPIC -fPIC}" ; export CPPFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags -DPIC -fPIC}" ; export CXXFLAGS ; \ + CFLAGS="${CFLAGS:-%optflags -DPIC -fPIC}" ; export CFLAGS ; \ + QTDIR="%qt3dir" ; export QTDIR ; \ + %{qt3bin}/qmake + diff --git a/mageia/dependencies/qt3/qt3.spec b/mageia/dependencies/qt3/qt3.spec new file mode 100644 index 000000000..c6b0deb7b --- /dev/null +++ b/mageia/dependencies/qt3/qt3.spec @@ -0,0 +1,1478 @@ +%define Werror_cflags %nil + +# QTDIR is always /usr/lib/qt3, whether that's a lib64 architecture or +# not (sublibdirs are correctly qualified in the latter case however). +%define qtdir %{_prefix}/lib/qt3 +%define libqt3name %mklibname qt 3 + +%define libqassistantname %mklibname qassistantclient 1 +%define libdesignercore %mklibname designercore 1 +%define libeditor %mklibname editor 1 + +%define nameqt qt-x11-free + +%define buildSQL 1 +%{?_without_SQL: %{expand4 %%global buildSQL 0}} + +%define buildDebug 0 +%{?_with_debug: %{expand: %%global buildDebug 1}} + +%define buildStatic 1 +%{?_without_static: %{expand: %%global buildStatic 0}} + +%define buildImmodule 1 +%{?_without_immodule: %{expand: %%global buildImmodule 0}} + +%define plugindir %_libdir/qt3/plugins + +Name: qt3 +Version: 3.3.8.d +Release: %mkrel 1 +License: GPLv3+ and QPL +Summary: Qt3 Sources +Group: System/Libraries +URL: http://www.trolltech.com +#Source: %nameqt-%version.tar.gz +Source0: qt3-3.3.8.d.tar.gz +Source1: qt3.macros +Source2: qt3-assistant.desktop +Source3: qt3-designer.desktop +Source4: qt3-linguist.desktop +Source5: qt3-designer-sh +Source6: qt3-assistant-sh +Source7: qt3-uic-sh +Source8: qt3-README-Mageia +Source9: 90qtrc-jp +Patch1: qt-3.1.1-fix-xft2-compile.patch +Patch2: qt-3.2.3-fix-cupslib.patch +Patch4: qt-x11-free-3.3.5-no-rpath.patch +Patch5: qt-3.3.2-fix-configure.patch +Patch8: qt-3.3.5-lib64-plugins.patch +Patch10: qt-3.3.3-fix-accessible.patch +Patch12: fix-key-release-event-with-imm.diff +Patch13: qt-x11-free-3.3.6-lib64.patch +Patch14: qt-x11-free-3.3.4-linux32.patch +Patch15: qt-visibility.patch +Patch16: qt-x11-free-3.3.5-makelibshared.patch +Patch24: qt-x11-free-3.3.5-qtranslator-crash.patch +Patch28: qt-x11-immodule-nodebug.diff +Patch29: fix-x11-immodule.diff +Patch30: fix-im-crash-on-exit.diff +Patch31: workaround-for-xlib-xim-bug.diff +Patch56: qt3-3.3.6-fix-xorg7.0.patch +Patch58: qt-3.3.6-fix-qfile-message-error.patch +Patch59: qt-3.3.6-fix-qfile-message-error2.patch +Patch63: qt-x11-free-3.3.8-qmo35263.patch +Patch64: qt-x11-free-3.3.8b-unixodb-64.patch +Patch65: qt-x11-free-3.3.8b-cstddef.patch +Patch66: qt-x11-free-3.3.8b-force-png12.patch +#-------------- KDE qt-copy patches ( added the relevant ones ) +Patch102: 0017-qiconview-ctrl_rubber.patch +Patch104: 0035-qvaluelist-streaming-operator.patch +Patch115: 0078-argb-visual-hack.patch +Buildroot: %_tmppath/%name-%version-%release-root +%if %buildSQL +BuildRequires: mysql-devel +BuildRequires: unixODBC-devel +BuildRequires: libpq-devel +%endif +BuildRequires: freetype2-devel +BuildRequires: mesaglu-devel +BuildRequires: libsm-devel +BuildRequires: libice-devel +BuildRequires: libx11-devel +BuildRequires: libxcursor-devel +BuildRequires: libxext-devel +BuildRequires: libxft-devel +BuildRequires: libxinerama-devel +BuildRequires: libxmu-devel +BuildRequires: libxrandr-devel +BuildRequires: libxrender-devel +BuildRequires: fontconfig-devel +BuildRequires: bzip2-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: pkgconfig(libpng12) +BuildRequires: zlib-devel +BuildRequires: nas-devel +BuildRequires: libiodbc-devel +%if "%{_lib}" != "lib" +BuildRequires: linux32 +%endif + +%description +Qt is a complete and well-designed multi-platform object-oriented framework for +developing graphical user interface (GUI) applications using C++. Qt has +seamless integration with OpenGL/Mesa 3D libraries. + +#-------------------------------------------------------------------- + +%package -n %libqt3name +Summary: Qt3 - Shared libraries +Group: System/Libraries +Requires: %{name}-common = %version +Provides: qt3 = %{version}-%{release} + +%description -n %libqt3name +Qt is a complete and well-designed multi-platform object-oriented framework for +developing graphical user interface (GUI) applications using C++. Qt has +seamless integration with OpenGL/Mesa 3D libraries. + +This package contains shared libraries. + +%postun -n %libqt3name +if [ "$1" = "0" ]; then + rm -f /etc/ld.so.conf.new + grep -v -e "^%qtdir/%_lib$" /etc/ld.so.conf > /etc/ld.so.conf.new + mv -f /etc/ld.so.conf.new /etc/ld.so.conf +fi + +%files -n %libqt3name +%defattr(-,root,root,-) +%dir %qtdir/ +%_libdir/libqt-mt.so.3 +%_libdir/libqt-mt.so.3.3 +%_libdir/libqt-mt.so.3.3.8 +%_libdir/libqt-mt.la +%_libdir/libqui.so.1 +%_libdir/libqui.so.1.0 +%_libdir/libqui.so.1.0.0 +%_libdir/*.prl + +%dir %{plugindir}/styles/ +%{plugindir}/styles/*style.so + +%if %{buildImmodule} +%dir %{plugindir}/inputmethods/ +%{plugindir}/inputmethods/*.so +%endif + +#-------------------------------------------------------------------- + +%package -n %libqt3name-devel +Summary: Qt3 - Files needed to build Qt3 based applications +Group: Development/KDE and Qt +Requires: %libqt3name = %version-%release +Requires: %{libeditor} = %version-%release +Requires: %{libqassistantname} = %version-%release +Requires: %{libdesignercore} = %version-%release +Provides: libqt-devel = %{version}-%{release} +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: libqt3-pch-headers < 3.3.5 + +%description -n %libqt3name-devel +The qt3-devel package contains the files necessary to develop +applications using the Qt GUI toolkit: the header files, the Qt meta +object compiler. + +%post -n %libqt3name-devel +update-alternatives --install %_bindir/qmake qmake %qtdir/bin/qmake 10 + +%postun -n %libqt3name-devel +if ! [ -e %qtdir/bin/qmake ]; then + update-alternatives --remove qmake %qtdir/bin/qmake +fi + +%files -n %libqt3name-devel +%defattr(-,root,root,-) +%doc %_mandir/man1/* +%doc %_mandir/man3/* +%_bindir/designer-qt3 +%_libdir/*.so +%_sysconfdir/rpm/macros.d/* +%_libdir/pkgconfig/*.pc +%_datadir/applications/* +%dir %qtdir/ +%dir %qtdir/bin +%qtdir/bin/designer +%qtdir/bin/lrelease +%qtdir/bin/moc +%qtdir/bin/%multiarch_platform/qmake +%qtdir/bin/qmake +%qtdir/bin/uic +%qtdir/bin/lupdate +%qtdir/bin/qm2ts +%dir %qtdir/include/%multiarch_platform +%qtdir/include/%multiarch_platform/*.h +%dir %qtdir/include/ +%qtdir/include/* +%dir %qtdir/templates/ +%qtdir/templates/*.ui +%dir %{plugindir}/designer +%{plugindir}/designer/* +%dir %qtdir/mkspecs/ +%qtdir/mkspecs/* +%dir %qtdir/src/ +%qtdir/src/* +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm +%{qtdir}/bin/qembed +%dir %qtdir/bin/%multiarch_platform + +#-------------------------------------------------------------------- +%if %{buildStatic} + +%package -n %libqt3name-static-devel +Summary: Qt3 - Static files needed to build Qt3 based applications +Group: Development/KDE and Qt +Requires: %libqt3name-devel = %version-%release +Provides: libqt-static-devel = %{version}-%{release} +Provides: %{name}-static-devel = %{version}-%{release} + +%description -n %libqt3name-static-devel +This package contains: + - files needed to build static Qt based applications + +%files -n %libqt3name-static-devel +%defattr(-,root,root,-) +%_libdir/*.a + +%endif + +#-------------------------------------------------------------------- + +%package common +Summary: Config, language file for Qt +Group: Development/KDE and Qt +Requires: %libqt3name = %version +Obsoletes: libqt3-common +Provides: libqt3-common = %{version}-%{release} +# Laurent : allow to install package which use this provides (commercial packages which want to install under distro and used this provides +Provides: qt = %{version}-%{release} +Provides: qt3 = %{version}-%{release} + +%description common +This package contains all config file and language file + +%post common +update-alternatives --install %_bindir/qtconfig qtconfig %qtdir/bin/qtconfig 10 + +%postun common +if ! [ -e %qtdir/bin/qtconfig ]; then + update-alternatives --remove qtconfig %qtdir/bin/qtconfig +fi + +%files common +%defattr(-,root,root,-) +%dir %{plugindir} +%if %buildSQL +%dir %{plugindir}/sqldrivers +%endif +%dir %qtdir/phrasebooks/ +%qtdir/phrasebooks/*.qph +%dir %qtdir/ +%dir %qtdir/bin +%qtdir/bin/qtconfig +%_sysconfdir/profile.d/*.csh +%_sysconfdir/profile.d/*.sh +%config(noreplace) %_sysconfdir/qtrc +%config(noreplace) %_sysconfdir/kstylerc +%dir %qtdir/translations/ +%qtdir/translations/*.qm +%_sysconfdir/X11/xinit.d/* + +#-------------------------------------------------------------------- + +%if %buildSQL +%package -n %libqt3name-mysql +Summary: MySQL plugin for Qt +Group: Development/KDE and Qt +Requires: %libqt3name = %version-%release +Provides: %{name}-MySQL = %{version}-%{release} + +%description -n %libqt3name-mysql +This package contain the MySQL plugin for Qt. + +%files -n %libqt3name-mysql +%defattr(-,root,root) +%{plugindir}/sqldrivers/libqsqlmysql.so + + +%package -n %libqt3name-psql +Summary: PostgresSQL plugin for Qt +Group: Development/KDE and Qt +Requires: %libqt3name = %version-%release +Provides: %{name}-PostgreSQL = %{version}-%{release} + +%description -n %libqt3name-psql +This package contain the PostgresSQL plugin for Qt. + + +%files -n %libqt3name-psql +%defattr(-,root,root) +%{plugindir}/sqldrivers/libqsqlpsql.so + +%package -n %libqt3name-odbc +Summary: ODBC plugin for Qt +Group: Development/KDE and Qt +Requires: %libqt3name = %version-%release +Provides: %{name}-ODBC = %{version}-%{release} + +%description -n %libqt3name-odbc +This package contain the ODBC plugin for Qt. + + +%files -n %libqt3name-odbc +%defattr(-,root,root) +%{plugindir}/sqldrivers/libqsqlodbc.so + + +%package -n %libqt3name-sqlite +Summary: Sqlite 2 plugin for Qt +Group: Development/KDE and Qt +Requires: %libqt3name = %version-%release +Provides: %{name}-Sqlite = %{version}-%{release} + +%description -n %libqt3name-sqlite +This package contain the Sqlite 2 plugin for Qt. + +%files -n %libqt3name-sqlite +%defattr(-,root,root) +%{plugindir}/sqldrivers/libqsqlite.so + +%endif + +#-------------------------------------------------------------------- + +%package -n %libqassistantname +Summary: Qt3 - Shared libraries +Group: System/Libraries + +%description -n %libqassistantname +Qt3 - Shared libraries + +%files -n %libqassistantname +%defattr(-,root,root) +%_libdir/libqassistantclient.so.* + +#-------------------------------------------------------------------- + +%package assistant +Summary: Qt assistant +Group: Development/KDE and Qt + +%description assistant +This package contain Qt assistant + +%files assistant +%defattr(-,root,root) +%_bindir/assistant-qt3 +%qtdir/bin/assistant + +#-------------------------------------------------------------------- + +%package linguist +Summary: Qt linguist +Group: Development/KDE and Qt + +%description linguist +This package contain Qt linguist + +%files linguist +%defattr(-,root,root) +%qtdir/bin/linguist + +#-------------------------------------------------------------------- + +%package -n %libdesignercore +Summary: Qt3 - Shared libraries +Group: System/Libraries + +%description -n %libdesignercore +Qt3 - Shared libraries + +%files -n %libdesignercore +%defattr(-,root,root) +%_libdir/libdesignercore.so.* + +#-------------------------------------------------------------------- + +%package -n %libeditor +Summary: Qt3 - Shared libraries +Group: System/Libraries + +%description -n %libeditor +Qt3 - Shared libraries + +%files -n %libeditor +%defattr(-,root,root) +%_libdir/libeditor.so.* + +#-------------------------------------------------------------------- + +%package example +Summary: Qt examples +Group: Development/KDE and Qt +Obsoletes: libqt3-example +Provides: libqt3-example +BuildArch: noarch + +%description example +This package contain Qt example. + +%files example +%defattr(-,root,root) +%dir %_docdir/%name/examples +%doc %_docdir/%name/examples/* + +#-------------------------------------------------------------------- + +%package tutorial +Summary: Qt tutorials +Group: Development/KDE and Qt +BuildArch: noarch + +%description tutorial +This package contain Qt tutorial. + +%files tutorial +%defattr(-,root,root) +%dir %_docdir/%name/tutorial +%doc %_docdir/%name/tutorial/* + +#-------------------------------------------------------------------- + +%package doc +Summary: Qt documentation +Group: Development/KDE and Qt +Conflicts:libqt3-devel <= 3.3.4-13mdk +BuildArch: noarch + +%description doc +This package contain Qt documentation + +%post doc +# Remove old qt3 doc directories +find %_docdir -maxdepth 1 -type d -name qt-3.\* -exec rm -rf {} \; + +%files doc +%dir %_docdir/%name +%doc %_docdir/%name/FAQ +%doc %_docdir/%name/LICENSE* +%doc %_docdir/%name/README* +%dir %_docdir/%name/doc/ +%dir %_docdir/%name/doc/html/ +%doc %_docdir/%name/doc/html/* +%dir %qtdir/doc/ +%qtdir/doc/html + +#-------------------------------------------------------------------- + + +%prep +%setup -q -n qt3 + +%patch1 -p1 -b .fix_xft_compile +%patch2 -p1 -b .fix_cups_lib +%patch4 -p0 +%patch5 -p1 -b .fix_configure_space +%patch13 -p1 -b .lib64 +%patch14 -p1 -b .linux32 +%patch10 -p1 -b .fix_accessible +%patch15 -p1 -b .fix_qt_export +%patch16 -p1 -b .sharedlibs +%patch24 -p0 -b .qtranslator +%patch56 -p1 -b .fix_xorg_7.0 +%patch58 -p1 -b .fix_qfile_message_error +%patch59 -p1 -b .fix_qfile_message_error +%patch63 -p0 -b .fix_bug_35263 +%if "%_lib" == "lib64" +%patch64 -p0 -b .fix_unixodbc +%endif +%patch65 -p1 -b .gcc46 +%patch66 -p0 -b .libpng +# KDE qt-copy patches +%patch102 -p0 -b .qt-copy +%patch104 -p0 -b .qt-copy +%patch115 -p0 -b .qt-copy + +# (Anssi 01/2008) +# Hack to disable stripping, a better fix for configure script welcome: +mkdir -p stripbin +echo "#!/bin/true" > stripbin/strip +chmod +x stripbin/strip + +sed -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" -i mkspecs/linux-g++*/qmake.conf +sed -e "s|^QMAKE_CFLAGS\t.*$|QMAKE_CFLAGS = %{optflags} -DPIC -fPIC|" \ + -e "s|^QMAKE_LFLAGS\t.*=.*$|QMAKE_LFLAGS = %{ldflags} |" \ + -e "s|^QMAKE_LFLAGS_PLUGIN\t.*\+= |QMAKE_LFLAGS_PLUGIN = %(echo %ldflags|sed -e 's#-Wl,--no-undefined##') |" \ + -i mkspecs/linux-g++*/qmake.conf + +%build +export QTDIR=$(/bin/pwd) +export PATH=$(pwd)/stripbin:$QTDIR/bin:$PATH +export MANPATH=$QTDIR/doc/man:$MANPATH +export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH + +%if %{buildImmodule} +sh ./make-symlinks.sh +%endif + +# Default platform (take care to lib64 arches) +PLATFORM=linux-g++ +%if "%_lib" == "lib64" +PLATFORM=linux-g++-64 +%endif +echo "#define QT_MITSHM" >> mkspecs/${PLATFORM}/qplatformdefs.h + +function main_configure { +echo "yes" | ./configure \ + -I/usr/include/postgresql/server/ \ + -I/usr/include/fontconfig \ + -I/usr/include/Xft2 \ + -I/usr/include/Xft2/X11/Xft \ + -I/usr/include/mysql/ \ + -I/usr/include/libpng12 \ + -prefix %qtdir/ \ + -libdir %_libdir \ + -plugindir %{plugindir} \ + -sysconfdir %_sysconfdir \ + -docdir %_docdir/%name/doc/ \ + %if %{buildDebug} + -debug \ + %else + -release \ + %endif + -qt-gif \ + -system-zlib \ + -no-exceptions \ + -platform $PLATFORM \ + -enable-tools \ + -enable-kernel \ + -enable-widgets \ + -enable-dialogs \ + -enable-iconview \ + -enable-workspace \ + -enable-network \ + -enable-canvas \ + -enable-table \ + -enable-xml \ + -enable-input \ + -enable-opengl \ + -dlopen-opengl \ + %if %buildSQL + -enable-sql \ + -plugin-sql-mysql \ + -plugin-sql-odbc \ + -plugin-sql-psql \ + -plugin-sql-sqlite \ + %endif + -plugin-style-cde \ + -plugin-style-compact \ + -plugin-style-motif \ + -plugin-style-sgi \ + -plugin-style-platinum \ + -plugin-style-motifplus \ + -thread \ + -stl \ + -qt-imgfmt-png \ + -qt-imgfmt-jpeg \ + -qt-imgfmt-mng \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -sm \ + -xkb \ + -xinerama \ + -xrender \ + -xrandr \ + -xcursor \ + -xft \ + -nis \ + -no-tablet \ + -v \ + -xkb \ + $* +} + +%if %{buildStatic} + +main_configure -static +pushd src + %make && make INSTALL_ROOT=%{buildroot} install_target +popd +mkdir -p safelib +mv -f lib/libqt-mt.a safelib +%endif + +# Build shared +main_configure -shared +%make symlinks src-qmake src-moc sub-src sub-tools + +%install +export QTDIR=$(/bin/pwd) +export PATH=$(pwd)/stripbin:$QTDIR/bin:$PATH +export MANPATH=$QTDIR/doc/man:$MANPATH +export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH +rm -fr %buildroot + +make install INSTALL_ROOT=%buildroot/ + +rm -rf %buildroot/%qtdir/bin/qmake +install -m 0755 qmake/qmake %buildroot/%qtdir/bin/ + +# David - 3.0.0-0.11mdk - Install a README for Mandriva Linux +install -m 0644 %SOURCE8 %buildroot/%_docdir/%name/README.Mandriva_Linux +perl -pi -e "s|QtVersion|%version|" %buildroot/%_docdir/%name/README.Mandriva_Linux +perl -pi -e "s|PackageVersion|%version-%release|" %buildroot/%_docdir/%name/README.Mandriva_Linux + +# David - 3.0.0-0.11mdk - Install missing documentation +install -d -m 0755 %buildroot/%_docdir/%name/ +install -m 0644 FAQ %buildroot/%_docdir/%name/ +install -m 0644 LICENSE* %buildroot/%_docdir/%name/ +install -m 0644 README %buildroot/%_docdir/%name/ +install -m 0644 README-QT.TXT %buildroot/%_docdir/%name/ + +# David - 3.0.0-0.11mdk - Install man pages +install -d -m 0755 %buildroot/%_mandir/man1/ +for i in doc/man/man1/* ; do + if [ ! -d $i ] ; then + install -m 0644 $i %buildroot/%_mandir/man1/ + fi +done +# +install -d -m 0755 %buildroot/%_mandir/man3/ +for i in doc/man/man3/* ; do + if [ ! -d $i ] ; then + install -m 0644 $i %buildroot/%_mandir/man3/ + fi +done + +install -d -m 0755 %buildroot/%_bindir/ +install -m 0755 bin/moc %buildroot/%qtdir/bin/moc + +# David - 3.0.1-2mdk - Install .pri files needed to build examples and tutorials +install -d -m 0755 %buildroot/%qtdir/src/ +for i in src/*.pri; do + install -m 0644 $i %buildroot/%qtdir/src/ +done + + +cp -ar examples/ %buildroot/%_docdir/%name +cp -ar tutorial/ %buildroot/%_docdir/%name + +# Fix include directory for examples ( based on David Faure changes ) +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../../include|%qtdir/include|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../include|%qtdir/include|" + +# Fix lib directory for examples +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../../../lib/libqt-mt.prl|%_libdir/libqt-mt.prl|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../../lib/libqt-mt.prl|%_libdir/libqt-mt.prl|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../lib/libqt-mt.prl|%_libdir/libqt-mt.prl|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../src/qt_professional.pri|%qtdir/src/qt_professional.pri|" + +# Set RPM_BUILD_DIR to QTDIR +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|%_builddir/qt-%version|%qtdir|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|%_builddir/qt-x11-free-%version/mkspecs/|%qtdir/mkspecs/|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|%_builddir/qt-x11-free-%version/|%qtdir/|" +find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl -pi -e "s|../../lib/libqassistantclient.prl|%_libdir/libqassistantclient.prl|" + +# Remove .obj .moc directories +for name in `find %buildroot/%_docdir/%name/{examples,tutorial} -type d -name .obj`; do + rm -rf $name +done +for name in `find %buildroot/%_docdir/%name/{examples,tutorial} -type d -name .moc`; do + rm -rf $name +done + +install -m 0755 %SOURCE5 %buildroot/%_bindir/designer-qt3 +install -m 0755 %SOURCE6 %buildroot/%_bindir/assistant-qt3 + +cd %buildroot/%qtdir/ +install -d -m 0755 doc +ln -s %_docdir/%name/doc/html/ doc/html +cd - + +install -d -m 0755 %buildroot/%_sysconfdir/profile.d/ +cat >> %buildroot/%_sysconfdir/profile.d/qt.csh << EOF +if (! \$?QTDIR ) then + setenv QTDIR "%qtdir" +endif +if (! \$?QTINC ) then + setenv QTINC "%qtdir/include" +endif +if (! \$?QTLIB ) then + setenv QTLIB "%_libdir" +endif +if (! \$?QT_XFT ) then + setenv QT_XFT 0 +endif +EOF + +cat >> %buildroot/%_sysconfdir/profile.d/qt.sh << EOF +#! /bin/bash +[ -z "\$QTDIR" ] && QTDIR="%qtdir" +[ -z "\$QTINC" ] && QTINC="%qtdir/include" +[ -z "\$QTLIB" ] && QTLIB="%_libdir" +[ -z "\$QT_XFT" ] && QT_XFT=0 + +if ! echo \${PATH} | /bin/grep -q \$QTDIR/bin ; then + PATH=\$QTDIR/bin:\${PATH} +fi + +export PATH QTDIR QTINC QTLIB QT_XFT +EOF + +# Generate default qtrc +install -d -m 0755 %buildroot/%_sysconfdir/ +cat >> %buildroot/%_sysconfdir/qtrc << EOF +[3.3] +libraryPath=%{plugindir} + +[General] +enableXft=true +font=Sans,10,-1,5,0,0,0,0,0,0 +style=plastik +useXft=true +EOF + +cat >> %buildroot/%_sysconfdir/kstylerc << EOF +[Settings] +MenuDropShadow=true +MenuOpacity=0.9 +MenuTransparencyEngine=Disabled +SemiTransparentRubberband=true +EOF + + +install -d -m 0755 %buildroot/%_datadir/applications +install -m 0644 %SOURCE2 %buildroot/%_datadir/applications/qt3-assistant.desktop +install -m 0644 %SOURCE3 %buildroot/%_datadir/applications/qt3-designer.desktop +install -m 0644 %SOURCE4 %buildroot/%_datadir/applications/qt3-linguist.desktop + +# Multiarch fixes +%multiarch_binaries %buildroot%qtdir/bin/qmake + +%multiarch_includes %buildroot%qtdir/include/qconfig.h + +%if %{buildStatic} +# Static install +install -d -m 0755 %buildroot/%_libdir/ +install -m644 safelib/* %{buildroot}/%_libdir/ +%endif + +# Removing invalid symlink. They really should not be here +# Old symlink if was set in right place, would create a cyclic symlynk +cd %buildroot/%qtdir/mkspecs/ +if [ -h default ]; then + rm -f default/linux* +fi +# provide default64 for multiarch devel +%if "%_lib" == "lib64" +ln -sf linux-g++-64 default64 +%endif +cd - + +# Install rpm macros +mkdir -p %buildroot/%_sysconfdir/rpm/macros.d +install -m 0644 %SOURCE1 %buildroot/%_sysconfdir/rpm/macros.d + +mkdir -p %buildroot/%_sysconfdir/X11/xinit.d/ +install -m 0755 %SOURCE9 %buildroot/%_sysconfdir/X11/xinit.d/ + +# Fix all buildroot paths + +%clean +rm -fr %buildroot + + + + + +%changelog +* Sat Jul 27 2012 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-1 +- Initial build for MGA2 + +* Mon Dec 26 2011 fwang <fwang> 3.3.8b-30.mga2 ++ Revision: 187720 +- set system flags + +* Thu Dec 08 2011 fwang <fwang> 3.3.8b-27.mga2 ++ Revision: 178838 +- rebuild for new odbc + +* Thu Sep 15 2011 fwang <fwang> 3.3.8b-26.mga2 ++ Revision: 143741 +- force libpng12 +- drop png14 patch +- add incluedir for libpng12 +- build with png12 (old libs, not required by any other packages besides lsb) +- add arch patch to fix build with latest libpng +- rebuild for new libpng + +* Fri Mar 25 2011 dmorgan <dmorgan> 3.3.8b-25.mga1 ++ Revision: 77244 +- Rebuild against new mysql + +* Tue Feb 01 2011 stewb <stewb> 3.3.8b-24.mga1 ++ Revision: 45606 +- bump release +- include,mkspecs,templates always in lib/qt3 +- qt3 is blacklisted, build a stripped down version with no -devel (for LSB) +- imported package qt3 + + +* Mon Jan 31 2011 Stew Benedict <stewbintn@gmail.com> +- initial import/clean + +* Sat Jan 01 2011 Oden Eriksson <oeriksson@mandriva.com> 3.3.8b-22mdv2011.0 ++ Revision: 627007 +- rebuilt against mysql-5.5.8 libs, again + +* Mon Dec 27 2010 Oden Eriksson <oeriksson@mandriva.com> 3.3.8b-21mdv2011.0 ++ Revision: 625428 +- rebuilt against mysql-5.5.8 libs + +* Wed Dec 01 2010 Funda Wang <fwang@mandriva.org> 3.3.8b-20mdv2011.0 ++ Revision: 604333 +- rebuild for new zlib + + + Thierry Vignaud <tv@mandriva.org> + - let the doc subpackage be noarch + +* Wed Feb 17 2010 Oden Eriksson <oeriksson@mandriva.com> 3.3.8b-18mdv2010.1 ++ Revision: 507040 +- rebuild + +* Sun Jan 10 2010 Oden Eriksson <oeriksson@mandriva.com> 3.3.8b-17mdv2010.1 ++ Revision: 488797 +- rebuilt against libjpeg v8 + +* Sun Aug 16 2009 Funda Wang <fwang@mandriva.org> 3.3.8b-16mdv2010.0 ++ Revision: 416869 +- rebuild for libjpeg7 + +* Wed Jun 10 2009 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-15mdv2010.0 ++ Revision: 384888 +- Create xinit.d entry for jp +- Remove invalid rubber add patch + +* Tue Apr 07 2009 Funda Wang <fwang@mandriva.org> 3.3.8b-14mdv2009.1 ++ Revision: 364936 +- really fix configure_qt3 (introduce libdir declaration) + +* Tue Apr 07 2009 Funda Wang <fwang@mandriva.org> 3.3.8b-13mdv2009.1 ++ Revision: 364863 +- fix configure_qt3 + +* Mon Feb 09 2009 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-12mdv2009.1 ++ Revision: 338888 +- Added unixodbc 64 bits patch to compile +- Get rid of patch fuzz issue +- Fix qt3 macros to rebuild qt3 apps + + + Oden Eriksson <oeriksson@mandriva.com> + - use lowercase mysql-devel + +* Sun Dec 07 2008 Funda Wang <fwang@mandriva.org> 3.3.8b-11mdv2009.1 ++ Revision: 311526 +- rebuild for new mysql + +* Tue Oct 21 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-10mdv2009.1 ++ Revision: 296186 +- Avoid environment vars be expanded + +* Tue Oct 21 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-9mdv2009.1 ++ Revision: 296154 +- Cleanup environment + +* Tue Sep 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-8mdv2009.0 ++ Revision: 290138 +- Remove PATH for qt3 bin, was a bad idea at all. Moved the necessary things for qt3 macros in configure_qt3 + +* Wed Sep 24 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-7mdv2009.0 ++ Revision: 287878 +- Qt3 never should have his path before qt4 + +* Tue Sep 23 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-6mdv2009.0 ++ Revision: 287517 +- postgres has headers in different place now +- Add PATH to bin qt3 + + + Thierry Vignaud <tv@mandriva.org> + - rebuild early 2009.0 package (before pixel changes) + + + Pixel <pixel@mandriva.com> + - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas + - ensure comment does not appear in qt3-common's %%postun + - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers + +* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-4mdv2009.0 ++ Revision: 214268 +- Changed qt3plugins for proper place. Thanks to Funda Wang to point this. Fix bug https://qa.mandriva.com/show_bug.cgi?id=41183 +- Added qmake_qt3 macro and qt3bin + +* Tue May 27 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-3mdv2009.0 ++ Revision: 211755 +- As suggested by pixel, libraries now sit under _libdir. To join the movement, plugins gone now to _libdir/qt3/plugins, which made a cleaner solution for install both plugins and libs for i586 and x86_64 +- No shell script was harmed during this task... + +* Mon May 26 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-2mdv2009.0 ++ Revision: 211435 +- Fixed ld.so.conf.d dir creation +- As new gcc 4.3.1 becomes more pedantic, small changes are needed in the immoldule patch +- Moving the ld.so.conf parsing to a ld.so.conf.d solution + + + Thierry Vignaud <tv@mandriva.org> + - fix summary-not-capitalized + +* Mon Jan 28 2008 Helio Chissini de Castro <helio@mandriva.com> 3.3.8b-1mdv2008.1 ++ Revision: 159197 +- Introducing qt 3.3.8b, the official GPL v3 release. Beyond the GPL v3 release, some patches and fixes intended to be in + possible future release 3.3.9 was added, so here's the list of previous package patches already merged: +- qt-3.3.8-fix-chinese-japanese-font.patch +- qt3-3.3.8-fix-CVE-2007-4137.patch +- qt-x11-free-3.3.8.tar.bz2 +- 0081-format-string-fixes.diff +- 0077-utf8-decoder-fixes.diff +- qt3-fix-unicode-font-cache.patch +- qt3-3.3.8-fix-mysql-segfault.patch +- 0076-fix-qprocess.diff + + + Nicolas Lécureuil <nlecureuil@mandriva.com> + - Add patch to fix chinese and japanese fonts (Bug #17014) + +* Thu Jan 24 2008 Anssi Hannula <anssi@mandriva.org> 3.3.8-13mdv2008.1 ++ Revision: 157672 +- use optflags (they were dropped without log entry in 2005, probably + inadvertently) +- fix debug packages (do not strip before symbols are collected) + +* Wed Jan 16 2008 Guillaume Rousse <guillomovitch@mandriva.org> 3.3.8-12mdv2008.1 ++ Revision: 153774 +- no executable bit on profile.d scriptlet + + + Olivier Blin <oblin@mandriva.com> + - restore BuildRoot + + + Thierry Vignaud <tv@mandriva.org> + - kill re-definition of %%buildroot on Pixel's request + +* Fri Nov 23 2007 Helio Chissini de Castro <helio@mandriva.com> 3.3.8-11mdv2008.1 ++ Revision: 111592 +- Due to next release Qt4 will be major qt environment, we needeed change a few things on qt3: +- No more designer and assistant pure links on /usr/bin. Using alternatives. Desktop files points to *-qt3 + to be present on menu +- No more qmake link on /usr/bin. Provided by alternatives. Qt4 have priority. +- No more qtconfig link on /usr/bin. Provided by alternatives. qt4 have priority +- qt bin dir isn't in the PATH anymore. Not needed +- QTDIR remains . Qt4 nor depends on this var except in for build. +- ld.so.conf.d entries remains untouchable +- Qt4 and Qt3 still can be installed simultaneously. The only difference now is that if user need + qt3 build environment by default, need change the alternatives for qtconfig and qmake. So + update-alternative --config qmake should do the job + +* Mon Nov 12 2007 Funda Wang <fwang@mandriva.org> 3.3.8-10mdv2008.1 ++ Revision: 108175 +- rebuild for new lzma + + + Thierry Vignaud <tv@mandriva.org> + - fix description (this is neither License tag nor build explanations) + +* Sun Nov 04 2007 Nicolas Lécureuil <nlecureuil@mandriva.com> 3.3.8-9mdv2008.1 ++ Revision: 105615 +- [BUGFIX] Fix bug with DejaVu fonts (Patch 63) (Bug #35263) + + + Thierry Vignaud <tv@mandriva.org> + - fix summary-ended-with-dot + +* Sat Sep 29 2007 Nicolas Lécureuil <nlecureuil@mandriva.com> 3.3.8-8mdv2008.0 ++ Revision: 93831 +- [BUGFIX] Fix mysql segfault ( Bug #34149) + +* Fri Sep 14 2007 Nicolas Lécureuil <nlecureuil@mandriva.com> 3.3.8-7mdv2008.0 ++ Revision: 85525 +- Fix CVE-2007-4137 +- Fix validation errors on desktop files +- Fix validation errors on desktop files + + + Funda Wang <fwang@mandriva.org> + - fix Chinese translaitons of qt3-designer.desktop, it should be charset independent + +* Tue Jul 31 2007 Helio Chissini de Castro <helio@mandriva.com> 3.3.8-6mdv2008.0 ++ Revision: 57148 +- Format string error fixes. + http://trolltech.com/company/newsroom/announcements/press.2007-07-27.7503755960 + + + Nicolas Lécureuil <nlecureuil@mandriva.com> + - Clean descriptions + -[BUGFIX] Fix Requires ( Bug #15491) + +* Thu May 31 2007 Helio Chissini de Castro <helio@mandriva.com> 3.3.8-5mdv2008.0 ++ Revision: 33430 +- Removed old non used patches +- Added relevant ( non BIC ) patches from qt-copy, including composite aware. + Most relevant is MIT-SHM patch, which should improve large image handling. All patches are + documented internally. +- Remove switches for 2006 distro +- Created qt3-assistant and qt3-linguist packages +- Removed old debian like menudir entries +- Removed qt-copy switches ( patches comes separated now ) + +* Thu May 10 2007 Per Øyvind Karlsen <peroyvind@mandriva.org> 3.3.8-4mdv2008.0 ++ Revision: 26148 +- set $QTINC & $QTLIB in profile.d scripts to avoid special needs for + qt apps at build time (finally fixes #27808) + + +* Fri Mar 30 2007 Laurent Montel <lmontel@mandriva.com> 3.3.8-4mdv2007.1 ++ Revision: 149898 +- Fix qt3 utf8 vulnerability + +* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 3.3.8-3mdv2007.1 ++ Revision: 147483 +- Fix qt3 default config + +* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 3.3.8-2mdv2007.1 ++ Revision: 147345 +- Fix space touch (I hope + +* Tue Feb 27 2007 Laurent Montel <lmontel@mandriva.com> 3.3.8-1mdv2007.1 ++ Revision: 126234 +- Fix patch +- Add new immodule patch + rediff all immodule patch +- 3.3.8 + (need to rediff some patch) + +* Tue Feb 13 2007 Helio Chissini de Castro <helio@mandriva.com> 3.3.7-5mdv2007.1 ++ Revision: 120391 +- Moved qt doc dir for qt3, instead of qt-%%version. Since we can have officially one qt3 installed a + time on Mandriva system, there's no need of versionated directories. This solves the issue of + having multiple empty dirs from old upgrade. Similar approach need to be done on qt4 package. + + + Laurent Montel <lmontel@mandriva.com> + - Don't requires on version-%%{release} as requested + - Rebuild + +* Mon Jan 08 2007 Laurent Montel <lmontel@mandriva.com> 3.3.7-3mdv2007.1 ++ Revision: 106201 +- Fix bn_IN rendering character + +* Fri Jan 05 2007 Laurent Montel <lmontel@mandriva.com> 3.3.7-2mdv2007.1 ++ Revision: 104421 +- Rebuild + +* Wed Oct 25 2006 Laurent Montel <lmontel@mandriva.com> 3.3.7-1mdv2007.0 ++ Revision: 72261 +- 3.3.7 + +* Fri Oct 20 2006 Laurent Montel <lmontel@mandriva.com> 3.3.6-19mdv2007.1 ++ Revision: 71345 +- Fix overflow + +* Wed Sep 06 2006 Laurent Montel <lmontel@mandriva.com> 3.3.6-18mdv2007.0 ++ Revision: 59934 +- New package (3.3.6-18mdv 2006-09-05) + Add patch to fix search xorg lib on all arch (patch from gb) + Rebuild against new mysql + +* Tue Sep 05 2006 Laurent Montel <lmontel@mandriva.com> 3.3.6-17mdv2007.0 ++ Revision: 59714 +- d +- New package (3.3.6-17mdv 2006-09-04) + Add patch from Gwenole Beauchesne <gbeauchesne@mandriva.com> +- readd functional multiarch support +- fix 32-bit builds on lib64 systems +- fix menu file names in qt3-devel package +- augment X.org 7.0 path patch for other linux arches +- Fix bug #15491 + +* Fri Aug 11 2006 Laurent Montel <lmontel@mandriva.com> 3.3.6-16mdv2007.0 ++ Revision: 55311 +- New package (2006/08/10 3.3.6-16mdv) + Add patch to improve qfile debug +- Better error message with qfile + +* Sat Jul 29 2006 Helio Chissini de Castro <helio@mandriva.com> 3.3.6-14mdv2007.0 ++ Revision: 42346 +- Added rpm macros for qt. Now qt rpm packages can use the following macros + %%qt3dir, %%qt3include, %%qt3lib, %%qt3plugins. +- Added path for Qt binaries. Some programs need access to devel binaries like lrelease +- Desktop files changed place +- Increase release +- Added arabic fonts fix provided by Trolltech +- Redent modification requires that qmake points for default itself. this fixes + the bug http://qa.mandriva.com/show_bug.cgi?id=21522 +- Fix typo +- Fix symlinks. This solve bug http://qa.mandriva.com/show_bug.cgi?id=15090, the + "qt likes my build dir" infamous bug +- Of course, raise the release number... +- Immodule fix for the most nasty Mandriva Qt bug on Xim. Finally this bug can + be closed. Reference: http://qa.mandriva.com/show_bug.cgi?id=16300 +- Increase release and add %%mkrel +- Added patch for http://qa.mandriva.com/show_bug.cgi?id=16432 + Thanks for Michael Scherer for report +- Removed initial font speedup patch +- Updated with qt-copy from 20051216. This release have added two patches + described bu Lubos Lunak ( l.lunak@kde.org ) on kde-packager list: + "Two patches that make Qt rely noticeably less on (slow) fontconfig + font listing, resulting in significant performance gains. They could + still use a bit more testing, I myself consider them stable though." +- Remove -b from qmake patches, to avoid wrong addition in packaging +- Finally found qmake error on x86_64. Standard makefiles generated for x86_64 + arches pointed Qt library path for QTDIR/lib, and on Mandriva is QTDIR/lib64. + This force packages like qca, which use plain qmake scripts, need a lot of + perl, sed and changes to compile. This solves kdevelop base templates too. +- Fix multiarch plugins in a proper way, using standard qt configue. qt plugins + now search lib or lib64 depending od their arch. No need more patches and spec + changes, neiher add another option on configure +- Disable some explicit qDebug call making imm patch less annoying +- Fixed wrong %%config on qtrc. Should be (noreplace) +- Fixed plugin mess +- Clean a little bit more spec +- Fixed designer wrapper +- Fixed default qtrc to match lib<arch> under plugins +- Removed invalid info for tutorial and example build on README +- Fixed removal of extra .moc .obj in tutorial and examples +-Fixed sqlite patch. Correct sqlite version is 2, not 3 +- Updated version before submit +- Added missing source +- Qt3 package sanitizing +- Removed all explicit qt-copy patches in favour of qt-copy standard +- Fixed again the immodule bug and merge minor xim adapted patch +- Added patch for no-strict-aliasing on OpenType ( from OpenSUSE ) +- Added patch for disable input method on password entry ( from OpenSUSE ) +- Added patch for match external sqlite library and avoid use of internal zlib +- Removed xmu patch +- Updated GL load patch +- Added patch for fix xpm handling ( from OpenSUSE ) +- Added patch for takeitem crashes in qlistview ( from OpenSUSE ) +- Added patch for fonts speedup ( from KDE project ) +- Added visual rubberband patch from brazilian KDE developer Andr?\195?\169 Magalh?\195?\163es +- Added patch for qtranslator crash ( from OpenSUSE ) +- Fixed plugin directory ( lib/lib64 ) for qt designer wrapper +- Added patch for designer plugins ( from OpenSUSE ) +- Complete static-to-shared patch, with libdesignercore and libeditor +- Fixed library search for lib64 on unix test scripts +- Fixed svn changelog finally (none) +- Do not ship examples and tutorial in compressed format. Originally this + solution was take as all code is compiled. Avoiding compilation make smaller + packages. +- Remove qmake.cache +- Tutorial package restored +- We are Mandriva now +- Put changelog back on spec since breakage on svn ( again ) + * Tue Oct 25 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-1mdk +- Fix immpatch to compile +- Fix changelog merge +- Fix immpatch to compile +- Added libqassistant as shared. Some KDE apps since 3.5 need ( new kdevelop for + kdevdesigner ) +- Move file section to same package section +- Removed old 3.3.4 not used anymore +- Fixed my fault for not noted that svn isn' t up to date +- Added changelog back to spec avoiding temp the svn log problem ( inconsistency ) +- Obsolete pch package +- Disable imm patch. Wrong input module code crash kicker output when some event comes from system tray and uses X11 event queue +- Updated with upstream package to subversion +- Bunzipped all patches +- Created doc package ( reduce devel package size ) +- Created static-devel package +- Clean up spec to new layout, allowing both static and shared compilation +- Uploading current spec +- Uploading package ./qt3 + + + Laurent Montel <lmontel@mandriva.com> + - Simplify patch from neoclust to create menu entry + - Use macro + - Rebuild because cluster was not update... + => I hope that now build will be ok + - Fix search xorg lib when we are on x86_64 and compile with xorg >= 7.0 + - Increase release number + - Readd patch to fix press enter + - Add patch to improve xinerama support + - Rebuild against new gcc-glibc + - Fix install + Diable nas + - F**k split xorg lib... + - I don't understand idea to split all lib.... + - Other buildrequires fix + - Start to fix buildrequires with new xorg + - quote not necessary + - Fix error + - Adapt to new xdg menu + - Reactivate static lib for several project in connectiva + - Increase version + - Reactivate immodule + Disable compile of static lib (any program use it) + Remove unused patch + - add patch + - Update source + - Time to update it => 3.3.6 + Adapt patch + Disable for the moment inputmethod + Next step fix all multi-arch "breakage"... + - Add patch to disable patch36 which create BIC + (apply just for MDK <=200600) + - Rebuild for missing package + - Add Provides qt3 (requested by Erwan) + - Fix typo + * Wed Nov 02 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.5-3mdk + - Rebuild with new mysql + * Thu Oct 27 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-2mdk + - New immodule patch + - 3.3.5 + - qt3.3.5 + - Fix postun when we have x86_64 and i586 pkg + - Fix kicker crash (qtimm bugs...) + * Mon Sep 19 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-23mdk + - Fix kicker crash + - Added libqassistant as shared. Some KDE apps since 3.5 need ( new kdevelop for + kdevdesigner ) + - Move file section to same package section + - Removed old 3.3.4 not used anymore + - Allow to compile with all gcc4 + - Fix qt3 visibility support + - Rebuild on x86_64 with new gcc + - Update + + + Andreas Hasenack <andreas@mandriva.com> + - renamed mdv to packages because mdv is too generic and it's hosting only packages anyway + +* Sat May 21 2005 Laurent Montel <lmontel@mandriva.com> ++ 2005-07-06 08:08:53 (307) +- Rebuild on x86_64 with new gcc + +* Mon May 16 2005 Helio Chissini de Castro <helio@mandriva.com> ++ 2005-06-28 20:23:48 (251) +- Updated with upstream package to subversion +- Bunzipped all patches +- Created doc package ( reduce devel package size ) +- Created static-devel package +- Clean up spec to new layout, allowing both static and shared compilation + +* Sat May 14 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-11mdk +- Enable sqlite +- Add patch114: fix kde bug #106974 +- Add patch113: fix misscompile with gcc-4.0 (fix printing and co) + +* Fri May 13 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-10mdk +- Add missing buildrequires on x86_64 : linux32 + +* Tue May 10 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-9mdk +- Try to activate immodule + +* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-8mdk +- Rebuild with new gcc-4.0.0 + +* Fri Apr 22 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.4-7mdk +- Fix qmake (patch from Gwenole) + +* Tue Apr 12 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 3.3.4-6mdk +- Fix email +- multiarch & linux32 fixes + +* Mon Mar 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.4-5mdk +- Rebuild + +* Mon Feb 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.4-4mdk +- Update patch100 and qt-immodule related things patch from UTUMI Hirosi <utuhiro78@yahoo.co.jp> + +* Wed Feb 09 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.4-3mdk +- Remove perl -pi -e for man file (Fixed in this release) + +* Thu Jan 27 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.4-2mdk +- Reapply some patch + +* Wed Jan 26 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.4-1mdk +- 3.3.4 + +* Tue Jan 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-32mdk +- Add patch110 "correctly propagate orientation of wheel events to viewport/content of QScrollView" + +* Wed Dec 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-31mdk +- Fix menu + +* Thu Nov 18 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-30mdk +- Add patch109: fix kde bug #84434 + +* Tue Nov 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-29mdk +- Add patch105: fix 64bit fullscreen +- Add patch106: fix kde bug #88128 (fix focus) +- Add patch107: fix kde bug #58719 (fix qpopupmenu) +- Add patch108: fix kde bug #74778 (fix qpopupmenu) + +* Fri Oct 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-28mdk +- Add patch105: fix QTextEdit::zoomIn/Out + +* Fri Oct 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-27mdk +- Add qtrc default + +* Fri Sep 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-26mdk +- Remove patch103: pb with image + +* Wed Sep 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-25mdk +- Disable immodule, there is some bug reported on bugs.kde.org + +* Sat Sep 18 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-24mdk +- Add patch103 fix mitshm image + +* Tue Sep 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-23mdk +- Fix create %%_libdir/pkgconfig/ patch from Doug Keller <doug@voidstar.us> thanks + +* Sat Sep 11 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-22mdk +- Move qtconfig link into %%_bindir + +* Thu Sep 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-21mdk +- Fix load GL (patch from Gb) + +* Wed Sep 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-20mdk +- Add patch97: fix qrichtext regression + +* Tue Sep 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-19mdk +- Fix man page + +* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-18mdk +- Add patch96: fix qtoolbar fix kde bug #77047 + +* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-17mdk +- Fix export QTDIR + +* Fri Aug 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-16mdk +- Use qt-x11-immodule-bc-qt3.3.3.patch + +* Fri Aug 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-15mdk +- Add patch101-102: fix qt-immute + +* Fri Aug 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-14mdk +- Add patch92: fix load xmu +- Add patch93: fix accessible plugins +- Add patch94: fix xpm handling +- Add patch95: fix gif handler + +* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-13mdk +- Fix "qt3-set-QTDIR-environment-csh" too patch from "Nick Brown <nickbrown@mandrake.org>" + +* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-12mdk +- Adapt patch from Gb to define position of plugins dir + "handle multilib plugins dir" + +* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-11mdk +- Fix qtdir.sh fix from Nick Brown <nickbrown@mandrake.org> + +* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-10mdk +- Add patch90: fix qtconfig apply patch from "Amrein-Marie Christophe" + +* Wed Aug 25 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-9mdk +- Fix menu + +* Fri Aug 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-8mdk +- Remove unused patch + +* Thu Aug 19 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-7mdk +- Create link to qt-mt.pc to /usr/lib/pkgconfig + +* Thu Aug 19 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-6mdk +- Fix opengl + +* Thu Aug 19 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-5mdk +- Disable patch88, but to load OpenGL extension we must install Mesa-devel... + +* Tue Aug 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-4mdk +- Update qt-immute patch but not activated by default because java doesn't + work with this patch + +* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-3mdk +- Fix qmake mdk bug #10746 + +* Fri Aug 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-2mdk +- Minor clean spec + +* Thu Aug 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.3-1mdk +- 3.3.3 + +* Fri Aug 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-28mdk +- Tiny spec file fix, patch from "Stefan van der Eijk" <stefan@eijk.nu> thanks. + +* Thu Aug 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-27mdk +- Add conditional build to build qt-immodule (patch from titi) + +* Tue Jul 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-26mdk +- Fix spec file + +* Wed Jul 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-25mdk +- Add patch87: fix load opengl don't use libGL.so but libGL.so.1 + +* Tue Jul 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-24mdk +- Fix provides for qt3-pch-headers +- Add debug version + +* Tue Jul 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-23mdk +- Try pch + +* Sat Jul 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-22mdk +- Remove patch100 it breaks applet java into konqueror (I don't know why for the moment) + +* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-21mdk +- Fix mimetype + +* Wed Jun 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-20mdk +- Fix example compile + +* Wed Jun 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-19mdk +- Fix again + +* Wed Jun 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-18mdk +- Fix .qmake.cache bug reported by Leon Widdershoven <leon.widdershoven@imasgroep.nl> + +* Tue Jun 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-17mdk +- Add patch from UTUMI Hirosi <utuhiro78@yahoo.co.jp> support for qt-immodule +- Add patch86: fix image cache +- Add patch87: fix unicode font cache + +* Wed Jun 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-16mdk +- Add patch84: fix qiconview repaint + +* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-15mdk +- Rebuild + +* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-14mdk +- Add patch83: fix space into qconfig.h (Austin Acton <aacton@yorku.ca> asked me that it will fix some problem into compile package) + +* Wed May 19 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-13mdk +- Add patch82: fix kde bug 80072 "konqueror freezes for some seconds when selecting text in text field with mouse" + +* Sat May 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-12mdk +- Fix patch81 + +* Sat May 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-11mdk +- Fix to found Sans font + +* Sat May 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk +- Fix configure +- Add patch81: try to fix accent in french language + +* Thu May 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-9mdk +- Fix patch47 + +* Wed May 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk +- Reapply patch to active aa by default + +* Wed May 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk +- Add patch46: fix kmenu width +- Add some patch from qt-copy (patch to test) + +* Wed May 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk +- Try to reactivate patch37 + +* Wed May 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk +- Reactive some patch/remove some ununsed patch + +* Wed May 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk +- Disable compile to support qt3.3.2 + +* Thu Apr 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk +- 3.3.2 + +* Thu Apr 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-20mdk +- Add patch45: fix qprinter + cups (workaround) + +* Tue Apr 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-19mdk +- Add patch44: fix kuickshow fullscreen pb + +* Thu Apr 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-18mdk +- Use mdkversion + diff --git a/mageia/dependencies/qt3/workaround-for-xlib-xim-bug.diff b/mageia/dependencies/qt3/workaround-for-xlib-xim-bug.diff new file mode 100644 index 000000000..2d8806ec9 --- /dev/null +++ b/mageia/dependencies/qt3/workaround-for-xlib-xim-bug.diff @@ -0,0 +1,14 @@ +--- plugins/src/inputmethods/xim/qximinputcontext_x11.cpp 2006-02-17 16:16:37.000000000 -0500 ++++ plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.new 2006-02-17 16:30:47.000000000 -0500 +@@ -491,8 +491,11 @@ + ximServerName.ascii()); + else { + Display *dpy = QPaintDevice::x11AppDisplay(); ++ XWindowAttributes attr; // XIM unselects all events on the root window ++ XGetWindowAttributes( dpy, QPaintDevice::x11AppRootWindow(),&attr ); + XRegisterIMInstantiateCallback(dpy, 0, 0, 0, + (XIMProc) xim_create_callback, 0); ++ XSelectInput( dpy, QPaintDevice::x11AppRootWindow(), attr.your_event_mask ); + } + #else // !USE_X11R6_XIM + else if ( XSetLocaleModifiers ("") == 0 ) diff --git a/mageia/genrpm.sh b/mageia/genrpm.sh new file mode 120000 index 000000000..ae8c990d8 --- /dev/null +++ b/mageia/genrpm.sh @@ -0,0 +1 @@ +../redhat/genrpm.sh
\ No newline at end of file |