From c7f110941291fb3a94860c8edf2f1148fe78c771 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 8 Mar 2012 14:19:43 +0100 Subject: [PATCH 1/2] fix build with KDE 4.8 --- 0001-yet-another-clash-with-macro-name.patch | 34 ++++++++++++++++++++ libreoffice.spec | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-yet-another-clash-with-macro-name.patch diff --git a/0001-yet-another-clash-with-macro-name.patch b/0001-yet-another-clash-with-macro-name.patch new file mode 100644 index 0000000..ff094b9 --- /dev/null +++ b/0001-yet-another-clash-with-macro-name.patch @@ -0,0 +1,34 @@ +From ee67c55260ec7723c39606955ccdbd3e2934935a Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 8 Mar 2012 14:15:09 +0100 +Subject: [PATCH] yet another clash with macro name + +--- + fpicker/source/unx/kde4/KDE4FilePicker.cxx | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx +index 269deee..8e8b3e8 100644 +--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx ++++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx +@@ -60,6 +60,8 @@ + #undef SETTINGS_MOUSE + #define LO_SETTINGS_LOCALE SETTINGS_LOCALE + #undef SETTINGS_LOCALE ++#define LO_SETTINGS_STYLE SETTINGS_STYLE ++#undef SETTINGS_STYLE + + #include + #include +@@ -77,6 +79,8 @@ + #undef LO_SETTINGS_MOUSE + #define SETTINGS_LOCALE LO_SETTINGS_LOCALE + #undef LO_SETTINGS_LOCALE ++#define SETTINGS_STYLE LO_SETTINGS_STYLE ++#undef LO_SETTINGS_STYLE + + using namespace ::com::sun::star; + +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index dad030c..83e55e5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -138,6 +138,7 @@ Patch21: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch Patch22: 0001-silence-SolarMutex-not-locked-spew.patch Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch +Patch25: 0001-yet-another-clash-with-macro-name.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -983,6 +984,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch22 -p1 -b .silence-SolarMutex-not-locked-spew.patch %patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch %patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch +%patch25 -p1 -b .yet-another-clash-with-macro-name.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2270,7 +2272,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Mar 07 2012 David Tardon - 3.5.1.2-1 +* Wed Thu 08 2012 David Tardon - 3.5.1.2-1 - 3.5.1 rc2 * Tue Mar 06 2012 Caolán McNamara - 3.5.1.1-3 From 153ea0329b9f473ebb2f49df7a11de189ddeeaac Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 8 Mar 2012 14:21:15 +0100 Subject: [PATCH 2/2] bah --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 83e55e5..7b3aa97 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2272,7 +2272,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Thu 08 2012 David Tardon - 3.5.1.2-1 +* Thu Mar 08 2012 David Tardon - 3.5.1.2-1 - 3.5.1 rc2 * Tue Mar 06 2012 Caolán McNamara - 3.5.1.1-3