rpms/qt4/devel qt-x11-opensource-src-4.2.2-extern_c.patch, NONE, 1.1 qt4.spec, 1.31, 1.32

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.2.2-extern_c.patch 
Log Message:
* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-6
- patch around (hopefully) temporary Xrandr.h buglet


qt-x11-opensource-src-4.2.2-extern_c.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-extern_c.patch ---
--- qt-x11-opensource-src-4.2.2/src/gui/kernel/qt_x11_p.h.extern_c	2006-11-27 11:26:12.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/src/gui/kernel/qt_x11_p.h	2007-02-28 13:18:52.000000000 -0600
@@ -127,7 +127,9 @@
 
 // #define QT_NO_XRANDR
 #ifndef QT_NO_XRANDR
+extern "C" {
 #  include <X11/extensions/Xrandr.h>
+}
 #endif // QT_NO_XRANDR
 
 // #define QT_NO_XRENDER
--- qt-x11-opensource-src-4.2.2/config.tests/x11/xrandr/xrandr.cpp.extern_c	2006-11-27 11:26:18.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/config.tests/x11/xrandr/xrandr.cpp	2007-02-28 13:11:29.000000000 -0600
@@ -1,5 +1,7 @@
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
+}
 
 #if RANDR_MAJOR != 1 || RANDR_MINOR < 1
 #  error "Requried Xrandr version 1.1 not found."


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qt4.spec	28 Feb 2007 17:28:01 -0000	1.31
+++ qt4.spec	28 Feb 2007 19:20:46 -0000	1.32
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -33,6 +33,8 @@
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+# hack to work around (hopefully) temporary Xrandr.h buglet
+Patch3: qt-x11-opensource-src-4.2.2-extern_c.patch
 
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
@@ -215,6 +217,7 @@
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
+%patch3 -p1 -b .extern_c
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -539,6 +542,9 @@
 
 
 %changelog
+* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-6
+- patch around (hopefully) temporary Xrandr.h buglet
+
 * Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5
 - fixup qconfig-multilib.h (#223663)
 - qt4.(sh|csh): define QMAKESPEC (#223663)