- fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against
4.5.2
This commit is contained in:
parent
2450722bfa
commit
050003885a
29
qt-copy-20090626-qt452.patch
Normal file
29
qt-copy-20090626-qt452.patch
Normal file
@ -0,0 +1,29 @@
|
||||
diff -ur qt-copy/patches/0274-shm-native-image-fix.diff qt-copy-qt452/patches/0274-shm-native-image-fix.diff
|
||||
--- qt-copy/patches/0274-shm-native-image-fix.diff 2009-03-03 11:46:54.000000000 +0100
|
||||
+++ qt-copy-qt452/patches/0274-shm-native-image-fix.diff 2009-06-26 03:26:36.000000000 +0200
|
||||
@@ -15,15 +15,19 @@
|
||||
===================================================================
|
||||
--- src/gui/kernel/qapplication_x11.cpp (revision 934506)
|
||||
+++ src/gui/kernel/qapplication_x11.cpp (working copy)
|
||||
-@@ -1943,7 +1943,7 @@ void qt_init(QApplicationPrivate *priv,
|
||||
- // to determine whether the display is local or not (not 100 % accurate)
|
||||
+@@ -1955,9 +1955,9 @@
|
||||
bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
|
||||
- if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0))
|
||||
-- X11->use_mitshm = mitshm_pixmaps;
|
||||
-+ X11->use_mitshm = true;
|
||||
+ 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
|
||||
-
|
||||
Index: src/gui/image/qnativeimage_p.h
|
||||
===================================================================
|
||||
--- src/gui/image/qnativeimage_p.h (revision 930645)
|
6
qt.spec
6
qt.spec
@ -47,6 +47,8 @@ Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
|
||||
# "sink" setting, and should pick up the PulseAudio "sink" without patches.)
|
||||
Patch17: phonon-4.2.96-pulseaudio.patch
|
||||
Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
|
||||
# fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
|
||||
Patch20: qt-copy-20090626-qt452.patch
|
||||
|
||||
## upstreamable bits
|
||||
# http://bugzilla.redhat.com/485677
|
||||
@ -62,7 +64,7 @@ Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
|
||||
# we'll want to switch to the kde-qt branches, e.g.:
|
||||
# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/4.5.2-patched
|
||||
# once they actually contain all the patches from qt-copy (0283 and 0285 are
|
||||
# AWOL)
|
||||
# AWOL, 0274 got incorrectly ported to 4.5.2 (one hunk missing))
|
||||
%define qt_copy 20090626
|
||||
Source1: qt-copy-patches-svn_checkout.sh
|
||||
%{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
|
||||
@ -361,6 +363,7 @@ Qt libraries used for drawing widgets and OpenGL items.
|
||||
%setup -q -n qt-x11-opensource-src-%{version} %{?qt_copy:-a 2}
|
||||
|
||||
%if 0%{?qt_copy}
|
||||
%patch20 -p1 -b .qt-copy-qt452
|
||||
echo "0234" >> patches/DISABLED
|
||||
echo "0250" >> patches/DISABLED
|
||||
echo "0273" >> patches/DISABLED
|
||||
@ -909,6 +912,7 @@ fi
|
||||
* Fri Jun 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.2-2
|
||||
- take current qt-copy-patches snapshot (20090626)
|
||||
- disable patches which are already in 4.5.2
|
||||
- fix the qt-copy patch 0274-shm-native-image-fix.diff to apply against 4.5.2
|
||||
|
||||
* Thu Jun 25 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.5.2-1
|
||||
- Qt 4.5.2
|
||||
|
Loading…
Reference in New Issue
Block a user