rpms/kdepim/F-12 kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch, NONE, 1.1 kdepim.spec, 1.245, 1.246

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29380

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
Log Message:
no-var-tracking patch (f12+)


kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch:
 CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch ---
diff -up kdepim-4.3.3/kmail/CMakeLists.txt.gcc kdepim-4.3.3/kmail/CMakeLists.txt
--- kdepim-4.3.3/kmail/CMakeLists.txt.gcc	2009-11-23 12:38:19.292881093 -0600
+++ kdepim-4.3.3/kmail/CMakeLists.txt	2009-11-23 12:48:32.105882659 -0600
@@ -65,6 +65,9 @@ endif(Nepomuk_FOUND)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
+set_source_files_properties(globalsettings_base.cpp PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments )
+
+
 ########### kmailprivate ###############
 
 set(kmailprivate_LIB_SRCS


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-12/kdepim.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdepim.spec	29 Dec 2009 00:59:55 -0000	1.245
+++ kdepim.spec	29 Dec 2009 02:34:54 -0000	1.246
@@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
+# add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
+Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch
 
 # upstream patches (4.3 branch):
 Patch100: kdepim-4.3.4-monthview.patch
@@ -98,6 +100,9 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+%patch2 -p1 -b .kmail_globalsettings_no_var_tracking
+%endif
 %patch100 -p4 -b .monthview