Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2013-03-22 11:50:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-02-25 21:40:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2013-03-22 11:50:04.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 5 21:42:55 UTC 2013 - [email protected] + +- Add aarch64-support.diff: + * Fix aarch64 support in webkit tree + +------------------------------------------------------------------- +Tue Mar 5 13:42:52 UTC 2013 - [email protected] + +- Add qatomic_generic.patch: + * Fix generic qatomic for const pointers + +------------------------------------------------------------------- +Sun Mar 3 13:26:53 UTC 2013 - [email protected] + +- Add check-return-value-of-qt_safe_pipe.patch: + * fixes QTBUG#18934 and kde#310777 + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change New: ---- aarch64-support.diff check-return-value-of-qt_safe_pipe.patch qatomic-generic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -108,6 +108,9 @@ Patch147: libqt4-CVE-2013-0254.patch # PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray Patch148: Fix-call-to-QMetaObject.patch +Patch149: qatomic-generic.patch +Patch150: check-return-value-of-qt_safe_pipe.patch +Patch151: aarch64-support.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -190,6 +193,9 @@ %patch146 -p1 %patch147 -p1 %patch148 -p1 +%patch149 -p1 +%patch150 -p1 +%patch151 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -126,6 +126,9 @@ Patch147: libqt4-CVE-2013-0254.patch # PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and kde#311751, crashing of plasma-desktop on QML systray Patch148: Fix-call-to-QMetaObject.patch +Patch149: qatomic-generic.patch +Patch150: check-return-value-of-qt_safe_pipe.patch +Patch151: aarch64-support.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -418,6 +421,9 @@ %patch146 -p1 %patch147 -p1 %patch148 -p1 +%patch149 -p1 +%patch150 -p1 +%patch151 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ 0180-window-role.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -26,7 +26,7 @@ =================================================================== --- src/corelib/kernel/qobject_p.h.orig +++ src/corelib/kernel/qobject_p.h -@@ -160,6 +160,9 @@ public: +@@ -162,6 +162,9 @@ public: #ifdef QT3_SUPPORT void sendPendingChildInsertedEvents(); #endif @@ -40,7 +40,7 @@ =================================================================== --- src/gui/kernel/qwidget_p.h.orig +++ src/gui/kernel/qwidget_p.h -@@ -781,6 +781,7 @@ public: +@@ -782,6 +782,7 @@ public: static QWidget *keyboardGrabber; void setWindowRole(); @@ -52,7 +52,7 @@ =================================================================== --- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -843,13 +843,17 @@ void QWidgetPrivate::create_sys(WId wind +@@ -849,13 +849,17 @@ void QWidgetPrivate::create_sys(WId wind // declare the widget's window role @@ -76,7 +76,7 @@ } // set client leader property -@@ -3027,6 +3031,17 @@ void QWidgetPrivate::setWindowRole() +@@ -3014,6 +3018,17 @@ void QWidgetPrivate::setWindowRole() XChangeProperty(X11->display, q->internalWinId(), ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, (unsigned char *)windowRole.constData(), windowRole.length()); ++++++ 0195-compositing-properties.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -11,7 +11,7 @@ =================================================================== --- src/gui/kernel/qwidget_x11.cpp.orig +++ src/gui/kernel/qwidget_x11.cpp -@@ -768,6 +768,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -773,6 +773,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -23,7 +23,7 @@ } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -821,13 +826,21 @@ void QWidgetPrivate::create_sys(WId wind +@@ -827,13 +832,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -47,7 +47,7 @@ // declare the widget's window role if (QTLWExtra *topData = maybeTopData()) { -@@ -843,10 +856,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -849,10 +862,6 @@ void QWidgetPrivate::create_sys(WId wind XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&X11->wm_client_leader, 1); ++++++ aarch64-support.diff ++++++ Index: src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h =================================================================== --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -337,6 +337,13 @@ #endif /* ARM */ +/* CPU(AARCH64) - AArch64 */ +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 +#if defined(__AARCH64BE__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif /* ==== OS() - underlying operating system; only to be used for mandated low-level services like @@ -896,7 +903,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 Index: src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h =================================================================== --- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h @@ -369,6 +369,14 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif +/* CPU(AARCH64) - AArch64 */ +#if defined(__aarch64__) +#define WTF_CPU_AARCH64 1 +#if defined(__AARCH64BE__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +#endif + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -998,7 +1006,8 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ - || CPU(PPC64) + || CPU(PPC64) \ + || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 ++++++ build-qvfb-tool.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,6 +1,8 @@ ---- tools/tools.pro +Index: tools/tools.pro +=================================================================== +--- tools/tools.pro.orig +++ tools/tools.pro -@@ -34,6 +34,8 @@ +@@ -37,6 +37,8 @@ mac { embedded:SUBDIRS += kmap2qmap ++++++ check-return-value-of-qt_safe_pipe.patch ++++++ Index: qt-everywhere-opensource-src-4.8.4/src/corelib/io/qprocess_unix.cpp =================================================================== --- qt-everywhere-opensource-src-4.8.4.orig/src/corelib/io/qprocess_unix.cpp +++ qt-everywhere-opensource-src-4.8.4/src/corelib/io/qprocess_unix.cpp @@ -324,16 +324,18 @@ void QProcessManager::unlock() mutex.unlock(); } -static void qt_create_pipe(int *pipe) +static int qt_create_pipe(int *pipe) { if (pipe[0] != -1) qt_safe_close(pipe[0]); if (pipe[1] != -1) qt_safe_close(pipe[1]); - if (qt_safe_pipe(pipe) != 0) { + int pipe_ret = qt_safe_pipe(pipe); + if (pipe_ret != 0) { qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s", pipe, qPrintable(qt_error_string(errno))); } + return pipe_ret; } void QProcessPrivate::destroyPipe(int *pipe) @@ -365,7 +367,8 @@ bool QProcessPrivate::createChannel(Chan if (channel.type == Channel::Normal) { // we're piping this channel to our own process - qt_create_pipe(channel.pipe); + if (qt_create_pipe(channel.pipe) != 0) + return false; // create the socket notifiers if (threadData->eventDispatcher) { @@ -449,7 +452,8 @@ bool QProcessPrivate::createChannel(Chan Q_ASSERT(sink->pipe[0] == INVALID_Q_PIPE && sink->pipe[1] == INVALID_Q_PIPE); Q_PIPE pipe[2] = { -1, -1 }; - qt_create_pipe(pipe); + if (qt_create_pipe(pipe) != 0) + return false; sink->pipe[0] = pipe[0]; source->pipe[1] = pipe[1]; @@ -543,10 +547,15 @@ void QProcessPrivate::startProcess() // Initialize pipes if (!createChannel(stdinChannel) || !createChannel(stdoutChannel) || - !createChannel(stderrChannel)) + !createChannel(stderrChannel) || + qt_create_pipe(childStartedPipe) != 0 || + qt_create_pipe(deathPipe) != 0) { + processError = QProcess::FailedToStart; + q->setErrorString(qt_error_string(errno)); + emit q->error(processError); + cleanup(); return; - qt_create_pipe(childStartedPipe); - qt_create_pipe(deathPipe); + } if (threadData->eventDispatcher) { startupSocketNotifier = new QSocketNotifier(childStartedPipe[0], @@ -1335,10 +1344,15 @@ bool QProcessPrivate::startDetached(cons // To catch the startup of the child int startedPipe[2]; - qt_safe_pipe(startedPipe); + if (qt_safe_pipe(startedPipe) != 0) + return false; // To communicate the pid of the child int pidPipe[2]; - qt_safe_pipe(pidPipe); + if (qt_safe_pipe(pidPipe) != 0) { + qt_safe_close(startedPipe[0]); + qt_safe_close(startedPipe[1]); + return false; + } pid_t childPid = fork(); if (childPid == 0) { ++++++ handle-tga-files-properly.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,4 +1,6 @@ ---- src/plugins/imageformats/tga/qtgafile.cpp +Index: src/plugins/imageformats/tga/qtgafile.cpp +=================================================================== +--- src/plugins/imageformats/tga/qtgafile.cpp.orig +++ src/plugins/imageformats/tga/qtgafile.cpp @@ -41,6 +41,7 @@ @@ -8,7 +10,7 @@ #include <QtCore/QIODevice> #include <QtCore/QDebug> #include <QtCore/QDateTime> -@@ -264,3 +265,16 @@ QImage QTgaFile::readImage() +@@ -266,3 +267,16 @@ QImage QTgaFile::readImage() // TODO: add processing of TGA extension information - ie TGA 2.0 files return im; } @@ -25,7 +27,9 @@ + QTgaFile tga(&buffer); + return tga.isValid(); +} ---- src/plugins/imageformats/tga/qtgafile.h +Index: src/plugins/imageformats/tga/qtgafile.h +=================================================================== +--- src/plugins/imageformats/tga/qtgafile.h.orig +++ src/plugins/imageformats/tga/qtgafile.h @@ -93,6 +93,8 @@ public: inline QSize size() const; @@ -36,7 +40,9 @@ private: static inline quint16 littleEndianInt(const unsigned char *d); ---- src/plugins/imageformats/tga/qtgahandler.cpp +Index: src/plugins/imageformats/tga/qtgahandler.cpp +=================================================================== +--- src/plugins/imageformats/tga/qtgahandler.cpp.orig +++ src/plugins/imageformats/tga/qtgahandler.cpp @@ -77,8 +77,7 @@ bool QTgaHandler::canRead(QIODevice *dev qWarning("QTgaHandler::canRead() called with no device"); ++++++ libqt4-libtool-nodate.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- qmake/generators/unix/unixmake2.cpp.orig +++ qmake/generators/unix/unixmake2.cpp -@@ -1276,7 +1276,7 @@ UnixMakefileGenerator::writeLibtoolFile( +@@ -1301,7 +1301,7 @@ UnixMakefileGenerator::writeLibtoolFile( QTextStream t(&ft); t << "# " << lname << " - a libtool library file\n"; t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt " ++++++ no-moc-date.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/tools/moc/moc.cpp +Index: src/tools/moc/moc.cpp +=================================================================== +--- src/tools/moc/moc.cpp.orig +++ src/tools/moc/moc.cpp -@@ -738,9 +738,6 @@ void Moc::parse() +@@ -766,9 +766,6 @@ void Moc::parse() void Moc::generate(FILE *out) { @@ -10,7 +12,7 @@ QByteArray fn = filename; int i = filename.length()-1; while (i>0 && filename[i-1] != '/' && filename[i-1] != '\\') -@@ -749,8 +746,8 @@ void Moc::generate(FILE *out) +@@ -777,8 +774,8 @@ void Moc::generate(FILE *out) fn = filename.mid(i); fprintf(out, "/****************************************************************************\n" "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); @@ -21,7 +23,9 @@ fprintf(out, "** WARNING! All changes made in this file will be lost!\n" "*****************************************************************************/\n\n"); ---- src/tools/rcc/rcc.cpp +Index: src/tools/rcc/rcc.cpp +=================================================================== +--- src/tools/rcc/rcc.cpp.orig +++ src/tools/rcc/rcc.cpp @@ -732,7 +732,6 @@ bool RCCResourceLibrary::writeHeader() writeString("** Resource object code\n"); @@ -31,7 +35,9 @@ writeString("\n** by: The Resource Compiler for Qt version "); writeByteArray(QT_VERSION_STR); writeString("\n**\n"); ---- src/tools/uic/uic.cpp +Index: src/tools/uic/uic.cpp +=================================================================== +--- src/tools/uic/uic.cpp.orig +++ src/tools/uic/uic.cpp @@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui out << "/********************************************************************************\n"; @@ -42,9 +48,11 @@ out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); out << "**\n"; out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; ---- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +Index: tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp +=================================================================== +--- tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp.orig +++ tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp -@@ -520,9 +520,11 @@ static void writeProxy(const QString &fi +@@ -549,9 +549,11 @@ static void writeProxy(const QString &fi } else { includeGuard = QLatin1String("QDBUSXML2CPP_PROXY"); } @@ -56,7 +64,7 @@ hs << "#ifndef " << includeGuard << endl << "#define " << includeGuard << endl << endl; -@@ -826,9 +828,11 @@ static void writeAdaptor(const QString & +@@ -855,9 +857,11 @@ static void writeAdaptor(const QString & } else { includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR"); } ++++++ plastik-default.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -31,7 +31,7 @@ =================================================================== --- src/gui/kernel/qapplication_x11.cpp.orig +++ src/gui/kernel/qapplication_x11.cpp -@@ -2297,12 +2297,23 @@ void qt_init(QApplicationPrivate *priv, +@@ -2321,12 +2321,23 @@ void qt_init(QApplicationPrivate *priv, int rc; do { @@ -60,7 +60,7 @@ =================================================================== --- src/gui/kernel/qt_x11_p.h.orig +++ src/gui/kernel/qt_x11_p.h -@@ -684,6 +684,8 @@ struct QX11Data +@@ -689,6 +689,8 @@ struct QX11Data XTabletStylus, XTabletEraser, ++++++ qatomic-generic.patch ++++++ Index: qt-everywhere-opensource-src-4.8.4/src/corelib/arch/qatomic_generic.h =================================================================== --- qt-everywhere-opensource-src-4.8.4.orig/src/corelib/arch/qatomic_generic.h +++ qt-everywhere-opensource-src-4.8.4/src/corelib/arch/qatomic_generic.h @@ -109,6 +109,16 @@ Q_CORE_EXPORT bool QBasicAtomicPointer_t Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *); Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff); +inline bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value, const void *expected_value, const void *newValue) +{ + return QBasicAtomicPointer_testAndSetOrdered(_q_value, const_cast<void *>(expected_value), const_cast<void *>(newValue)); +} + +inline void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *_q_value, const void *newValue) +{ + return QBasicAtomicPointer_fetchAndStoreOrdered(_q_value, const_cast<void *>(newValue)); +} + // Reference counting inline bool QBasicAtomicInt::ref() ++++++ qfatal-noreturn.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/corelib/global/qglobal.h +Index: src/corelib/global/qglobal.h +=================================================================== +--- src/corelib/global/qglobal.h.orig +++ src/corelib/global/qglobal.h -@@ -1635,6 +1635,7 @@ Q_CORE_EXPORT void qCritical(const char +@@ -1764,6 +1764,7 @@ Q_CORE_EXPORT void qCritical(const char Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */ #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) ++++++ qt-debug-timer.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,6 +1,8 @@ ---- src/corelib/kernel/qeventdispatcher_unix.cpp +Index: src/corelib/kernel/qeventdispatcher_unix.cpp +=================================================================== +--- src/corelib/kernel/qeventdispatcher_unix.cpp.orig +++ src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -575,6 +575,21 @@ int QTimerInfoList::activateTimers() +@@ -593,6 +593,21 @@ int QTimerInfoList::activateTimers() if (!firstTimerInfo) { firstTimerInfo = currentTimerInfo; ++++++ qt-never-strip.diff ++++++ --- /var/tmp/diff_new_pack.s3HRA8/_old 2013-03-22 11:50:19.000000000 +0100 +++ /var/tmp/diff_new_pack.s3HRA8/_new 2013-03-22 11:50:19.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure 2012/10/26 06:55:02 1.1 -+++ configure 2012/10/26 06:55:54 -@@ -65,7 +65,6 @@ +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -65,7 +65,6 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s, # initialize global variables QMAKE_SWITCHES= @@ -8,7 +10,7 @@ QMAKE_CONFIG= QTCONFIG_CONFIG= QT_CONFIG= -@@ -1609,7 +1608,7 @@ +@@ -1619,7 +1618,7 @@ while [ "$#" -gt 0 ]; do QMakeVar add QMAKE_CFLAGS -pg QMakeVar add QMAKE_CXXFLAGS -pg QMakeVar add QMAKE_LFLAGS -pg @@ -17,7 +19,7 @@ else UNKNOWN_OPT=yes fi -@@ -3330,6 +3329,8 @@ +@@ -3354,6 +3353,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then fi fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
