Re: Bug#335392: openoffice.org: FTBFS on amd64: ** Error ** - Can't find file cws-ooo64bit02.2005-04-19-math-h.diff
Package: openoffice.org
Version: 2.0.0-1
Kurt wrote:
> Your package is failing to build with the following error:
...
I was able to build amd64 packages. I needed to make a few changes to
the following file: openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply
There were two diff files which did not exist, and many more which were
not included.
One diff file (numberformat-sc.diff) had a hunk that did not work (so I
removed that hunk).
Also, I was unable to build with java, so I also disabled java in
/debian/rules. I'm still looking it this.
I include the changes I made. Maybe somebody can comment on them or
give me feedback.
I don't think amd64 is entirely stable and bug-free. After you
successfuly build and install the packages, you will probably end up
with something that crashes, or does not perform as it should. If you
want something useful, try the 32bit version.
Cheers,
Marc
diff -u openoffice.org-2.0.0/ooo-build/patches/64bit/numberformat-sc.diff openoffice.org-2.0.0/ooo-build/patches/64bit/numberformat-sc.diff
--- openoffice.org-2.0.0/ooo-build/patches/64bit/numberformat-sc.diff
+++ openoffice.org-2.0.0/ooo-build/patches/64bit/numberformat-sc.diff
@@ -525,15 +525,6 @@
if ( pFormatter->IsNumberFormat(aString, nNumFmt, fDummy) )
--- sc/source/ui/view/viewfunc.cxx 9 Sep 2004 09:31:12 -0000 1.27
+++ sc/source/ui/view/viewfunc.cxx 21 Jan 2005 16:46:48 -0000 1.27.56.1
-@@ -425,7 +425,7 @@ void ScViewFunc::EnterData( SCCOL nCol,
-
- BOOL bNumFmtChanged = FALSE;
- double fVal;
-- ULONG nIndex = 0;
-+ sal_uInt32 nIndex = 0;
-
- // einzelnes '=' ist String (wird fuer Spezialfilter so gebraucht)
- if ( rString.Len() > 1 &&
@@ -999,9 +999,9 @@ void ScViewFunc::ApplyAttributes( const
if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SFX_ITEM_SET )
diff -u openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply
--- openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply
+++ openoffice.org-2.0.0/ooo-build/patches/OOO_2_0/apply
@@ -31,7 +31,7 @@
# Debian
DebianBase : LinuxCommon, SystemDB, DebianBaseOnly
Debian : DebianBase, DebianOnly
-Debian64 : DebianBase, 64bit, DebianOnly
+Debian64 : DebianBase, 64bit, DebianOnly, 64bitForUpstream, IntPtr, DXArray
# Ubuntu
Ubuntu: DebianBase, UbuntuOnly
Ubuntu64: DebianBase, 64bit, UbuntuOnly
@@ -796,8 +796,6 @@
# TODO check zforlist for correctness
cws-ooo64bit02.2005-04-19.diff
-cws-ooo64bit02.2005-04-19-math-h.diff
-
# Temporary hacks
buildfix-64bit-basic.diff
buildfix-64bit-config_office.diff
@@ -805,7 +803,6 @@
buildfix-64bit-dbaccess.diff
buildfix-64bit-forms.diff
buildfix-64bit-fpicker.diff
-buildfix-64bit-sc.diff
buildfix-64bit-setup_native.diff
buildfix-64bit-svtools.diff
buildfix-64bit-svx.diff
@@ -846,6 +843,36 @@
# in fact this patches automation
buildfix-64bit-automation.diff
+# more patches or it won't compile
+bigint-sd-sfx2-sw-tools.diff
+polygonpoints-psprint-vcl.diff
+resid-extensions-padmin.diff
+
+numberformat-svtools.diff
+numberformat-basic.diff
+numberformat-chart2.diff
+numberformat-sc.diff
+numberformat-sch.diff
+numberformat-sd.diff
+numberformat-sfx2.diff
+numberformat-starmath.diff
+numberformat-svx.diff
+numberformat-sw.diff
+numberformat-vcl.diff
+numberformat-xmloff.diff
+
+trivial-vcl.diff
+trivial-svtools.diff
+trivial-canvas.diff
+trivial-basic.diff
+trivial-sch.diff
+trivial-sfx2.diff
+trivial-svx.diff
+trivial-chart2.diff
+trivial-so3.diff
+trivial-dbaccess.diff
+trivial-starmath.diff
+trivial-xmloff.diff
[ JDK150 ]
# You need 64bit java, e.g. JDK 1.5.0 for AMD64:
diff -u openoffice.org-2.0.0/debian/control openoffice.org-2.0.0/debian/control
--- openoffice.org-2.0.0/debian/control
+++ openoffice.org-2.0.0/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, gcj-4.0 (>= 4.0.1) [!sparc], gij-4.0 (>= 4.0.1) [!sparc], libgcj6-dev (>= 4.0-0pre10) [!sparc], autoconf, sharutils, libgtk2.0-dev, pkg-config, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-openssl-dev | libcurl3-dev, libxrender-dev, render-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, dmake (>=4.3-1), lsb-release, libxinerama-dev, libxkbfile-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, libsndfile1-dev, xsltproc, libaltlinuxhyph-dev (>= 0.1.1-7), java-gcj-compat-dev (>= 1.0.28-8), libxt-java [!sparc], libxp-java [!sparc], libjaxp1.2-java [!sparc], libxalan2-java (>= 2.6.0-1) [!sparc], libxerces2-java [!sparc], libdb4.2-dev, libdb4.2-java [!sparc], gjdoc (>= 0.7.5-1), imagemagick, ant (>= 1.6.5) [!sparc], unixodbc-dev [!amd64], unixodbc-dev (>= 2.2.11) [amd64], g++-3.4 [sparc] , mozilla-dev , libnss-dev (>= 1.7.5) , libhunspell-dev (>= 1.0.8-3) , libstlport4.6-dev (>= 4.6.2-3) , libboost-dev , libportaudio-dev , libmyspell-dev (>= 3.1-12), libwpd8-dev (>= 0.8.2-2) , libicu34-dev , libxmlsec1-dev (>= 1.2.9), libxmlsec1-nss (>= 1.2.9), libxmlsec1-openssl (>= 1.2.9) , libcairo2-dev, libglitz-glx1-dev , mdbtools-dev (>= 0.5.99.0.6pre1.0.20050409-1) , kdelibs4-dev (>= 3.4.2-2), libgamin-dev , libhsqldb-java (>= 1.8.0.0-2) , bsh (>= 2.0b4-1)
+Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, gcj-4.0 (>= 4.0.1) [!sparc], gij-4.0 (>= 4.0.1) [!sparc], libgcj6-dev (>= 4.0-0pre10) [!sparc], autoconf, sharutils, libgtk2.0-dev, pkg-config, xutils, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-openssl-dev | libcurl3-dev, libxrender-dev, render-dev, python-dev, libneon24-dev, libcupsys2-dev, libarchive-zip-perl, libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, libxml2-dev, dmake (>=4.3-1), lsb-release, libxinerama-dev, libxkbfile-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, libsndfile1-dev, xsltproc, libaltlinuxhyph-dev (>= 0.1.1-7), java-gcj-compat-dev (>= 1.0.28-8), libxt-java [!sparc], libxp-java [!sparc], libjaxp1.2-java [!sparc], libxalan2-java (>= 2.6.0-1) [!sparc], libxerces2-java [!sparc], libdb4.2-dev, libdb4.2-java [!sparc], gjdoc (>= 0.7.5-1), imagemagick, ant (>= 1.6.5) [!sparc], unixodbc-dev [!amd64], unixodbc-dev (>= 2.2.11) [amd64], g++-3.4 [sparc] , mozilla-dev , libnss-dev (>= 1.7.5) , libhunspell-dev (>= 1.0.8-3) , libstlport4.6-dev (>= 4.6.2-3) , libboost-dev , libportaudio-dev , libmyspell-dev (>= 3.1-12), libwpd8-dev (>= 0.8.2-2) , libicu34-dev , libxmlsec1-dev (>= 1.2.9), libxmlsec1-nss (>= 1.2.9), libxmlsec1-openssl (>= 1.2.9) , libcairo2-dev, libglitz-glx1-dev , mdbtools-dev (>= 0.5.99.0.6pre1.0.20050409-1) , kdelibs4-dev (>= 3.4.2-2), libgamin-dev
Build-Conflicts: linux-kernel-headers (= 2.6.12+0rc6-1) [powerpc]
Standards-Version: 3.6.2
Package: openoffice.org
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, xlibmesa-gl | libgl1, mozilla-browser | mozilla-firefox | firefox | mozilla-thunderbird, openoffice.org-officebean, java-gcj-compat | j2re1.4 | java2-runtime, openoffice.org-filter-so52
Conflicts: openoffice.org2
@@ -56,7 +56,7 @@
at http://openoffice.debian.net or join us on IRC #debian-oo.
Package: openoffice.org-core
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-common (>> ${base-version}), openoffice.org-l10n-en-us (>> ${base-version}) | openoffice.org-l10n-${base-version}, ttf-opensymbol, ${shlibs:Depends}, libnss3 (>= 1.7.5), libnspr4, debconf (>= 1.2.0) | debconf-2.0 ${java-common-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde (<= 2.0.3-6), ooqstart-gnome (<= 0.8.3-8), openoffice.org-help-de (<< ${base-version}), openoffice.org-help-en (<< ${base-version}), openoffice.org-help-el (<< ${base-version}), openoffice.org-help-es (<< ${base-version}), openoffice.org-help-fr (<< ${base-version}), openoffice.org-help-it (<< ${base-version}), openoffice.org-help-ja (<< ${base-version}), openofffice.org-help-ko (<< ${base-version}), openoffice.org-help-pt-br (<< ${base-version}), openoffice.org-help-sv (<< ${base-version}), openonffice.org-help-tr (<< ${base-version}), openoffice.org-help-zh-cn (<< ${base-version}), openoffice.org-help-zh-tw (<< ${base-version}), openoffice.org-bin, openoffice.org2-core
Provides: openoffice.org-bundled, openoffice.org2-core
@@ -105,7 +105,7 @@
http://openoffice.debian.net
Package: openoffice.org-writer
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), ${shlibs:Depends}, ${writer-pyuno-dep}
Recommends: java-gcj-compat | j2re1.4 | java2-runtime ${java-common-depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer
@@ -123,7 +123,7 @@
http://openoffice.debian.net
Package: openoffice.org-calc
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), ${shlibs:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-calc
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-calc
@@ -140,7 +140,7 @@
http://openoffice.debian.net
Package: openoffice.org-impress
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), openoffice.org-draw (>> ${base-version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress
Conflicts: openoffice.org-debian-files, openoffice.org2-impress
@@ -157,7 +157,7 @@
http://openoffice.debian.net
Package: openoffice.org-draw
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-draw
Conflicts: openoffice.org-debian-files, openoffice.org2-draw
@@ -174,7 +174,7 @@
http://openoffice.debian.net
Package: openoffice.org-math
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-math
Conflicts: openoffice.org-debian-files, openoffice.org2-math
@@ -191,7 +191,7 @@
http://openoffice.debian.net
Package: openoffice.org-base
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-core (>> ${base-version}), ${shlibs:Depends}, java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends}, openoffice.org-java-common
Suggests: unixodbc, libmyodbc | odbc-postgresql | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java
Replaces: openoffice.org-core (<< 1.9.113-0pre1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base
@@ -223,7 +223,7 @@
http://openoffice.debian.net
Package: openoffice.org-kde
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version})
Suggests: oooqs-kde, konqueror, kmail, kaddressbook
Section: kde
@@ -248,7 +248,7 @@
http://openoffice.debian.net
Package: openoffice.org-gnome
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version})
Suggests: oooqstart-gnome, openoffice.org-evolution
Section: gnome
@@ -275,7 +275,7 @@
http://openoffice.debian.net
Package: openoffice.org-evolution
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Section: gnome
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), openoffice.org-base
Recommends: evolution
@@ -307,7 +307,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Enhances: mozilla-browser, mozilla-firefox, firefox, openoffice.org, openoffice.org-core
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version})
Recommends: mozilla-firefox | mozilla-browser
@@ -320,7 +320,7 @@
Package: openoffice.org-officebean
Section: interpreters
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Section: misc
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version})
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -349,7 +349,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: ${shlibs:Depends}, ${dev-stl-depends}, openoffice.org-core (= ${Binary-Version})
Recommends: dmake, g++-4.0 | g++-3.4, java-gcj-compat-dev
Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
@@ -406,7 +406,7 @@
Package: openoffice.org-hunspell
Section: text
-Architecture: i386 powerpc sparc
+Architecture: i386 powerpc sparc amd64
Depends: ${shlibs:Depends}, openoffice.org-core (>= ${base-version})
Recommends: myspell-dictionary
Provides: openoffice.org2-hunspell
diff -u openoffice.org-2.0.0/debian/rules openoffice.org-2.0.0/debian/rules
--- openoffice.org-2.0.0/debian/rules
+++ openoffice.org-2.0.0/debian/rules
@@ -60,9 +60,9 @@
BUILD_DEPS=
-ifeq "$(DIST)" "Ubuntu"
+#ifeq "$(DIST)" "Ubuntu"
BUILD_AMD64=y
-endif
+#endif
ifeq "$(ARCH)" "amd64"
BUILD_PYUNO=n
@@ -160,12 +160,16 @@
ifeq "$(ARCH)" "sparc"
ENABLE_JAVA=n
else
+ifeq "$(ARCH)" "amd64"
+ ENABLE_JAVA=n
+else
ifneq "$(SARGE_BACKPORT)" "y"
ENABLE_JAVA=y
else
ENABLE_JAVA=n
endif
endif
+endif
ifeq "$(ENABLE_JAVA)" "y"
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME) --with-java=gij
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common
Reply to: