[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-3-1-geb23a23
The following commit has been merged in the master branch:
commit eb23a232ca47a4aa36ae6396d7f7d5e1140410f4
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 20 18:20:57 2013 +0200
clarify uno-executables-link-to-xmlreader.diff and mention experimentals binutils, thanks Aurelien Jarno
diff --git a/changelog b/changelog
index 7dc9ab2..1cce386 100644
--- a/changelog
+++ b/changelog
@@ -2,14 +2,17 @@ libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
sp2bv/regcomp/regsingleton/uno-skeletonmaker build on
- mips(el) by linking explicitly with libxmlreader.so
+ mips(el) by linking explicitly with libxmlreader.so with sids gcc without
+ experimentals binutils.
* debian/control.in, debian/rules:
- depend on fonts-dejavu instead of ttf-dejavu (closes: #708062)
+ - prepare build-depending on experimentals binutils on mips(el), thanks
+ Aurelien Jarno for the hint
* debian/copyright:
- mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license
- -- Rene Engelhard <rene@debian.org> Mon, 20 May 2013 13:50:58 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 20 May 2013 18:19:56 +0200
libreoffice (1:4.0.3-2) unstable; urgency=low
diff --git a/patches/uno-executables-link-to-xmlreader.diff b/patches/uno-executables-link-to-xmlreader.diff
index 691b116..078504b 100644
--- a/patches/uno-executables-link-to-xmlreader.diff
+++ b/patches/uno-executables-link-to-xmlreader.diff
@@ -1,3 +1,29 @@
+17:51 < aurel32> _rene_: for libreoffice on mips, either you need an old
+ gcc-4.7 (e.g. the one from wheezy), or a binutils matching the
+ changes from gcc-4.7 (e.g the one from experimental)
+17:51 < aurel32> well s/gcc-4.7/gcc-4.6/
+17:53 < _rene_> well, I have a workaround now (which is building), so...
+17:53 < _rene_> but thanks for the info
+17:53 < _rene_> aurel32: I do exactly as gcc says and link with that lib. seems
+ to work
+17:53 < _rene_> aurel32: (that's what the LO build on gabrielli currently does)
+17:54 < aurel32> at some point we'll need a binutils upload to fix that properly
+[...]
+18:00 < _rene_> aurel32: ok, to summarize: both gcc-4.6 and -4.7 sid don't
+ "work". only with experimentals binfilter?
+18:01 < _rene_> aurel32: /me could then remove the patch and add a appropriate
+ build-dep when the new binutils is in sid..
+18:03 * _rene_ can try with that build-dep with LO 4.1 beta1 (to be released
+ and maybe uploaded next week) in experimental :)
+18:08 -!- zwenna [~user@p4FC60FB4.dip0.t-ipconnect.de] has joined
+ #debian-release
+18:08 < aurel32> _rene_: as far as i know yes, gcc-4.6 and -4.7 from sid (and
+ soon from testing) need the experimental binutils
+18:09 < aurel32> _rene_:
+ http://www.sourceware.org/ml/binutils/2012-08/msg00064.html
+18:10 < _rene_> ok. /me will add a comment to the patch and adapt the changelog
+ then.
+
diff -urN cpputools.old/Executable_regcomp.mk cpputools/Executable_regcomp.mk
--- a/cpputools.old/Executable_regcomp.mk 2013-04-30 14:54:23.000000000 +0200
+++ b/cpputools/Executable_regcomp.mk 2013-05-17 21:41:13.665548985 +0200
diff --git a/rules b/rules
index ef8a446..ee0172a 100755
--- a/rules
+++ b/rules
@@ -526,6 +526,14 @@ OOO_NSPLUGIN_ARCHS=
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
+# see uno-executables-link-to-xmlreader.diff. That workaround is not needed
+# with said binutils. Thanks Aurelien Jarno for the hint.
+#ifneq "$(WHEEZY_BACKPORT)" "y"
+# ifneq (,$(findstring mips, $(DEB_HOST_ARCH)))
+#BUILD_DEPS += , binutils (>= 2.32) [mips mipsel}
+# endif
+#endif
+
#############
# Distro-specific overrides
--
LibreOffice packaging repository
Reply to: