Bug#642951: libreoffice: needs adjustments to build on s930x
Package: libreoffice
Version: 1:3.4.3-2
Severity: normal
Tags: patch
User: debian-s390@lists.debian.org
Usertags: s390x
libreoffice fails to build on s390x as it misses some code to define the
DLLEXTENSION on this architecture. I have used the same extension a on
s390, as defined in solenv/inc/unxlngs390x.mk (by including
unxlngs390.mk).
The patch below fixes the issue, with it libreoffice builds well and
seems to work correctly (I have been able to load and edit a few
document). Could you please include it in the next upload? Thanks in
advance.
diff -Nru libreoffice-3.4.3/debian/patches/s390x.diff libreoffice-3.4.3/debian/patches/s390x.diff
--- libreoffice-3.4.3/debian/patches/s390x.diff 1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-3.4.3/debian/patches/s390x.diff 2011-09-20 13:05:25.000000000 +0200
@@ -0,0 +1,14 @@
+--- libreoffice-3.4.0/libreoffice-build/patches/hotfixes/s390x.diff
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/s390x.diff
+@@ -0,0 +1,11 @@
++--- tools/inc/tools/solar.h.orig
+++++ tools/inc/tools/solar.h
++@@ -251,6 +251,8 @@
++ #define __DLLEXTENSION "lp.so"
++ #elif defined LINUX && defined S390
++ #define __DLLEXTENSION "l3.so"
+++#elif defined LINUX && defined S390X
+++ #define __DLLEXTENSION "l3.so"
++ #elif defined LINUX && defined ARM32
++ #define __DLLEXTENSION "lr.so"
++ #elif defined LINUX && defined SPARC
diff -Nru libreoffice-3.4.3/debian/patches/series libreoffice-3.4.3/debian/patches/series
--- libreoffice-3.4.3/debian/patches/series 2011-09-15 21:48:04.000000000 +0200
+++ libreoffice-3.4.3/debian/patches/series 2011-09-20 13:05:01.000000000 +0200
@@ -23,3 +23,4 @@
fix-sample-icc-1.3.2-patch.diff
update-sdbc-postgresql.diff
handle-NULL-display-gracefully.diff
+s390x.diff
-- System Information:
Debian Release: wheezy/sid
APT prefers unreleased
APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: s390x
Kernel: Linux 3.0.0-1-s390x (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libreoffice depends on:
ii liblucene2-java 2.9.4+ds1-4
ii libreoffice-base 1:3.4.3-2
ii libreoffice-calc 1:3.4.3-2
ii libreoffice-core 1:3.4.3-2
ii libreoffice-draw 1:3.4.3-2
ii libreoffice-filter-mobiledev 1:3.4.3-2
ii libreoffice-impress 1:3.4.3-2
ii libreoffice-java-common 1:3.4.3-2
ii libreoffice-math 1:3.4.3-2
ii libreoffice-report-builder-bin 1:3.4.3-2
ii libreoffice-writer 1:3.4.3-2
ii ttf-dejavu 2.33-2
ii ttf-sil-gentium-basic 1.1-2
Versions of packages libreoffice recommends:
pn libpaper-utils 1.1.24+nmu1
pn ttf-liberation | ttf-mscorefonts-installer <none>
Versions of packages libreoffice suggests:
pn cups-bsd <none>
pn default-jre [java5-runtime] 1:1.6-43
pn gstreamer0.10-ffmpeg <none>
pn gstreamer0.10-plugins-bad <none>
pn gstreamer0.10-plugins-base <none>
pn gstreamer0.10-plugins-good <none>
pn gstreamer0.10-plugins-ugly <none>
pn hunspell-dictionary <none>
pn hyphen-hyphenation-patterns <none>
pn iceweasel | firefox | icedove | thunderbird | iceape-browser | <none>
pn imagemagick | graphicsmagick-imagemagick-compat <none>
pn libgl1-mesa-glx [libgl1] 7.11-6
pn libldap-2.4-2 2.4.25-3
pn libreoffice-filter-binfilter <none>
pn libreoffice-gnome | libreoffice-kde <none>
pn libreoffice-help-3.4 <none>
pn libreoffice-l10n-3.4 <none>
pn libreoffice-officebean <none>
pn libsane <none>
pn libxrender1 1:0.9.6-2
pn menu <none>
pn myspell-dictionary <none>
pn mythes-thesaurus <none>
pn openclipart-libreoffice <none>
pn openjdk-6-jre [java5-runtime] 6b23~pre9-2
pn pstoedit <none>
pn unixodbc <none>
Versions of packages libreoffice-core depends on:
ii fontconfig 2.8.0-3
ii libatk1.0-0 2.0.1-2
ii libc6 2.13-21
ii libcairo2 1.10.2-6.1
ii libcurl3-gnutls 7.21.7-3
ii libdb5.1 5.1.25-11
ii libexpat1 2.0.1-7
ii libfontconfig1 2.8.0-3
ii libfreetype6 2.4.6-2
ii libgcc1 1:4.6.1-12
ii libgdk-pixbuf2.0-0 2.24.0-1
ii libglib2.0-0 2.28.6-1
ii libgraphite2-2.0.0 1.0.3.real-1
ii libgstreamer-plugins-base0.10-0 0.10.35-1
ii libgstreamer0.10-0 0.10.35-1
ii libgtk2.0-0 2.24.6-1
ii libhunspell-1.2-0 1.2.14-4
ii libhyphen0 2.7.1-4
ii libice6 2:1.0.7-2
ii libicu44 4.4.2-2
ii libjpeg8 8c-2
ii libmythes-1.2-0 2:1.2.1-1
ii libneon27-gnutls 0.29.6-1
ii libnspr4-0d 4.8.9-1
ii libnss3-1d 3.12.11-3
ii libpango1.0-0 1.28.4-3
ii libpng12-0 1.2.46-3
ii librdf0 1.0.13-3
ii libreoffice-common 1:3.4.3-2
ii libsm6 2:1.2.0-2
ii libssl1.0.0 1.0.0e-2
ii libstdc++6 4.6.1-12
ii libtextcat0 2.2-9
ii libx11-6 2:1.4.4-2
ii libxaw7 2:1.0.9-2
ii libxext6 2:1.3.0-3
ii libxinerama1 2:1.1.1-3
ii libxml2 2.7.8.dfsg-4
ii libxrandr2 2:1.3.2-2
ii libxrender1 1:0.9.6-2
ii libxslt1.1 1.1.26-8
ii libxt6 1:1.1.1-2
ii ttf-opensymbol 2:2.4.3+LibO3.4.3-2
ii ure 3.4.3-2
ii zlib1g 1:1.2.3.4.dfsg-3
Versions of packages libreoffice-writer depends on:
ii libc6 2.13-21
ii libgcc1 1:4.6.1-12
ii libicu44 4.4.2-2
ii libreoffice-base-core 1:3.4.3-2
ii libreoffice-core 1:3.4.3-2
ii libstdc++6 4.6.1-12
ii libwpd-0.9-9 0.9.3-1
ii libwpg-0.2-2 0.2.0-4
ii libwps-0.2-2 0.2.2-1
ii libxml2 2.7.8.dfsg-4
ii ure 3.4.3-2
ii zlib1g 1:1.2.3.4.dfsg-3
Versions of packages libreoffice-writer recommends:
ii default-jre [java5-runtime] 1:1.6-43
ii libreoffice-emailmerge <none>
ii libreoffice-filter-binfilter <none>
ii libreoffice-java-common 1:3.4.3-2
ii libreoffice-math 1:3.4.3-2
ii openjdk-6-jre [java5-runtime] 6b23~pre9-2
Versions of packages libreoffice-writer suggests:
pn libreoffice-base 1:3.4.3-2
pn libreoffice-gcj <none>
Versions of packages libreoffice-calc depends on:
ii libc6 2.13-21
ii libcolamd2.7.1 1:3.4.0-2
ii libgcc1 1:4.6.1-12
ii libreoffice-base-core 1:3.4.3-2
ii libreoffice-core 1:3.4.3-2
ii libstdc++6 4.6.1-12
ii lp-solve 5.5.0.13-7
ii ure 3.4.3-2
Versions of packages libreoffice-base depends on:
ii base-files 6.5
ii default-jre [java5-runtime] 1:1.6-43
ii libc6 2.13-21
ii libgcc1 1:4.6.1-12
ii libhsqldb-java 1.8.0.10-10
ii libreoffice-base-core 1:3.4.3-2
ii libreoffice-core 1:3.4.3-2
ii libreoffice-java-common 1:3.4.3-2
ii libstdc++6 4.6.1-12
ii openjdk-6-jre [java5-runtime] 6b23~pre9-2
ii ure 3.4.3-2
Versions of packages libreoffice-base suggests:
pn libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools <none>
pn libmysql-java | libpg-java | libjtds-java <none>
pn libreoffice-gcj <none>
pn libreoffice-report-builder <none>
pn unixodbc <none>
Versions of packages libreoffice-impress depends on:
ii libc6 2.13-21
ii libgcc1 1:4.6.1-12
ii libreoffice-core 1:3.4.3-2
ii libreoffice-draw 1:3.4.3-2
ii libstdc++6 4.6.1-12
ii ure 3.4.3-2
Versions of packages libreoffice-math depends on:
ii libc6 2.13-21
ii libgcc1 1:4.6.1-12
ii libreoffice-core 1:3.4.3-2
ii libstdc++6 4.6.1-12
ii ttf-opensymbol 2:2.4.3+LibO3.4.3-2
ii ure 3.4.3-2
-- no debconf information
Reply to: