rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apply qtcopy-define

Browse Source
This commit is contained in:
Than Ngo 2009-08-21 08:31:46 +00:00
parent 35a84ebd0e
commit 5ec98dafb1
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0118-qtcopy-define.diff Normal file
View File

@ -0,0 +1,24 @@
qt-bugs@ issue : none
Trolltech task ID : none
applied: yes
author: David Faure <faure@kde.org>
Needed to distinguish qt-copy from released versions of qt, at least while
we backport API additions to qt-copy.
Index: src/corelib/global/qglobal.h
===================================================================
--- src/corelib/global/qglobal.h (revision 536662)
+++ src/corelib/global/qglobal.h (working copy)
@@ -38,6 +38,11 @@
#include <QtCore/qconfig.h>
#endif
+/* QT_KDE_QT_COPY is set in qt-copy so that we know when we can use features backported to qt-copy
+ Keep in mind that it should also work with the right release of Qt, so use something like:
+ #if defined(QT_KDE_QT_COPY) || QT_VERSION >= 0x040200 */
+#define QT_KDE_QT_COPY
+
/*
The operating system, must be one of: (Q_OS_x)

12
qt.spec
View File

@ -66,8 +66,9 @@ Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
# switch to kde-qt branches, qt-copy doesn't exist anymore
Patch200: kde-qt-patches-20090820git.patch
# these patches are not merged yet in kde-qt branches
Patch201: 0283-do-not-deduce-scrollbar-extent-twice.diff
Patch202: 0285-qgv-dontshowchildren.diff
Patch201: 0118-qtcopy-define.diff
Patch202: 0283-do-not-deduce-scrollbar-extent-twice.diff
Patch203: 0285-qgv-dontshowchildren.diff
Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
Source11: hi16-phonon-gstreamer.png
@ -392,8 +393,9 @@ popd
# kde-qt branch
%patch200 -p1 -b .kde-qt-patches-20090820git
%patch201 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
%patch202 -p0 -b .0285-qgv-dontshowchildren
%patch201 -p1 -b .0118-qtcopy-define
%patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
%patch203 -p0 -b .0285-qgv-dontshowchildren
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@ -727,7 +729,7 @@ fi
%files
%defattr(-,root,root,-)
%doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
%doc README README.kde-qt LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
%if "%{_qt4_libdir}" != "%{_libdir}"
/etc/ld.so.conf.d/*
%dir %{_qt4_libdir}