packages: libreoffice/libreoffice-kde4.patch, libreoffice/libreoffice.spec ...

[arekm]

Author: arekm                        Date: Fri Feb 10 20:46:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; kde4.8 workaround

---- Files affected:
packages/libreoffice:
   libreoffice-kde4.patch (1.1 -> 1.2) , libreoffice.spec (1.925 -> 1.926) 

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice-kde4.patch
diff -u packages/libreoffice/libreoffice-kde4.patch:1.1 packages/libreoffice/libreoffice-kde4.patch:1.2
--- packages/libreoffice/libreoffice-kde4.patch:1.1	Wed Nov  2 18:06:27 2011
+++ packages/libreoffice/libreoffice-kde4.patch	Fri Feb 10 21:46:48 2012
@@ -9,3 +9,38 @@
     if test "$MOC4" = "no" ; then
        AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
  the root of your Qt installation by exporting QT4DIR before running "configure".])
+From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
+From: Luboš Luňák <l.lunak at suse.cz>
+Date: Fri, 06 Jan 2012 09:55:03 +0000
+Subject: workaround for LO namespace pollution breaking KDE4 fpicker build
+
+---
+diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+index f282645..69be3b1 100644
+--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
++++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+@@ -56,7 +56,10 @@
+ #define Region QtXRegion
+ 
+ //kde has an enum that uses this...OO does too
++#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
+ #undef SETTINGS_MOUSE
++#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
++#undef SETTINGS_LOCALE
+ 
+ #include <kfiledialog.h>
+ #include <kwindowsystem.h>
+@@ -70,6 +73,11 @@
+ 
+ #undef Region
+ 
++#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
++#undef LO_SETTINGS_MOUSE
++#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
++#undef LO_SETTINGS_LOCALE
++
+ using namespace ::com::sun::star;
+ 
+ using namespace ::com::sun::star::ui::dialogs;
+--
+cgit v0.9.0.2-2-gbebe

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.925 packages/libreoffice/libreoffice.spec:1.926
--- packages/libreoffice/libreoffice.spec:1.925	Fri Feb 10 15:58:03 2012
+++ packages/libreoffice/libreoffice.spec	Fri Feb 10 21:46:48 2012
@@ -46,7 +46,7 @@
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
 Version:	%{major_ver}.2
-Release:	2
+Release:	3
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -4106,6 +4106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.926  2012/02/10 20:46:48  arekm
+- rel 3; kde4.8 workaround
+
 Revision 1.925  2012/02/10 14:58:03  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice-kde4.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.925&r2=1.926&f=u