rpms/qt/F-11 qt-copy-20090626-qt452.patch, NONE, 1.1 qt-x11-opensource-src-4.5.2-qdoc3.patch, NONE, 1.1 qt.spec, 1.271, 1.272 sources, 1.59, 1.60 qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Thu Jul 2 10:48:59 UTC 2009
Author: than
Update of /cvs/extras/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1562
Modified Files:
qt.spec sources
Added Files:
qt-copy-20090626-qt452.patch
qt-x11-opensource-src-4.5.2-qdoc3.patch
Removed Files:
qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
Log Message:
4.5.2
qt-copy-20090626-qt452.patch:
--- NEW FILE qt-copy-20090626-qt452.patch ---
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)
qt-x11-opensource-src-4.5.2-qdoc3.patch:
--- NEW FILE qt-x11-opensource-src-4.5.2-qdoc3.patch ---
diff -up qt-x11-opensource-src-4.5.2/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.2/tools/qdoc3/qdoc3.pro
--- qt-x11-opensource-src-4.5.2/tools/qdoc3/qdoc3.pro.qdoc3 2009-06-20 06:57:59.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/tools/qdoc3/qdoc3.pro 2009-06-25 13:21:10.000000000 +0200
@@ -99,3 +99,7 @@ SOURCES += apigenerator.cpp \
webxmlgenerator.cpp \
yyindent.cpp
+TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
+
diff -up qt-x11-opensource-src-4.5.2/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.2/tools/tools.pro
--- qt-x11-opensource-src-4.5.2/tools/tools.pro.qdoc3 2009-06-20 06:57:59.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/tools/tools.pro 2009-06-25 13:19:55.000000000 +0200
@@ -13,6 +13,7 @@ no-png {
SUBDIRS += designer
}
SUBDIRS += linguist
+ SUBDIRS += qdoc3
wince*: SUBDIRS = qtestlib designer
unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
win32:!wince*:SUBDIRS += activeqt
Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/qt.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- qt.spec 30 May 2009 17:39:44 -0000 1.271
+++ qt.spec 2 Jul 2009 10:48:58 -0000 1.272
@@ -11,8 +11,8 @@ Epoch: 1
%else
Name: qt4
%endif
-Version: 4.5.1
-Release: 13%{?dist}
+Version: 4.5.2
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -39,15 +39,12 @@ Patch3: qt-x11-opensource-src-4.2.2-mult
Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
# hack around gcc/ppc crasher, http://bugzilla.redhat.com/492185
Patch13: qt-x11-opensource-src-4.5.0-gcc_hack.patch
-# qt fails to build on ia64: http://bugzilla.redhat.com/492174
-Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
# include kde4 plugin path, http://bugzilla.redhat.com/498809
Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
## upstreamable bits
-# http://bugzilla.redhat.com/485677
-Patch51: qt-x11-opensource-src-4.5.0-qdoc3.patch
+Patch51: qt-x11-opensource-src-4.5.2-qdoc3.patch
Patch52: qt-4.5-sparc64.patch
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
# should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
@@ -358,7 +355,6 @@ test -x apply_patches && ./apply_patches
%endif
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch13 -p1 -b .gcc_hack
-%patch14 -p1 -b .ia64_boilerplate
%patch15 -p1 -b .enable_ft_lcdfilter
%patch16 -p1 -b .kde4_plugins
%patch51 -p1 -b .qdoc3
@@ -852,6 +848,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
%changelog
+* Thu Jul 02 2009 Than Ngo <than at redhat.com> - 4.5.2-1
+- 4.5.2
+
* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-13
- -doc: Obsoletes: qt-doc < 1:4.5.1-4 (workaround bug #502401)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-11/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources 23 May 2009 04:05:53 -0000 1.59
+++ sources 2 Jul 2009 10:48:59 -0000 1.60
@@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-afc43e566341cf3e5ed0bcb974f0c3b2 qt-x11-opensource-src-4.5.1.tar.bz2
-94ed40390723c75dbe88d80b7fa219e8 qt-copy-patches-20090522svn.tar.bz2
+28a7e8ac9805a6f614d2a27ee1a6ac9d qt-x11-opensource-src-4.5.2.tar.bz2
+9865efce56f62a441a76626226b5f946 qt-copy-patches-20090626svn.tar.bz2
--- qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch DELETED ---
More information about the fedora-extras-commits
mailing list