From 64ee91481bace9dd51eff73deee52faf1198382d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 24 Jun 2011 10:30:33 +0100
Subject: [PATCH] fix sdk

---
 ...-to-enable-extensions-to-build-again.patch | 39 +++++++++++++++++++
 libreoffice.spec                              |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch

diff --git a/0001-bad-merge-fix-to-enable-extensions-to-build-again.patch b/0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
new file mode 100644
index 0000000..4fa5cd8
--- /dev/null
+++ b/0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
@@ -0,0 +1,39 @@
+From 194da0076d3b4a6968496261fd2eaca9e8e955f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 24 Jun 2011 10:29:09 +0100
+Subject: [PATCH] bad merge, fix to enable extensions to build again
+
+---
+ odk/settings/settings.mk |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
+index bbd18ee..e4fc05a 100644
+--- a/odk/settings/settings.mk
++++ b/odk/settings/settings.mk
+@@ -502,11 +502,9 @@ PLATFORM=kfreebsd
+ ifeq "$(PROCTYPE)" "x86_64"
+ PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
+ UNOPKG_PLATFORM=kFreeBSD_x86_64
+-STLPORT=no
+ else
+ PACKAGE_LIB_DIR=kfreebsd_x86.plt
+ UNOPKG_PLATFORM=kFreeBSD_x86
+-STLPORT=no
+ endif
+ else
+ PLATFORM=freebsd
+@@ -570,10 +568,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+ SALHELPERLIB=-luno_salhelper$(COMID)
+ REGLIB=-lreg
+ STORELIB=-lstore
+-ifeq "$(STLPORT)" "yes"
+-endif
+-else
+-STLPORTLIB=
+ 
+ EMPTYSTRING=
+ PATH_SEPARATOR=:
+-- 
+1.7.5.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 2bec352..80e8189 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -113,6 +113,7 @@ Patch18: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
 Patch19: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch20: 0001-Related-rhbz-711087-band-aid.patch
 Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
+Patch22: 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -736,6 +737,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch19 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
 %patch20 -p1 -b .rhbz711087-band-aid.patch
 %patch21 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
+%patch22 -p1 -b .bad-merge-fix-to-enable-extensions-to-build-again.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings