[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - patches/dev300

[René Engelhard]

 patches/dev300/external-apm-header.diff               |    2 -
 patches/dev300/icu-arm.diff                           |    2 -
 patches/dev300/soffice-opengl-and-locking-config.diff |   20 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 3fd2f1b1cbcab8ecd5a642d36cf071d391ad881f
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jun 24 18:56:04 2011 +0200

    make soffice-opengl-and-locking-config.diff apply again

diff --git a/patches/dev300/soffice-opengl-and-locking-config.diff b/patches/dev300/soffice-opengl-and-locking-config.diff
index b2be589..a66bb91 100644
--- a/patches/dev300/soffice-opengl-and-locking-config.diff
+++ b/patches/dev300/soffice-opengl-and-locking-config.diff
@@ -132,11 +132,11 @@ Index: soffice.sh
 +    esac
 +fi
  
- # The following is needed on Linux PPC with IBM j2sdk142:
- #@# export JITC_PROCESSOR_TYPE=6
+ unset XENVIRONMENT
+ 
 --- desktop/scripts/unopkg.sh-old	2010-02-08 14:53:54.000000000 +0100
 +++ desktop/scripts/unopkg.sh	2010-02-08 14:56:44.000000000 +0100
-@@ -30,9 +30,45 @@
+@@ -26,9 +26,45 @@
  #
  #*************************************************************************
  
@@ -184,10 +184,10 @@ Index: soffice.sh
 +esac
  
  # resolve installation directory
- sd_cwd="`pwd`"
-@@ -70,6 +106,48 @@
-     fi
- fi
+ sd_cwd=`pwd`
+@@ -103,6 +139,48 @@
+ 
+ unset XENVIRONMENT
  
 +# adjust environment
 +
@@ -231,6 +231,6 @@ Index: soffice.sh
 +    esac
 +fi
 +
- #collect all bootstrap variables specified on the command line
- #so that they can be passed as arguments to javaldx later on
- for arg in $@
+ # uncomment line below to disable anti aliasing of fonts
+ # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
+ 
commit 3852a27ab61d3d584ffe6aec9ef76c16ec5c73bd
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jun 24 18:37:41 2011 +0200

    make xternal-apm-header.diff apply again

diff --git a/patches/dev300/external-apm-header.diff b/patches/dev300/external-apm-header.diff
index 97cee41..7af7825 100644
--- a/patches/dev300/external-apm-header.diff
+++ b/patches/dev300/external-apm-header.diff
@@ -211,7 +211,7 @@ index be7a15e..1a70555 100644
 +      }
      }
  
-     pOut->SetWinOrg( aPlaceableBound.TopLeft() );
+     pOut->SetUnitsPerInch( nUnitsPerInch );
 @@ -1067,7 +1075,7 @@ BOOL WMFReader::ReadHeader()
      return sal_True;
  }
commit 35ad14c9f03e0255b0520dc3cd4849940b3e3474
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jun 24 18:32:30 2011 +0200

    make icu-arm.diff apply again

diff --git a/patches/dev300/icu-arm.diff b/patches/dev300/icu-arm.diff
index 95cdb9b..5d91e04 100644
--- a/patches/dev300/icu-arm.diff
+++ b/patches/dev300/icu-arm.diff
@@ -1,7 +1,7 @@
 --- icu/makefile.mk~	2009-09-12 12:57:47.000000000 +0200
 +++ icu/makefile.mk	2009-09-12 13:13:18.000000000 +0200
 @@ -84,8 +84,16 @@
- .ENDIF
+ .ENDIF # "$(OS)"=="MACOSX"
  
  icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 +.IF "$(CPUNAME)" == "ARM" && "$(OS)" == "LINUX"