[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-28-gbc05855
The following commit has been merged in the debian-experimental-3.5 branch:
commit bc05855af3c8ce499bda271e5fbc734c0e8a50db
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 11 17:09:57 2012 +0100
upstream fix for JITC_PROCESSOR_TYPE
diff --git a/patches/ppc-fix-soffice.sh.diff b/patches/ppc-fix-soffice.sh.diff
index 901957e..0a200bb 100644
--- a/patches/ppc-fix-soffice.sh.diff
+++ b/patches/ppc-fix-soffice.sh.diff
@@ -1,11 +1,36 @@
---- a/desktop/scripts/soffice.sh.in-old 2012-01-11 15:24:01.000000000 +0000
-+++ b/desktop/scripts/soffice.sh.in 2012-01-11 15:24:36.000000000 +0000
-@@ -45,7 +45,7 @@
+From f5b96148cb9e489b2100e6a2fd6805bff637e113 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 11 Jan 2012 15:54:35 +0000
+Subject: we need a var. assignment here, not a value
+
+---
+diff --git a/configure.in b/configure.in
+index 204065b..ab12cea 100644
+--- a/configure.in
++++ b/configure.in
+@@ -4313,8 +4313,9 @@ if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
+ # IBMs JDK needs this...
+ JITC_PROCESSOR_TYPE=6
+ export JITC_PROCESSOR_TYPE
++ JITC_PROCESSOR_TYPE_EXPORT="JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
+ fi
+-AC_SUBST([JITC_PROCESSOR_TYPE])
++AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
+
+ if test $_os = "WINNT"; then
+ WITH_VC_REDIST="TRUE"
+diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
+index defd7b2..2014ab9 100755
+--- a/desktop/scripts/soffice.sh.in
++++ b/desktop/scripts/soffice.sh.in
+@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-@JITC_PROCESSOR_TYPE@
-+export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
++@JITC_PROCESSOR_TYPE_EXPORT@
# resolve installation directory
sd_cwd=`pwd`
+--
+cgit v0.9.0.2-2-gbebe
--
LibreOffice packaging repository
Reply to: