From 95ac70bb944c241b7665cb123295c8334d9fdc6d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 1 Mar 2013 13:37:15 +0100 Subject: [PATCH] Qt: Remove package. This is not needed anymore because we are moving with our installer to GTK. --- .../qt-4.8.0-CVE-2011-3922-bz#772125.patch | 12 -- .../qt-4.8.1-fix-no-xshape-broken-build.patch | 51 ------ qt/patches/qt-4.8.1-webkit-no_Werror.patch | 12 -- ...everywhere-opensource-src-4.6.2-cups.patch | 84 ---------- ...e-src-4.6.3-glib_eventloop_nullcheck.patch | 69 -------- ...nsource-src-4.7.0-beta2-mysql_config.patch | 19 --- ...ere-opensource-src-4.7.1-QTBUG-14467.patch | 27 ---- ...rce-src-4.7.4-tds_no_strict_aliasing.patch | 12 -- ...ere-opensource-src-4.8.0-QTBUG-14724.patch | 11 -- ...ere-opensource-src-4.8.0-QTBUG-21900.patch | 101 ------------ ...ere-opensource-src-4.8.0-QTBUG-22037.patch | 41 ----- ...here-opensource-src-4.8.0-beta1-s390.patch | 31 ---- ...rywhere-opensource-src-4.8.0-gcc-4.7.patch | 27 ---- ...rywhere-opensource-src-4.8.0-ld-gold.patch | 22 --- ...everywhere-opensource-src-4.8.0-qvfb.patch | 12 -- ...pensource-src-4.8.0-rc1-moc-boost148.patch | 11 -- ...ere-opensource-src-4.8.0-s390-atomic.patch | 20 --- ...where-opensource-src-4.8.0-timestamp.patch | 75 --------- ...ource-src-4.8.0-tp-multilib-optflags.patch | 36 ----- ...4.8.0-tp-qtreeview-kpackagekit-crash.patch | 12 -- ...ere-opensource-src-4.8.1-QTBUG-24718.patch | 14 -- ...re-opensource-src-4.8.1-icu_no_debug.patch | 23 --- ...nsource-src-4.8.1-linguist_qmake-qt4.patch | 24 --- ...e-src-4.8.1-qdbusconnection_no_debug.patch | 14 -- ...ource-src-4.8.1-qt3support_debuginfo.patch | 10 -- ...here-opensource-src-4.8.1-qtgahandle.patch | 53 ------- ...everywhere-opensource-src-4.8.1-type.patch | 26 --- ...rce-src-4.5.0-fix-qatomic-inline-asm.patch | 50 ------ ...source-src-4.5.1-enable_ft_lcdfilter.patch | 12 -- qt/qt.nm | 150 ------------------ 30 files changed, 1061 deletions(-) delete mode 100644 qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch delete mode 100644 qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch delete mode 100644 qt/patches/qt-4.8.1-webkit-no_Werror.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch delete mode 100644 qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch delete mode 100644 qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch delete mode 100644 qt/qt.nm diff --git a/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch b/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch deleted file mode 100644 index 31f3b9fba..000000000 --- a/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c.bz#772125 2012-01-09 10:16:08.000000000 +0100 -+++ qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c 2012-01-09 10:16:47.000000000 +0100 -@@ -359,7 +359,8 @@ - if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) { - reordered[len] = Mymr_C_NGA; - reordered[len+1] = Mymr_C_VIRAMA; -- properties[len-1] = AboveForm; -+ if (len > 0) -+ properties[len-1] = AboveForm; - properties[len] = AboveForm; - len += 2; - kinzi = -1; diff --git a/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch b/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch deleted file mode 100644 index c4a445310..000000000 --- a/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nur a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp ---- a/src/gui/kernel/qdnd_x11.cpp 2012-03-14 15:01:16.000000000 +0100 -+++ b/src/gui/kernel/qdnd_x11.cpp 2012-05-20 17:19:38.992247206 +0200 -@@ -1422,6 +1422,7 @@ - global_accepted_action = Qt::IgnoreAction; - } - -+#ifndef QT_NO_SHAPE - static - bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) - { -@@ -1436,6 +1437,7 @@ - } - return interacts; - } -+#endif - - static - Window findRealWindow(const QPoint & pos, Window w, int md) -@@ -1462,6 +1464,8 @@ - XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False, - AnyPropertyType, &type, &f,&n,&a,&data); - if (data) XFree(data); -+ -+#ifndef QT_NO_SHAPE - if (type) { - // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we - // need an && here so that in the case one is set and the other is not we still get the correct result. -@@ -1469,6 +1473,9 @@ - if (windowContainsMouse) - return w; - } -+#else -+ return w; -+#endif - } - - Window r, p; -@@ -1488,10 +1495,12 @@ - // innermost window. - } - -+#ifndef QT_NO_SHAPE - // No children! - if (!windowContainsMouse) - return 0; - else -+#endif - return w; - } - } diff --git a/qt/patches/qt-4.8.1-webkit-no_Werror.patch b/qt/patches/qt-4.8.1-webkit-no_Werror.patch deleted file mode 100644 index ef5d55d5e..000000000 --- a/qt/patches/qt-4.8.1-webkit-no_Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri ---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200 -@@ -102,8 +102,6 @@ CONFIG -= warn_on - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -- - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). diff --git a/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch deleted file mode 100644 index e0305e11b..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 -@@ -569,6 +569,32 @@ - void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) - { - options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); -+ -+ if (cups) { -+ const ppd_option_t* duplex = cups->ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ options.duplexShort->setChecked(true); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ options.duplexLong->setChecked(true); -+ else -+ options.noDuplex->setChecked(true); -+ } -+ -+ if (cups->currentPPD()) { -+ // set default color -+ if (cups->currentPPD()->color_device) -+ options.color->setChecked(true); -+ else -+ options.grayscale->setChecked(true); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups->ppdOption("Collate"); -+ if (collate) -+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); -+ } - } - #endif - -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 -@@ -627,6 +627,44 @@ - && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { - setOutputFormat(QPrinter::PdfFormat); - } -+ -+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -+ // fill in defaults from ppd file -+ QCUPSSupport cups; -+ -+ int printernum = -1; -+ for (int i = 0; i < cups.availablePrintersCount(); i++) { -+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) -+ printernum = i; -+ } -+ if (printernum >= 0) { -+ cups.setCurrentPrinter(printernum); -+ -+ const ppd_option_t* duplex = cups.ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ setDuplex(DuplexShortSide); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ setDuplex(DuplexLongSide); -+ else -+ setDuplex(DuplexNone); -+ } -+ -+ if (cups.currentPPD()) { -+ // set default color -+ if (cups.currentPPD()->color_device) -+ setColorMode(Color); -+ else -+ setColorMode(GrayScale); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups.ppdOption("Collate"); -+ if (collate) -+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); -+ } -+#endif - } - - /*! diff --git a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch deleted file mode 100644 index d4e5924df..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp ---- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-02 04:03:15.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-12-08 22:22:38.000000000 +0100 -@@ -76,7 +76,7 @@ - GX11EventSource *source = reinterpret_cast(s); - return (XEventsQueued(X11->display, QueuedAfterFlush) - || (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty())); -+ && source->d && !source->d->queuedUserInputEvents.isEmpty())); - } - - static gboolean x11EventSourceCheck(GSource *s) -@@ -84,7 +84,7 @@ - GX11EventSource *source = reinterpret_cast(s); - return (XEventsQueued(X11->display, QueuedAfterFlush) - || (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty())); -+ && source->d && !source->d->queuedUserInputEvents.isEmpty())); - } - - static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data) -@@ -95,7 +95,7 @@ - do { - XEvent event; - if (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty()) { -+ && source->d && !source->d->queuedUserInputEvents.isEmpty()) { - // process a pending user input event - event = source->d->queuedUserInputEvents.takeFirst(); - } else if (XEventsQueued(X11->display, QueuedAlready)) { -@@ -112,7 +112,8 @@ - case XKeyRelease: - case EnterNotify: - case LeaveNotify: -- source->d->queuedUserInputEvents.append(event); -+ if (source->d) -+ source->d->queuedUserInputEvents.append(event); - continue; - - case ClientMessage: -@@ -127,7 +128,8 @@ - break; - } - } -- source->d->queuedUserInputEvents.append(event); -+ if (source->d) -+ source->d->queuedUserInputEvents.append(event); - continue; - - default: -@@ -140,7 +142,7 @@ - } - - // send through event filter -- if (source->q->filterEvent(&event)) -+ if (source->q && source->q->filterEvent(&event)) - continue; - - if (qApp->x11ProcessEvent(&event) == 1) -@@ -152,7 +154,8 @@ - - out: - -- source->d->runTimersOnceWithNormalPriority(); -+ if (source->d) -+ source->d->runTimersOnceWithNormalPriority(); - - if (callback) - callback(user_data); diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch deleted file mode 100644 index 47c066b5f..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure ---- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500 -@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config` - if [ -x "$CFG_MYSQL_CONFIG" ]; then - QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` -+ $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ -+ QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -+ if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then -+ QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r" -+ QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient" -+ else - QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` - QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` -+ fi - QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` - QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` - fi diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch b/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch deleted file mode 100644 index 1283f5008..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch +++ /dev/null @@ -1,27 +0,0 @@ - -Fails to create debug build of Qt projects on mingw -http://bugzilla.redhat.com/653674 -http://bugreports.qt.nokia.com/browse/QTBUG-14467 - ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf.orig 2010-11-16 03:12:17.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf 2010-11-16 03:12:50.000000000 +0500 -@@ -62,7 +62,7 @@ defineTest(qtAddLibrary) { - } - isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d -+ win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} - mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug - } - isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf.orig 2010-11-16 03:11:34.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf 2010-11-16 03:11:51.000000000 +0500 -@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ - - qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain): { -- CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d -+ CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} - else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} - } else { - QMAKE_LIBS += $${entryLib} diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch b/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch deleted file mode 100644 index b675929f5..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri ---- qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing 2011-09-12 01:49:28.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri 2011-11-03 13:04:34.271086323 -0500 -@@ -1,6 +1,8 @@ - HEADERS += $$PWD/qsql_tds.h - SOURCES += $$PWD/qsql_tds.cpp - -+*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing -+ - unix|win32-g++*: { - LIBS *= $$QT_LFLAGS_TDS - !contains(LIBS, .*sybdb.*):LIBS += -lsybdb diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch deleted file mode 100644 index 3672ca76c..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp ---- qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 2011-10-03 22:44:31.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp 2011-10-17 10:55:49.713265396 -0500 -@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev - cupsTempFile = ret.second; - outDevice = new QFile(); - static_cast(outDevice)->open(ret.first, QIODevice::WriteOnly); -+ fd = ret.first; - #endif - #ifndef QT_NO_LPR - } else { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch deleted file mode 100644 index 29fc82e0a..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch +++ /dev/null @@ -1,101 +0,0 @@ -From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Mon, 17 Oct 2011 17:27:43 -0400 -Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions - can be trusted - -When reading ahead in the queue for ConfigureNotify events, it's necessary -to look for intermediate ReparentNotify events as well, since they will -determine whether the position in the event can be trusted or not. ---- - src/gui/kernel/qapplication_x11.cpp | 47 ++++++++++++++++++++++++++++++---- - 1 files changed, 41 insertions(+), 6 deletions(-) - -diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp -index 408e9ac..3a1d3eb 100644 ---- a/src/gui/kernel/qapplication_x11.cpp -+++ b/src/gui/kernel/qapplication_x11.cpp -@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Display*, XEvent *event, XPointer arg) - #endif - #endif // QT_NO_XSYNC - -+struct qt_configure_event_data -+{ -+ WId window; -+ WId parent; -+}; -+ -+static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg) -+{ -+ qt_configure_event_data *data = -+ reinterpret_cast(arg); -+ if (event->type == ConfigureNotify && -+ event->xconfigure.window == data->window) { -+ return true; -+ } else if (event->type == ReparentNotify && -+ event->xreparent.window == data->window) { -+ data->parent = event->xreparent.parent; -+ } -+ -+ return false; -+} -+ - static void qt_x11_create_intern_atoms() - { - const char *names[QX11Data::NAtoms]; -@@ -5273,8 +5294,11 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - if (d->extra->compress_events) { - // ConfigureNotify compression for faster opaque resizing - XEvent otherEvent; -- while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, -- &otherEvent)) { -+ qt_configure_event_data configureData; -+ configureData.window = internalWinId(); -+ configureData.parent = d->topData()->parentWinId; -+ while (XCheckIfEvent(X11->display, &otherEvent, -+ &qt_configure_event_scanner, (XPointer)&configureData)) { - if (qt_x11EventFilter(&otherEvent)) - continue; - -@@ -5287,13 +5311,19 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - newSize.setWidth(otherEvent.xconfigure.width); - newSize.setHeight(otherEvent.xconfigure.height); - -+ trust = isVisible() -+ && (configureData.parent == XNone || -+ configureData.parent == QX11Info::appRootWindow()); -+ - if (otherEvent.xconfigure.send_event || trust) { - newCPos.rx() = otherEvent.xconfigure.x + - otherEvent.xconfigure.border_width; - newCPos.ry() = otherEvent.xconfigure.y + - otherEvent.xconfigure.border_width; - isCPos = true; -- } -+ } else { -+ isCPos = false; -+ } - } - #ifndef QT_NO_XSYNC - qt_sync_request_event_data sync_event; -@@ -5306,9 +5336,14 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - } - - if (!isCPos) { -- // we didn't get an updated position of the toplevel. -- // either we haven't moved or there is a bug in the window manager. -- // anyway, let's query the position to be certain. -+ // If the last configure event didn't have a trustable position, -+ // it's necessary to query, see ICCCM 4.24: -+ // -+ // Any real ConfigureNotify event on a top-level window implies -+ // that the window’s position on the root may have changed, even -+ // though the event reports that the window’s position in its -+ // parent is unchanged because the window may have been reparented. -+ - int x, y; - Window child; - XTranslateCoordinates(X11->display, internalWinId(), --- -1.7.6.4 - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch deleted file mode 100644 index 4279ce2e7..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h ---- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 2011-10-03 22:44:32.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h 2011-10-15 14:25:52.238694974 -0500 -@@ -769,26 +769,18 @@ Q_OUTOFLINE_TEMPLATE void QList::clea - template - Q_OUTOFLINE_TEMPLATE int QList::removeAll(const T &_t) - { -- int index = indexOf(_t); -- if (index == -1) -- return 0; -- -+ detachShared(); - const T t = _t; -- detach(); -- -- Node *i = reinterpret_cast(p.at(index)); -- Node *e = reinterpret_cast(p.end()); -- Node *n = i; -- node_destruct(i); -- while (++i != e) { -- if (i->t() == t) -- node_destruct(i); -- else -- *n++ = *i; -- } -- -- int removedCount = e - n; -- d->end -= removedCount; -+ int removedCount=0, i=0; -+ Node *n; -+ while (i < p.size()) -+ if ((n = reinterpret_cast(p.at(i)))->t() == t) { -+ node_destruct(n); -+ p.remove(i); -+ ++removedCount; -+ } else { -+ ++i; -+ } - return removedCount; - } - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch deleted file mode 100644 index 5f0bbf839..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2011-07-28 11:12:48.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2011-07-28 11:13:56.000000000 +0200 -@@ -189,6 +189,18 @@ - #define WTF_CPU_SPARC 1 - #endif - -+/* CPU(S390X) - S390 64-bit */ -+#if defined(__s390x__) -+#define WTF_CPU_S390X 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ -+/* CPU(S390) - S390 32-bit */ -+#if defined(__s390__) -+#define WTF_CPU_S390 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ - /* CPU(X86) - i386 / x86 32-bit */ - #if defined(__i386__) \ - || defined(i386) \ -@@ -873,7 +885,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) -+#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) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch deleted file mode 100644 index 62c436e6a..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 -@@ -57,9 +57,7 @@ namespace JSC { - - class JSGlobalObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 -@@ -32,8 +32,7 @@ namespace JSC{ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch deleted file mode 100644 index 0e3897e98..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch deleted file mode 100644 index 2fffb8abb..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro ---- qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb 2011-12-27 21:02:19.765512041 -0600 -+++ qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro 2011-12-27 21:02:39.271268187 -0600 -@@ -38,8 +38,6 @@ SOURCES = qvfb.cpp \ - - !embedded { - DEFINES += QT_NO_QWS_SIGNALHANDLER -- HEADERS += ../../src/gui/embedded/qlock_p.h -- SOURCES += ../../src/gui/embedded/qlock.cpp - } - - include(../shared/deviceskin/deviceskin.pri) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch deleted file mode 100644 index f0ce6564e..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 05:44:32.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp 2011-12-04 00:11:25.000000000 +0100 -@@ -187,6 +187,7 @@ - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch deleted file mode 100644 index 6fedcc810..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h ---- qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic 2011-12-18 16:15:20.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h 2011-12-18 16:17:34.000000000 +0100 -@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer - - - template -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) -+{ -+#ifndef __s390x__ -+ return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0\n"); -+#else -+ return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0\n"); -+#endif -+} -+ -+template - Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddRelaxed(qptrdiff valueToAdd) - { - return fetchAndAddOrdered(valueToAdd); diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch deleted file mode 100644 index 23073530b..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp 2012-02-20 15:17:27.343005746 +0100 -@@ -152,8 +152,12 @@ void Ui3Reader::embed(const char *projec - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; -+#else -+ out << "** Created by: " << QT_VERSION_STR << "\n"; -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp 2012-02-20 15:20:13.584706037 +0100 -@@ -146,8 +146,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp 2012-02-20 15:13:44.175462520 +0100 -@@ -139,8 +139,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me 2012-02-20 13:22:38.572628193 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp 2012-02-20 14:46:09.981860726 +0100 -@@ -767,8 +767,10 @@ void Moc::parse() - void Moc::generate(FILE *out) - { - -+#ifdef TIMESTAMP - QDateTime dt = QDateTime::currentDateTime(); - QByteArray dstr = dt.toString().toLatin1(); -+#endif - QByteArray fn = filename; - int i = filename.length()-1; - while (i>0 && filename[i-1] != '/' && filename[i-1] != '\\') -@@ -777,8 +779,12 @@ 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); -+#ifdef TIMESTAMP - fprintf(out, "** Created: %s\n" - "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); -+#else -+ fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); -+#endif - fprintf(out, "** WARNING! All changes made in this file will be lost!\n" - "*****************************************************************************/\n\n"); - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch deleted file mode 100644 index 5c8b5a1dd..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf 2011-05-25 13:39:38.789054074 +0200 -@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf 2011-05-25 13:39:47.460747770 +0200 -@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf 2011-05-25 13:39:26.630088814 +0200 -@@ -9,6 +9,8 @@ CONFIG += qt warn_on release increment - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch deleted file mode 100644 index 947f7582d..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp ---- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp 2011-05-25 13:24:33.137315194 +0200 -@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite - return defaultItemHeight; - if (viewItems.isEmpty()) - return 0; -- const QModelIndex &index = viewItems.at(item).index; -+ QModelIndex index = viewItems.at(item).index; - if (!index.isValid()) - return 0; - int height = viewItems.at(item).height; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch deleted file mode 100644 index 003a0a65a..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp ---- qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 2012-03-14 15:01:14.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp 2012-04-03 10:53:12.973058622 +0200 -@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo - int pos = *cursorPos; - int itm; - const HB_CharAttributes *attributes = eng->attributes(); -+ if (!attributes) { -+ *cursorPos = 0; -+ return x.toReal(); -+ } - while (pos < line.from + line.length && !attributes[pos].charStop) - pos++; - if (pos == line.from + (int)line.length) { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch deleted file mode 100644 index ddf318414..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp ---- qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam 2012-03-14 09:01:17.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp 2012-04-17 07:30:01.652251482 -0500 -@@ -83,7 +83,9 @@ bool qt_initIcu(const QString &localeStr - // resolve libicui18n - QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!lib.load()) { -+#ifndef QT_NO_DEBUG - qWarning() << "Unable to load library icui18n" << lib.errorString(); -+#endif - status = ErrorLoading; - return false; - } -@@ -112,7 +114,9 @@ bool qt_initIcu(const QString &localeStr - // resolve libicuuc - QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!ucLib.load()) { -+#ifndef QT_NO_DEBUG - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); -+#endif - status = ErrorLoading; - return false; - } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch deleted file mode 100644 index 91faedac7..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp ---- qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp 2012-05-11 08:58:12.902149676 -0500 -@@ -316,7 +316,7 @@ int main(int argc, char **argv) - #ifdef QT_BOOTSTRAPPED - option.initProperties(binDir + QLatin1String("/qmake")); - #else -- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); -+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); - #endif - ProFileParser parser(0, &parseHandler); - ProFileEvaluator visitor(&option, &parser, &evalHandler); -diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp ---- qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp 2012-05-11 09:02:47.393718054 -0500 -@@ -765,7 +765,7 @@ int main(int argc, char **argv) - - parseHandler.verbose = evalHandler.verbose = !!(options & Verbose); - ProFileOption option; -- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); -+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); - option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run")); - ProFileParser parser(0, &parseHandler); - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch deleted file mode 100644 index 8d60dabe9..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp ---- qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug 2012-04-17 07:18:51.536629078 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp 2012-04-17 07:18:56.910561895 -0500 -@@ -1109,8 +1109,10 @@ public: - // make sure this connection is running on the main thread - QCoreApplication *instance = QCoreApplication::instance(); - if (!instance) { -+#ifndef QT_NO_DEBUG - qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", - type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); -+#endif - } else { - QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); - } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch deleted file mode 100644 index 745831467..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro ---- qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo 2012-03-14 09:01:17.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro 2012-05-11 11:55:37.780070386 -0500 -@@ -34,6 +34,3 @@ MOCDIR = .moc - - *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing - --CONFIG -= separate_debug_info --CONFIG += no_debug_info -- diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch deleted file mode 100644 index 64ffef338..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me 2012-03-30 21:54:59.921331145 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp 2012-03-30 21:58:14.516042067 +0200 -@@ -41,6 +41,7 @@ - - #include "qtgafile.h" - -+#include - #include - #include - #include -@@ -264,3 +265,16 @@ QImage QTgaFile::readImage() - // TODO: add processing of TGA extension information - ie TGA 2.0 files - return im; - } -+/** -+ * Checks if device contains a valid tga image, *without* changing device -+ * position. -+ */ -+bool QTgaFile::canRead(QIODevice *device) -+{ -+ QByteArray header = device->peek(HeaderSize); -+ if (header.size() < HeaderSize) -+ return false; -+ QBuffer buffer(&header); -+ QTgaFile tga(&buffer); -+ return tga.isValid(); -+} -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me 2012-03-30 21:58:39.670023189 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h 2012-03-30 21:59:06.202317384 +0200 -@@ -93,6 +93,8 @@ public: - inline QSize size() const; - inline Compression compression() const; - -+ static bool canRead(QIODevice *device); -+ - private: - static inline quint16 littleEndianInt(const unsigned char *d); - -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me 2012-03-30 21:59:17.373303356 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp 2012-03-30 22:00:13.817226439 +0200 -@@ -77,8 +77,7 @@ bool QTgaHandler::canRead(QIODevice *dev - qWarning("QTgaHandler::canRead() called with no device"); - return false; - } -- QTgaFile tga(device); -- return tga.isValid(); -+ return QTgaFile::canRead(device); - } - - bool QTgaHandler::read(QImage *image) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch deleted file mode 100644 index 99aafbe40..000000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp ---- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me 2012-05-16 14:45:30.542709580 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp 2012-05-16 14:49:02.266017265 +0200 -@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead - + sizeof(qelfaddr_t); // sh_addr - sh->offset = read(data); - data += sizeof(qelfoff_t); // sh_offset -- sh->size = read(data); -- data += sizeof(qelfword_t); // sh_size -+ sh->size = read(data); -+ data += sizeof(qelfoff_t); // sh_size - return data; - } - -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h ---- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me 2012-05-16 14:45:41.006724793 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h 2012-05-16 14:47:49.017910811 +0200 -@@ -80,7 +80,7 @@ public: - qelfword_t name; - qelfword_t type; - qelfoff_t offset; -- qelfword_t size; -+ qelfoff_t size; - }; - - int m_endian; diff --git a/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch deleted file mode 100644 index e5ab4bad9..000000000 --- a/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h ---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h 2009-02-25 22:09:21.000000000 +0100 -+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h 2009-04-01 17:54:21.000000000 +0200 -@@ -115,8 +115,8 @@ - asm volatile("lock\n" - "incl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -@@ -127,8 +127,8 @@ - asm volatile("lock\n" - "decl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h ---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h 2009-02-25 22:09:21.000000000 +0100 -+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h 2009-04-01 17:54:32.000000000 +0200 -@@ -116,8 +116,8 @@ - asm volatile("lock\n" - "incl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -@@ -128,8 +128,8 @@ - asm volatile("lock\n" - "decl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } diff --git a/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch deleted file mode 100644 index 4ab3ea4b1..000000000 --- a/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp ---- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter 2009-04-21 18:57:41.000000000 -0500 -+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp 2009-04-24 11:17:49.562695405 -0500 -@@ -72,7 +72,7 @@ - #include FT_CONFIG_OPTIONS_H - #endif - --#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING) -+#if defined(FT_LCD_FILTER_H) - #define QT_USE_FREETYPE_LCDFILTER - #endif - diff --git a/qt/qt.nm b/qt/qt.nm deleted file mode 100644 index 8d3f2413e..000000000 --- a/qt/qt.nm +++ /dev/null @@ -1,150 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -name = qt -version = 4.8.1 -release = 1 - -groups = System/Libraries -url = http://qt-project.org/ -license = LGPLv2 with exceptions or GPLv3 with exceptions -summary = Qt toolkit. - -description - Qt is a software toolkit for developing applications. -end - -source_dl = http://releases.qt-project.org/qt4/source/ -sources = %{name}-everywhere-opensource-src-%{version}.tar.gz - -build - requires - /usr/bin/perl - fontconfig-devel - freetype-devel - gcc-c++ - libjpeg-devel - libmng-devel - libpng-devel - libtiff-devel - libX11-devel - libXext-devel - libXfixes-devel - libXrandr-devel - libXrender-devel - libXi-devel - openssl-devel - pcre-devel - pkg-config - xorg-x11-proto-devel - zlib-devel - end - - DIR_APP = %{DIR_SRC}/%{name}-everywhere-opensource-src-%{version} - - configure_options = -v \ - -prefix /usr \ - -libdir %{libdir} \ - -datadir %{datadir}/qt4 \ - -headerdir %{includedir} \ - -plugindir %{libdir}/qt4/plugins \ - -translationdir %{datadir}/qt4/translations \ - -confirm-license \ - -fontconfig \ - -largefile \ - -opensource \ - -reduce-relocations \ - -release \ - -shared \ - -no-audio-backend \ - -no-dbus \ - -no-gtkstyle \ - -no-cups \ - -no-javascript-jit \ - -no-multimedia \ - -no-nas-sound \ - -no-nis \ - -no-opengl \ - -no-openvg \ - -no-qt3support \ - -no-pch \ - -no-phonon \ - -no-phonon-backend \ - -no-rpath \ - -no-script \ - -no-scripttools \ - -no-separate-debug-info \ - -no-sm \ - -no-sql-db2 \ - -no-sql-ibase \ - -no-sql-mysql \ - -no-sql-oci \ - -no-sql-odbc \ - -no-sql-psql \ - -no-sql-sqlite \ - -no-sql-sqlite2 \ - -no-sql-sqlite_symbian \ - -no-sql-tds \ - -no-stl \ - -no-svg \ - -no-webkit \ - -no-xinerama \ - -no-xshape \ - -no-xsync \ - -no-xvideo \ - -no-mmx \ - -no-sse \ - -no-sse2 \ - -no-sse3 \ - -no-ssse3 \ - -no-sse4.1 \ - -no-sse4.2 \ - -no-3dnow \ - -system-libjpeg \ - -system-libmng \ - -system-libpng \ - -system-libtiff \ - -system-zlib \ - -openssl-linked \ - -nomake demos \ - -nomake docs \ - -nomake examples - - prepare_cmds - sed -e "s/-O2/%{CFLAGS}/g" -i mkspecs/*/qmake.conf - - # Disable the strip command to get a useful debuginfo package. - sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf - end - - install - make install INSTALL_ROOT=%{BUILDROOT} - end -end - -packages - package %{name} - - package %{name}-libs - template LIBS - - files += %{libdir}/qt4/plugins - files += %{datadir}/qt4/phrasebooks - files += %{datadir}/qt4/translations - end - - package %{name}-devel - template DEVEL - - files += %{libdir}/*.prl - files += %{libdir}/qt4/q3porting.xml - files += %{libdir}/qt4/*.prl - files += %{datadir}/qt4/mkspecs - end - - package %{name}-debuginfo - template DEBUGINFO - end -end -- 2.39.5