[libreoffice/f16] fix build for kde defines collision

[Caolán McNamara]

commit 1b2fa82df3439c22711e4b1565dcdbf1c4fdfa39
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 29 09:07:38 2012 +0100

    fix build for kde defines collision

 libreoffice-kde4fix.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++
 libreoffice.spec          |    4 ++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice-kde4fix.patch b/libreoffice-kde4fix.patch
new file mode 100644
index 0000000..dc71410
--- /dev/null
+++ b/libreoffice-kde4fix.patch
@@ -0,0 +1,57 @@
+--- vcl/inc/vcl/settings.hxx	2012-03-29 08:39:08.838789585 +0100
++++ vcl/inc/vcl/settings.hxx	2012-03-29 08:41:26.375587207 +0100
+@@ -1144,24 +1144,24 @@
+ // - AllSettings -
+ // ---------------
+ 
+-#define SETTINGS_MACHINE            ((sal_uLong)0x00000001)
+-#define SETTINGS_MOUSE              ((sal_uLong)0x00000002)
+-#define SETTINGS_KEYBOARD           ((sal_uLong)0x00000004)
+-#define SETTINGS_STYLE              ((sal_uLong)0x00000008)
+-#define SETTINGS_MISC               ((sal_uLong)0x00000010)
+-#define SETTINGS_SOUND              ((sal_uLong)0x00000020)
+-#define SETTINGS_NOTIFICATION       ((sal_uLong)0x00000040)
+-#define SETTINGS_HELP               ((sal_uLong)0x00000080)
+-#define SETTINGS_INTERNATIONAL      ((sal_uLong)0x00000100) /* was for class International, has no effect anymore */
+-#define SETTINGS_LOCALE             ((sal_uLong)0x00000200)
+-#define SETTINGS_UILOCALE           ((sal_uLong)0x00000400)
+-#define SETTINGS_ALLSETTINGS        (SETTINGS_MACHINE |\
+-                                     SETTINGS_MOUSE | SETTINGS_KEYBOARD |\
+-                                     SETTINGS_STYLE | SETTINGS_MISC |\
+-                                     SETTINGS_SOUND | SETTINGS_NOTIFICATION |\
+-                                     SETTINGS_HELP |\
+-                                     SETTINGS_LOCALE | SETTINGS_UILOCALE )
+-#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x00000800)	  // this flag indicates that the data changed event was created
++const sal_uLong SETTINGS_MACHINE =          ((sal_uLong)0x00000001);
++const sal_uLong SETTINGS_MOUSE   =          ((sal_uLong)0x00000002);
++const sal_uLong SETTINGS_KEYBOARD =         ((sal_uLong)0x00000004);
++const sal_uLong SETTINGS_STYLE   =          ((sal_uLong)0x00000008);
++const sal_uLong SETTINGS_MISC    =          ((sal_uLong)0x00000010);
++const sal_uLong SETTINGS_SOUND   =          ((sal_uLong)0x00000020);
++const sal_uLong SETTINGS_NOTIFICATION =     ((sal_uLong)0x00000040);
++const sal_uLong SETTINGS_HELP    =          ((sal_uLong)0x00000080);
++const sal_uLong SETTINGS_INTERNATIONAL =    ((sal_uLong)0x00000100); /* was for class International, has no effect anymore */
++const sal_uLong SETTINGS_LOCALE  =          ((sal_uLong)0x00000200);
++const sal_uLong SETTINGS_UILOCALE =         ((sal_uLong)0x00000400);
++const sal_uLong SETTINGS_ALLSETTINGS =      (SETTINGS_MACHINE |\
++                            SETTINGS_MOUSE | SETTINGS_KEYBOARD |\
++                            SETTINGS_STYLE | SETTINGS_MISC |\
++                            SETTINGS_SOUND | SETTINGS_NOTIFICATION |\
++                            SETTINGS_HELP |\
++                            SETTINGS_LOCALE | SETTINGS_UILOCALE );
++const sal_uLong SETTINGS_IN_UPDATE_SETTINGS = ((sal_uLong)0x00000800);	  // this flag indicates that the data changed event was created
+                                                           // in Windows::UpdateSettings probably because of a global
+                                                           // settings changed
+ 
+--- fpicker/source/unx/kde4/KDE4FilePicker.cxx	2012-03-29 08:38:59.298664830 +0100
++++ fpicker/source/unx/kde4/KDE4FilePicker.cxx	2012-03-29 08:39:17.772906408 +0100
+@@ -55,9 +55,6 @@
+ /* ********* Hack, but needed because of conflicting types... */
+ #define Region QtXRegion
+ 
+-//kde has an enum that uses this...OO does too
+-#undef SETTINGS_MOUSE
+-
+ #include <kfiledialog.h>
+ #include <kwindowsystem.h>
+ #include <kapplication.h>
diff --git a/libreoffice.spec b/libreoffice.spec
index 1f1d5f7..bf6dda4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -243,6 +243,7 @@ Patch121: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
 Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
 Patch123: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
 Patch124: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
+Patch125: libreoffice-kde4fix.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1173,6 +1174,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch122 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch
 %patch123 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
 %patch124 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
+%patch125 -p0 -b .libreoffice-kde4fix.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2492,7 +2494,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Tue Mar 27 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-10
+* Thu Mar 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-10
 - Resolves: rhbz#789022 SwNodes: fix inconsistent outline check
 - Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
 - Resolves: rhbz#807243 require correct version of hsqldb