Bug#335392: openoffice.org: [patch] FTBFS on amd64: ** Error ** - Can't find file cws-ooo64bit02.2005-04-19-math-h.diff
Package: openoffice.org
Version: 2.0.0-4
Followup-For: Bug #335392
Hi,
I have done a patch (attached) fixing these problems plus some further ones.
Once the "apt-get source openoffice.org", just go in
openoffice.org-2.0.0/ and apply the patch. Then do a "dpkg-buildpackage
-rfakeroot -us -uc" as usually.
I did include the intptr-* patches in Debian64 only but I believe they
are safe for any architecture (btwm there was one missing in basegfx).
I've stopped at:
Making: ../../unxlngx4.pro/obj/bigint.obj
g++ -fmessage-length=0 -c -I. -I. -I../inc -I../../inc -I../../unx/inc
-I../../unxlngx4.pro/inc -I.
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solver/680/unxlngx4.pro/inc/stl
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solver/680/unxlngx4.pro/inc/external
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solver/680/unxlngx4.pro/inc
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solenv/unxlngx4/inc
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solenv/inc
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/res
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/stlport4/stlport
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/stlport4/include/stlport
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/stlport4/include/stlport
-I/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/solenv/inc/Xp31
-I/usr/lib/jvm/java-gcj/include -I/usr/X11R6/include -I. -I../../res
-I. -O -fno-strict-aliasing -fvisibility=hidden -pipe
-fno-use-cxa-atexit -Wno-ctor-dtor-privacy -fvisibility-inlines-hidden
-include preinclude.h -g -fno-exceptions -fPIC -DLINUX -DUNX -DVCL
-DGCC -DC300 -DX86_64
-DGXX_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.0.3/../../../../include/c++/4.0.3
-DCVER=C300 -D_USE_NAMESPACE -DNPTL -DGLIBC=2 -DX86_64 -D_PTHREADS
-D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
-DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3
-DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0
-DOPTIMIZE -DEXCEPTIONS_OFF -DCUI -DSOLAR_JAVA -DOOO680
-DTOOLS_DLLIMPLEMENTATION -DMULTITHREAD -w -o
../../unxlngx4.pro/obj/bigint.o
/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/tools/source/generic/bigint.cxx
/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/tools/source/generic/bigint.cxx:664:
error: no 'BigInt::operator ULONG() const' member function declared in
class 'BigInt'
dmake: Error code 1, while making '../../unxlngx4.pro/obj/bigint.obj'
'---* tg_merge.mk *---'
ERROR: Error 65280 occurred while making
/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build/build/ooo680-m3/tools/source/generic
make[1]: *** [stamp/build] Error 1
make[1]: Leaving directory
`/home/fleury/devel/projects/openoffice/openoffice.org-2.0.0-1/ooo-build'
make: *** [debian/stampdir/build] Error 2
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14.3
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)
diff -ruN openoffice.org-2.0.0/ooo-build/patches/64bit/buildfix-64bit-config_office.diff openoffice.org-2.0.0-2/ooo-build/patches/64bit/buildfix-64bit-config_office.diff
--- openoffice.org-2.0.0/ooo-build/patches/64bit/buildfix-64bit-config_office.diff 2005-12-15 20:50:45.000000000 +0100
+++ openoffice.org-2.0.0-2/ooo-build/patches/64bit/buildfix-64bit-config_office.diff 2005-12-17 01:31:35.000000000 +0100
@@ -1,5 +1,14 @@
--- config_office/configure.in 2005-01-28 05:34:39.000000000 +0100
+++ config_office/configure.in 2005-01-28 05:36:21.000000000 +0100
+@@ -3357,7 +3385,7 @@
+ AC_MSG_RESULT([external])
+ SYSTEM_HUNSPELL=YES
+ AC_LANG(C++)
+- AC_CHECK_HEADER(hunspell.hxx, [],
++ AC_CHECK_HEADER(hunspell/hunspell.hxx, [],
+ [AC_MSG_ERROR(hunspell headers not found.)], [])
+ AC_CHECK_LIB(hunspell, main, [],
+ [ AC_MSG_ERROR(hunspell library not found.) ], [])
@@ -3481,17 +3481,17 @@
MOC="moc"
if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
diff -ruN openoffice.org-2.0.0/ooo-build/patches/64bit/intptr-basegfx.diff openoffice.org-2.0.0-2/ooo-build/patches/64bit/intptr-basegfx.diff
--- openoffice.org-2.0.0/ooo-build/patches/64bit/intptr-basegfx.diff 1970-01-01 01:00:00.000000000 +0100
+++ openoffice.org-2.0.0-2/ooo-build/patches/64bit/intptr-basegfx.diff 2005-12-17 01:31:53.000000000 +0100
@@ -0,0 +1,11 @@
+--- basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx.orig 2005-12-17 01:11:26.000000000 +0100
++++ basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx 2005-12-17 01:11:51.000000000 +0100
+@@ -121,7 +121,7 @@
+ m_indices2 = new sal_uInt32[nNumElements];
+
+ // check for out of memory situation
+- if(!((sal_uInt32)m_indices1|(sal_uInt32)m_indices2)) {
++ if(!((sal_IntPtr)m_indices1|(sal_IntPtr)m_indices2)) {
+ delete [] m_indices1;
+ delete [] m_indices2;
+ m_indices1 = NULL;
diff -ruN openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply openoffice.org-2.0.0-2/ooo-build/patches/OOO_2_0/apply
--- openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply 2005-12-15 20:50:45.000000000 +0100
+++ openoffice.org-2.0.0-2/ooo-build/patches/OOO_2_0/apply 2005-12-17 01:31:35.000000000 +0100
@@ -32,7 +32,7 @@
DebianBase : LinuxCommon, SystemDB, DebianBaseOnly
Debian : DebianBase, DebianOnly, DebianSidOnly
DebianSarge : DebianBase, DebianOnly, DebianSargeOnly
-Debian64 : DebianBase, 64bit, DebianOnly
+Debian64 : DebianBase, 64bit, DebianOnly, IntPtr
# Ubuntu
Ubuntu: DebianBase, UbuntuOnly
Ubuntu64: DebianBase, 64bit, UbuntuOnly
@@ -780,6 +780,7 @@
[ IntPtr ]
# Introduce sal_IntPtr and sal_uIntPtr #54498, CWS intptr
+intptr-basegfx.diff
intptr-basic.diff
intptr-bridges.diff
intptr-connectivity.diff
@@ -820,7 +821,7 @@
# TODO check zforlist for correctness
cws-ooo64bit02.2005-04-19.diff
-cws-ooo64bit02.2005-04-19-math-h.diff
+# cws-ooo64bit02.2005-04-19-math-h.diff
# Temporary hacks
buildfix-64bit-basic.diff
@@ -829,7 +830,7 @@
buildfix-64bit-dbaccess.diff
buildfix-64bit-forms.diff
buildfix-64bit-fpicker.diff
-buildfix-64bit-sc.diff
+# buildfix-64bit-sc.diff
buildfix-64bit-setup_native.diff
buildfix-64bit-svtools.diff
buildfix-64bit-svx.diff
Reply to: