- fix bz#562049, bn-IN Incorrect rendering
- fix bz#562058, bn_IN init feature is not applied properly - fix bz#631732, indic invalid syllable's are not recognized properly - fix bz#636399, oriya script open type features are not applied properly
This commit is contained in:
Than Ngo
parent
a6175d5a7a
commit
47854b6b60
|
|
@ -1,117 +0,0 @@
|
|||
From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
|
||||
From: Lubos Lunak <l.lunak@kde.org>
|
||||
Date: Sat, 23 Feb 2008 16:44:52 +0100
|
||||
Subject: [PATCH 01/13] This patch uses object name as a fallback for window role if no window
|
||||
role is set explicitly using setWindowRole(). Since Qt3 always used
|
||||
the object name as the window role and most Qt3/KDE3 code is ported to
|
||||
call setObjectName(),
|
||||
|
||||
this makes the window role set in many cases (which KWin uses for window identifying).
|
||||
|
||||
NOTE: It is suggested to apply patch #0209 as well when this patch is used.
|
||||
|
||||
qt-bugs@ issue : 167704
|
||||
Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
|
||||
---
|
||||
src/corelib/kernel/qobject.cpp | 8 ++++++++
|
||||
src/corelib/kernel/qobject_p.h | 3 +++
|
||||
src/gui/kernel/qwidget_p.h | 1 +
|
||||
src/gui/kernel/qwidget_x11.cpp | 27 +++++++++++++++++++++------
|
||||
4 files changed, 33 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
|
||||
index 6487194..ef0369e 100644
|
||||
--- a/src/corelib/kernel/qobject.cpp
|
||||
+++ b/src/corelib/kernel/qobject.cpp
|
||||
@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
|
||||
{
|
||||
Q_D(QObject);
|
||||
d->objectName = name;
|
||||
+#if defined(Q_WS_X11)
|
||||
+ d->checkWindowRole();
|
||||
+#endif
|
||||
}
|
||||
|
||||
+#if defined(Q_WS_X11)
|
||||
+void QObjectPrivate::checkWindowRole()
|
||||
+{
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#ifdef QT3_SUPPORT
|
||||
/*! \internal
|
||||
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
|
||||
index 0bcccba..6ab9e10 100644
|
||||
--- a/src/corelib/kernel/qobject_p.h
|
||||
+++ b/src/corelib/kernel/qobject_p.h
|
||||
@@ -144,6 +144,9 @@ public:
|
||||
mutable quint32 connectedSignals;
|
||||
|
||||
QString objectName;
|
||||
+#if defined(Q_WS_X11)
|
||||
+ virtual void checkWindowRole();
|
||||
+#endif
|
||||
|
||||
// Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
|
||||
struct Connection
|
||||
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
|
||||
index 774e390..176d6fa 100644
|
||||
--- a/src/gui/kernel/qwidget_p.h
|
||||
+++ b/src/gui/kernel/qwidget_p.h
|
||||
@@ -358,6 +358,7 @@ public:
|
||||
|
||||
#if defined(Q_WS_X11)
|
||||
void setWindowRole();
|
||||
+ virtual void checkWindowRole();
|
||||
void sendStartupMessage(const char *message) const;
|
||||
void setNetWmWindowTypes();
|
||||
void x11UpdateIsOpaque();
|
||||
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
|
||||
index 79ee8c9..b56849c 100644
|
||||
--- a/src/gui/kernel/qwidget_x11.cpp
|
||||
+++ b/src/gui/kernel/qwidget_x11.cpp
|
||||
@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
|
||||
data.fstrut_dirty = 1;
|
||||
|
||||
// declare the widget's window role
|
||||
+ QByteArray windowRole;
|
||||
if (QTLWExtra *topData = maybeTopData()) {
|
||||
- if (!topData->role.isEmpty()) {
|
||||
- QByteArray windowRole = topData->role.toUtf8();
|
||||
- XChangeProperty(dpy, id,
|
||||
- ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
|
||||
- (unsigned char *)windowRole.constData(), windowRole.length());
|
||||
- }
|
||||
+ if (!topData->role.isEmpty())
|
||||
+ windowRole = topData->role.toUtf8();
|
||||
+ }
|
||||
+ if (windowRole.isEmpty()) // use object name as a fallback
|
||||
+ windowRole = objectName.toUtf8();
|
||||
+ if (!windowRole.isEmpty()) {
|
||||
+ XChangeProperty(dpy, id,
|
||||
+ ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
|
||||
+ (unsigned char *)windowRole.constData(), windowRole.length());
|
||||
}
|
||||
|
||||
// set client leader property
|
||||
@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
|
||||
(unsigned char *)windowRole.constData(), windowRole.length());
|
||||
}
|
||||
|
||||
+void QWidgetPrivate::checkWindowRole()
|
||||
+{
|
||||
+ Q_Q(QWidget);
|
||||
+ if( !q->windowRole().isEmpty() || !q->internalWinId())
|
||||
+ return;
|
||||
+ QByteArray windowRole = objectName.toUtf8(); // use as a fallback
|
||||
+ XChangeProperty(X11->display, q->internalWinId(),
|
||||
+ ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
|
||||
+ (unsigned char *)windowRole.constData(), windowRole.length());
|
||||
+}
|
||||
+
|
||||
Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
|
||||
QPaintEngine *QWidget::paintEngine() const
|
||||
{
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
|
||||
From: Lubos Lunak <l.lunak@kde.org>
|
||||
Date: Wed, 30 Jan 2008 14:24:01 +0100
|
||||
Subject: [PATCH 03/13] This patch changes QObjectPrivateVersion, thus preventing mixing
|
||||
parts of upstream Qt and qt-copy. In general it is a bad idea to mix
|
||||
e.g. libQtCore from one build and libQtGui from another one, and other
|
||||
qt-copy patches could make changes in Qt internal structures that could
|
||||
cause problems when mixed with upstream Qt.
|
||||
|
||||
This patch does not make qt-copy binary incompatible with upstream Qt.
|
||||
It only further enforces using the same sources for the whole Qt build.
|
||||
|
||||
qt-bugs@ issue : none
|
||||
Trolltech task ID : none
|
||||
bugs.kde.org number : none
|
||||
---
|
||||
src/corelib/kernel/qobject_p.h | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
|
||||
index 0bcccba..88192fd 100644
|
||||
--- a/src/corelib/kernel/qobject_p.h
|
||||
+++ b/src/corelib/kernel/qobject_p.h
|
||||
@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
|
||||
|
||||
inline QObjectData::~QObjectData() {}
|
||||
|
||||
-enum { QObjectPrivateVersion = QT_VERSION };
|
||||
+// add 0x1000000 to mark it as qt-copy version, with possible modifications
|
||||
+// in some Q*Private class
|
||||
+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
|
||||
|
||||
class Q_CORE_EXPORT QObjectPrivate : public QObjectData
|
||||
{
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
|
||||
Date: Fri, 19 Sep 2008 17:41:26 +0200
|
||||
Subject: [PATCH 06/13] Fix configure.exe to do an out-of-source build on windows
|
||||
|
||||
qt-bugs@ issue : N227213
|
||||
Trolltech task ID : none yet
|
||||
---
|
||||
bin/syncqt | 6 +++++-
|
||||
projects.pro | 3 +++
|
||||
src/tools/moc/main.cpp | 6 ++++++
|
||||
3 files changed, 14 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/bin/syncqt b/bin/syncqt
|
||||
index 7a9f1d3..b5a8e1c 100755
|
||||
--- a/bin/syncqt
|
||||
+++ b/bin/syncqt
|
||||
@@ -365,9 +365,13 @@ sub fixPaths {
|
||||
$match_dir = $tmp;
|
||||
$i = $slash;
|
||||
}
|
||||
+ my $cnt_ofs = 0;
|
||||
+ if($match_dir =~ /^[a-zA-Z]:$/) {
|
||||
+ $cnt_ofs = 1;
|
||||
+ }
|
||||
if($match_dir) {
|
||||
my $after = substr($dir, length($match_dir));
|
||||
- my $count = ($after =~ tr,/,,);
|
||||
+ my $count = ($after =~ tr,/,,) - $cnt_ofs;
|
||||
my $dots = "";
|
||||
for(my $i = 0; $i < $count; $i++) {
|
||||
$dots .= "../";
|
||||
diff --git a/projects.pro b/projects.pro
|
||||
index 2596c0a..3ba0688 100644
|
||||
--- a/projects.pro
|
||||
+++ b/projects.pro
|
||||
@@ -127,6 +127,9 @@ unix {
|
||||
DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
|
||||
mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
|
||||
}
|
||||
+win32 {
|
||||
+ mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
|
||||
+}
|
||||
INSTALLS += mkspecs
|
||||
|
||||
false:macx { #mac install location
|
||||
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
|
||||
index d519b09..7979836 100644
|
||||
--- a/src/tools/moc/main.cpp
|
||||
+++ b/src/tools/moc/main.cpp
|
||||
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
|
||||
inSplitted.prepend(QLatin1String(".."));
|
||||
}
|
||||
inSplitted.append(inFileInfo.fileName());
|
||||
+#ifdef Q_WS_WIN
|
||||
+ const QString rel = inSplitted.join(QLatin1String("/"));
|
||||
+ const QString abs = inFileInfo.absoluteFilePath();
|
||||
+ return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
|
||||
+#else
|
||||
return QFile::encodeName(inSplitted.join(QLatin1String("/")));
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
|
||||
Date: Thu, 8 May 2008 21:25:49 +0200
|
||||
Subject: [PATCH 07/13] When using qmake outside qt src tree, it sometimes generates wrong
|
||||
paths (wrong path separator)
|
||||
|
||||
qt-bugs@ issue : none
|
||||
Trolltech task ID : 214661
|
||||
---
|
||||
qmake/property.cpp | 29 ++++++++++++++++-------------
|
||||
1 files changed, 16 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/qmake/property.cpp b/qmake/property.cpp
|
||||
index 8ba89f9..dd78349 100644
|
||||
--- a/qmake/property.cpp
|
||||
+++ b/qmake/property.cpp
|
||||
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
|
||||
QString
|
||||
QMakeProperty::value(QString v, bool just_check)
|
||||
{
|
||||
+ QString ret;
|
||||
if(v == "QT_INSTALL_PREFIX")
|
||||
- return QLibraryInfo::location(QLibraryInfo::PrefixPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
|
||||
else if(v == "QT_INSTALL_DATA")
|
||||
- return QLibraryInfo::location(QLibraryInfo::DataPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::DataPath);
|
||||
else if(v == "QT_INSTALL_DOCS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
|
||||
else if(v == "QT_INSTALL_HEADERS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::HeadersPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
|
||||
else if(v == "QT_INSTALL_LIBS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
else if(v == "QT_INSTALL_BINS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::BinariesPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
|
||||
else if(v == "QT_INSTALL_PLUGINS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::PluginsPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
|
||||
else if(v == "QT_INSTALL_TRANSLATIONS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
|
||||
else if(v == "QT_INSTALL_CONFIGURATION")
|
||||
- return QLibraryInfo::location(QLibraryInfo::SettingsPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
|
||||
else if(v == "QT_INSTALL_EXAMPLES")
|
||||
- return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
|
||||
else if(v == "QT_INSTALL_DEMOS")
|
||||
- return QLibraryInfo::location(QLibraryInfo::DemosPath);
|
||||
- else if(v == "QMAKE_MKSPECS")
|
||||
+ ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
|
||||
+ if(!ret.isEmpty())
|
||||
+ return QDir::toNativeSeparators(ret);
|
||||
+ if(v == "QMAKE_MKSPECS")
|
||||
return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
|
||||
else if(v == "QMAKE_VERSION")
|
||||
return qmake_version();
|
||||
@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
|
||||
int slash = v.lastIndexOf('/');
|
||||
QVariant var = settings->value(keyBase(slash == -1) + v);
|
||||
bool ok = var.isValid();
|
||||
- QString ret = var.toString();
|
||||
+ ret = var.toString();
|
||||
if(!ok) {
|
||||
QString version = qmake_version();
|
||||
if(slash != -1) {
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
From 8731ab999b849dac4716e3d29f5f55ed8e56438e Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@nokia.com>
|
||||
Date: Thu, 25 Jun 2009 13:50:29 +0200
|
||||
Subject: [PATCH 08/13] This patch makes the raster graphics system use shared images instead
|
||||
of shared pixmaps.
|
||||
|
||||
Shared memory pixmaps are deprecated since they are slower than shared
|
||||
images with modern graphics hardware. They are also not supported by EXA
|
||||
drivers and can be disabled in the latest version of the NVidia driver.
|
||||
|
||||
qt-bugs@ issue : none
|
||||
Qt Software task ID : none
|
||||
bugs.kde.org number : none
|
||||
---
|
||||
src/gui/image/qnativeimage.cpp | 10 ----------
|
||||
src/gui/image/qnativeimage_p.h | 1 -
|
||||
src/gui/painting/qwindowsurface_raster.cpp | 13 ++++++++++---
|
||||
3 files changed, 10 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
|
||||
index 3745708..3c21fce 100644
|
||||
--- a/src/gui/image/qnativeimage.cpp
|
||||
+++ b/src/gui/image/qnativeimage.cpp
|
||||
@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
|
||||
{
|
||||
if (!X11->use_mitshm) {
|
||||
xshmimg = 0;
|
||||
- xshmpm = 0;
|
||||
image = QImage(width, height, format);
|
||||
return;
|
||||
}
|
||||
@@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
|
||||
shmctl(xshminfo.shmid, IPC_RMID, 0);
|
||||
return;
|
||||
}
|
||||
- xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
|
||||
- &xshminfo, width, height, dd);
|
||||
- if (!xshmpm) {
|
||||
- qWarning() << "QNativeImage: Unable to create shared Pixmap.";
|
||||
- }
|
||||
}
|
||||
|
||||
|
||||
@@ -204,10 +198,6 @@ QNativeImage::~QNativeImage()
|
||||
if (!xshmimg)
|
||||
return;
|
||||
|
||||
- if (xshmpm) {
|
||||
- XFreePixmap(X11->display, xshmpm);
|
||||
- xshmpm = 0;
|
||||
- }
|
||||
XShmDetach(X11->display, &xshminfo);
|
||||
xshmimg->data = 0;
|
||||
XDestroyImage(xshmimg);
|
||||
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
|
||||
index 07d5dfe..ba01854 100644
|
||||
--- a/src/gui/image/qnativeimage_p.h
|
||||
+++ b/src/gui/image/qnativeimage_p.h
|
||||
@@ -90,7 +90,6 @@ public:
|
||||
|
||||
#elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
|
||||
XImage *xshmimg;
|
||||
- Pixmap xshmpm;
|
||||
XShmSegmentInfo xshminfo;
|
||||
|
||||
#elif defined(Q_WS_MAC)
|
||||
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
|
||||
index d6fb03b..09963d9 100644
|
||||
--- a/src/gui/painting/qwindowsurface_raster.cpp
|
||||
+++ b/src/gui/painting/qwindowsurface_raster.cpp
|
||||
@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
|
||||
|
||||
QRect br = rgn.boundingRect().translated(offset);
|
||||
#ifndef QT_NO_MITSHM
|
||||
- if (d_ptr->image->xshmpm) {
|
||||
- XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
|
||||
- br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
|
||||
+ if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
|
||||
+ const QImage &src = d->image->image;
|
||||
+ br = br.intersected(src.rect());
|
||||
+ // Hack to make sure we satisify the PutImage() constraints in the X server,
|
||||
+ // since the doShmPutImage() route currently forces a migration to system ram.
|
||||
+ wbr.setX(wbr.x() - br.x());
|
||||
+ br.setX(0);
|
||||
+ br.setWidth(src.width());
|
||||
+ XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
|
||||
+ br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
|
||||
XSync(X11->display, False);
|
||||
} else
|
||||
#endif
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From bb8255da422470c5012b6b1c4c24eb2afb6804dc Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@nokia.com>
|
||||
Date: Fri, 26 Jun 2009 11:41:45 +0200
|
||||
Subject: [PATCH 09/13] Restore a section of the file that got removed due to conflict resolution.
|
||||
|
||||
Thanks to Kevin Kofler for pointing this out
|
||||
---
|
||||
src/gui/kernel/qapplication_x11.cpp | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
|
||||
index 33aec9e..53f020b 100644
|
||||
--- a/src/gui/kernel/qapplication_x11.cpp
|
||||
+++ b/src/gui/kernel/qapplication_x11.cpp
|
||||
@@ -1955,9 +1955,9 @@ void qt_init(QApplicationPrivate *priv, int,
|
||||
bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
|
||||
if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
|
||||
Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
|
||||
- X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
|
||||
- && defaultVisual->green_mask == 0xff00
|
||||
- && defaultVisual->blue_mask == 0xff);
|
||||
+ X11->use_mitshm = defaultVisual->red_mask == 0xff0000
|
||||
+ && defaultVisual->green_mask == 0xff00
|
||||
+ && defaultVisual->blue_mask == 0xff;
|
||||
}
|
||||
}
|
||||
#endif // QT_NO_MITSHM
|
||||
--
|
||||
1.6.5.1
|
||||
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH 2006-11-27 11:26:03.000000000 -0600
|
||||
+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp 2007-02-26 13:45:39.000000000 -0600
|
||||
@@ -498,6 +498,7 @@
|
||||
ret << ((*it) + concat);
|
||||
}
|
||||
ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
|
||||
+ ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat;
|
||||
|
||||
return ret;
|
||||
}
|
||||
49
qt.spec
49
qt.spec
|
|
@ -9,7 +9,10 @@
|
|||
#define no_javascript_jit -no-javascript-jit
|
||||
|
||||
# enable kde-qt integration/patches
|
||||
#define kde_qt 1
|
||||
%define kde_qt 1
|
||||
|
||||
# See http://bugzilla.redhat.com/223663
|
||||
%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
|
||||
|
||||
Summary: Qt toolkit
|
||||
Name: qt
|
||||
|
|
@ -18,7 +21,7 @@ Version: 4.7.0
|
|||
Release: 2%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FLT and MIT
|
||||
Group: System Environment/Libraries
|
||||
Url: http://www.qtsoftware.com/
|
||||
Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
|
||||
|
|
@ -27,22 +30,28 @@ Obsoletes: qt4 < %{version}-%{release}
|
|||
Provides: qt4 = %{version}-%{release}
|
||||
%{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
|
||||
|
||||
# default Qt config file
|
||||
Source4: Trolltech.conf
|
||||
|
||||
# See http://bugzilla.redhat.com/223663
|
||||
%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
|
||||
# header file to workaround multilib issue
|
||||
Source5: qconfig-multilib.h
|
||||
|
||||
# multilib hacks
|
||||
# set default QMAKE_CFLAGS_RELEASE
|
||||
Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
|
||||
Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
|
||||
|
||||
# get rid of timestamp which causes multilib problem
|
||||
Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
|
||||
|
||||
# enable ft lcdfilter
|
||||
Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
|
||||
|
||||
# include kde4 plugin path, http://bugzilla.redhat.com/498809
|
||||
# omit for now, (seems?) causes unwelcome side-effects -- Rex
|
||||
Patch16: qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
|
||||
|
||||
# phonon gstreamer services
|
||||
Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
|
||||
Requires: ca-certificates
|
||||
|
||||
# may be upstreamable, not sure yet
|
||||
# workaround for gdal/grass crashers wrt glib_eventloop null deref's
|
||||
Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
||||
|
|
@ -50,15 +59,20 @@ Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
|||
## upstreamable bits
|
||||
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
||||
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
||||
|
||||
# fix invalid assumptions about mysql_config --libs
|
||||
# http://bugzilla.redhat.com/440673
|
||||
Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
|
||||
|
||||
# http://bugs.kde.org/show_bug.cgi?id=180051#c22
|
||||
Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
|
||||
|
||||
# Add s390x as 64bit and s390 as 31bit bigendian platform
|
||||
Patch56: qt-everywhere-opensource-src-4.7.0-beta1-s390x.patch
|
||||
|
||||
# qtwebkit to search nspluginwrapper paths too
|
||||
Patch58: qt-everywhere-opensource-src-4.7.0-beta1-qtwebkit_pluginpath.patch
|
||||
|
||||
# indic Incorrect rendering
|
||||
Patch59: qt-4.6.3-bn-rendering-bz562049.patch
|
||||
Patch60: qt-4.6.3-bn-rendering-bz562058.patch
|
||||
|
|
@ -71,16 +85,11 @@ Patch62: qt-4.6.3-indic-rendering-bz636399.patch
|
|||
|
||||
# kde-qt git patches
|
||||
Patch201: 0001-This-patch-uses-object-name-as-a-fallback-for-window.patch
|
||||
Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
|
||||
Patch203: 0003-This-patch-changes-QObjectPrivateVersion-thus-preven.patch
|
||||
Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
|
||||
Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
|
||||
Patch206: 0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
|
||||
Patch207: 0007-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch
|
||||
Patch208: 0008-This-patch-makes-the-raster-graphics-system-use-shar.patch
|
||||
Patch209: 0009-Restore-a-section-of-the-file-that-got-removed-due-t.patch
|
||||
Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
|
||||
|
||||
# gstreamer logos
|
||||
Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
|
||||
Source11: hi16-phonon-gstreamer.png
|
||||
Source12: hi22-phonon-gstreamer.png
|
||||
|
|
@ -89,6 +98,7 @@ Source14: hi48-phonon-gstreamer.png
|
|||
Source15: hi64-phonon-gstreamer.png
|
||||
Source16: hi128-phonon-gstreamer.png
|
||||
|
||||
# desktop files
|
||||
Source20: assistant.desktop
|
||||
Source21: designer.desktop
|
||||
Source22: linguist.desktop
|
||||
|
|
@ -141,10 +151,6 @@ Source31: hi48-app-qt4-logo.png
|
|||
%define _qt4_sysconfdir %{_sysconfdir}
|
||||
%define _qt4_translationdir %{_datadir}/qt4/translations
|
||||
|
||||
%if "%{_qt4_libdir}" != "%{_libdir}"
|
||||
Prereq: /etc/ld.so.conf.d
|
||||
%endif
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: dbus-devel >= 0.62
|
||||
BuildRequires: cups-devel
|
||||
|
|
@ -204,6 +210,7 @@ Obsoletes: qgtkstyle < 0.1
|
|||
Provides: qgtkstyle = 0.1-1
|
||||
Obsoletes: qt4-config < 4.5.0
|
||||
Provides: qt4-config = %{version}-%{release}
|
||||
Requires: ca-certificates
|
||||
|
||||
%description
|
||||
Qt is a software toolkit for developing applications.
|
||||
|
|
@ -431,14 +438,9 @@ Qt libraries used for drawing widgets and OpenGL items.
|
|||
|
||||
# kde-qt branch
|
||||
%if 0%{?kde_qt}
|
||||
%patch201 -p1 -b .kde-qt-0001
|
||||
%patch202 -p1 -b .kde-qt-0002
|
||||
%patch203 -p1 -b .kde-qt-0003
|
||||
%patch204 -p1 -b .kde-qt-0004
|
||||
%patch205 -p1 -b .kde-qt-0005
|
||||
%patch206 -p1 -b .kde-qt-0006
|
||||
# doesn't apply, does look like much of a big deal though
|
||||
#patch207 -p1 -b .kde-qt-0007
|
||||
%patch212 -p1 -b .kde-qt-0012
|
||||
%endif
|
||||
|
||||
|
|
@ -461,9 +463,6 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
|||
# don't use -b on mkspec files, else they get installed too.
|
||||
# multilib hacks no longer required
|
||||
%patch2 -p1
|
||||
%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
|
||||
%patch3 -p1 -b .multilib-QMAKEPATH
|
||||
%endif
|
||||
%patch4 -p1 -b .uic_multilib
|
||||
|
||||
sed -i \
|
||||
|
|
|
|||
Loading…
Reference in New Issue