rpms/qt/F-9 qt-copy-20090626-qt452.patch, NONE, 1.1 qt-x11-opensource-src-4.5.2-qdoc3.patch, NONE, 1.1 qt.spec, 1.201, 1.202 sources, 1.46, 1.47

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7046

Modified Files:
	qt.spec sources 
Added Files:
	qt-copy-20090626-qt452.patch 
	qt-x11-opensource-src-4.5.2-qdoc3.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-9/qt.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- qt.spec	7 Jun 2009 21:39:48 -0000	1.201
+++ qt.spec	2 Jul 2009 13:47:03 -0000	1.202
@@ -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,14 @@ 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 
+# 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
-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
@@ -58,7 +57,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
 
 ## qt-copy patches
-%define qt_copy 20090522
+%define qt_copy 20090626
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -346,7 +345,13 @@ Qt libraries used for drawing widgets an
 %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
+echo "0279" >> patches/DISABLED
+echo "0281" >> patches/DISABLED
+echo "0282" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -358,7 +363,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 +856,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-9/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- sources	23 May 2009 05:12:46 -0000	1.46
+++ sources	2 Jul 2009 13:47:03 -0000	1.47
@@ -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