rpms/qt4/devel qt-x11-opensource-src-4.4.0-qassistant-qt4.patch, NONE, 1.1 qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch, NONE, 1.1 .cvsignore, 1.22, 1.22.2.1 qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28482

Modified Files:
      Tag: qt4-qt44-branch
	.cvsignore 
Added Files:
	qt-x11-opensource-src-4.4.0-qassistant-qt4.patch 
	qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch 
Removed Files:
	qt-x11-opensource-src-4.3.0-qassistant-qt4.patch 
Log Message:
sync (new) patches


qt-x11-opensource-src-4.4.0-qassistant-qt4.patch:

--- NEW FILE qt-x11-opensource-src-4.4.0-qassistant-qt4.patch ---
diff -up qt-x11-preview-opensource-src-4.4.0-tp1/tools/assistant/compat/lib/qassistantclient.cpp.qassistant-qt4 qt-x11-preview-opensource-src-4.4.0-tp1/tools/assistant/compat/lib/qassistantclient.cpp
--- qt-x11-preview-opensource-src-4.4.0-tp1/tools/assistant/compat/lib/qassistantclient.cpp.qassistant-qt4	2007-12-18 04:51:23.000000000 -0600
+++ qt-x11-preview-opensource-src-4.4.0-tp1/tools/assistant/compat/lib/qassistantclient.cpp	2007-12-19 07:33:33.000000000 -0600
@@ -217,7 +217,7 @@ QAssistantClient::QAssistantClient( cons
     : QObject( parent ), host ( QLatin1String("localhost") )
 {
     if ( path.isEmpty() )
-        assistantCommand = QLatin1String("assistant");
+        assistantCommand = QLatin1String("assistant-qt4");
     else {
         QFileInfo fi( path );
         if ( fi.isDir() )

qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch:

--- NEW FILE qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch ---
diff -ur qt-x11-preview-opensource-src-4.4.0-tp1/src/gui/kernel/qapplication_x11.cpp qt-x11-preview-opensource-src-4.4.0-tp1-fix-build/src/gui/kernel/qapplication_x11.cpp
--- qt-x11-preview-opensource-src-4.4.0-tp1/src/gui/kernel/qapplication_x11.cpp	2007-12-18 11:52:08.000000000 +0100
+++ qt-x11-preview-opensource-src-4.4.0-tp1-fix-build/src/gui/kernel/qapplication_x11.cpp	2007-12-19 17:11:54.000000000 +0100
@@ -97,6 +97,10 @@
 #include <X11/extensions/Xfixes.h>
 #endif // QT_NO_XFIXES
 
+#if !defined(QT_NO_XCURSOR) && !defined(QT_RUNTIME_XCURSOR)
+#include <X11/Xcursor/Xcursor.h>
+#endif
+
 #include "qt_x11_p.h"
 #include "qx11info_x11.h"
 
@@ -1699,7 +1703,7 @@
                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
         }
 #else
-        ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
+        X11->ptrXcursorLibraryLoadCursor = XcursorLibraryLoadCursor;
 #endif // QT_RUNTIME_XCURSOR
 #endif // QT_NO_XCURSOR
 
@@ -1715,9 +1719,9 @@
                 (PtrXineramaQueryScreens) xineramaLib.resolve("XineramaQueryScreens");
         }
 #else
-        ptrXineramaQueryScreens = XineramaQueryScreens;
-        ptrXineramaIsActive = XineramaIsActive;
-        ptrXineramaQueryExtension = XineramaQueryExtension;
+        X11->ptrXineramaQueryScreens = XineramaQueryScreens;
+        X11->ptrXineramaIsActive = XineramaIsActive;
+        X11->ptrXineramaQueryExtension = XineramaQueryExtension;
 #endif // QT_RUNTIME_XINERAMA
 #endif // QT_NO_XINERAMA
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- .cvsignore	5 Dec 2007 23:59:37 -0000	1.22
+++ .cvsignore	22 Dec 2007 22:37:09 -0000	1.22.2.1
@@ -1,6 +1,4 @@
 clog
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.3.1.tar.gz
-qt-x11-opensource-src-4.3.2.tar.gz
 qt-x11-opensource-src-4.3.3.tar.gz


--- qt-x11-opensource-src-4.3.0-qassistant-qt4.patch DELETED ---