- don't disable old curl compatibility

[packages/libreoffice.git] / openoffice.org-stl-amd64.patch

diff --git a/openoffice.org-stl-amd64.patch b/openoffice.org-stl-amd64.patch
index 322d777f3e885ebf6a5a2e711fde30d26ba7e448..2aaf96bef2886becd3d90e03463c013ea32f7b2f 100644 (file)
--- a/openoffice.org-stl-amd64.patch
+++ b/openoffice.org-stl-amd64.patch
@@ -1,22 +1,14 @@
---- ooo-build-src680-m180/build/src680-m180/config_office/configure.in~        2007-01-03 00:53:05.000000000 +0200
-+++ ooo-build-src680-m180/build/src680-m180/config_office/configure.in 2007-01-03 00:54:32.000000000 +0200
-@@ -2041,7 +2041,7 @@
+--- config_office/configure.in~        2007-03-28 00:03:45.805243465 +0300
++++ config_office/configure.in 2007-03-28 00:21:10.154123488 +0300
+@@ -2235,9 +2235,9 @@
                                   fi
                           fi
                   else
 -                         if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
 +                         if test -f "$STLPORT4/lib64/libstlport_gcc.so"; then
                                   AC_MSG_RESULT([checked])
+-                         elif test -f "$STLPORT4/lib/libstlport.so"; then
++                         elif test -f "$STLPORT4/lib64/libstlport.so"; then
+                                  AC_MSG_RESULT([checked])
+                                  STLPORT_VER=500
                           else
-                                  AC_MSG_ERROR([STLport4 libraries not found])
---- ooo-build-src680-m180/build/src680-m180/stlport/makefile.mk~       2007-01-03 01:28:58.000000000 +0200
-+++ ooo-build-src680-m180/build/src680-m180/stlport/makefile.mk        2007-01-03 01:29:02.000000000 +0200
-@@ -204,7 +204,7 @@
- all :
-        @echo "         An already available installation of STLport has been chosen in the configure process."
-        @echo "         Therefore the version provided here does not need to be built in addition."
--       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
-+       +$(COPY) $(STLPORT4)$/lib64$/*stlport*$(DLLPOST) $(DLLDEST)
- .ENDIF
- 
- .INCLUDE :    set_ext.mk