/[gentoo-x86]/app-office/libreoffice/files/libreoffice-kde48.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-kde48.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Apr 26 11:53:14 2012 UTC (2 years, 5 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stable on ppc wrt bug#411449. Cleanup.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
2 From: Luboš Luňák <l.lunak@suse.cz>
3 Date: Fri, 06 Jan 2012 09:55:03 +0000
4 Subject: workaround for LO namespace pollution breaking KDE4 fpicker build
5
6 ---
7 diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
8 index f282645..69be3b1 100644
9 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
10 +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
11 @@ -56,7 +56,10 @@
12 #define Region QtXRegion
13
14 //kde has an enum that uses this...OO does too
15 +#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
16 #undef SETTINGS_MOUSE
17 +#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
18 +#undef SETTINGS_LOCALE
19
20 #include <kfiledialog.h>
21 #include <kwindowsystem.h>
22 @@ -70,6 +73,11 @@
23
24 #undef Region
25
26 +#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
27 +#undef LO_SETTINGS_MOUSE
28 +#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
29 +#undef LO_SETTINGS_LOCALE
30 +
31 using namespace ::com::sun::star;
32
33 using namespace ::com::sun::star::ui::dialogs;
34 --
35 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20