Re: WHEEZY_BACKPORT fixes for libreoffice 4.2

[Rene Engelhard <rene@debian.org>]

On Tue, Dec 24, 2013 at 06:06:55PM +0800, Paul Wise wrote:
> Hi,
> 
> I've been trying to backport libreoffice 4.2 to Debian wheezy. I was not
> successful yet, currently blocked on a harfbuzz related build failures
> (tarball not found or something) but I found that this patch is needed:

rc1 updated the internal harfbuzz version and thus of course needs an other
tarball :)

You got the current git *AND* the current external etc tarballs?
Probably not, as I didn't upload those yet but git is for rc1 :)
Just doing.

> --- a/patches/series
> +++ b/patches/series
> @@ -20,7 +20,7 @@ debian-hardened-buildflags-CPPFLAGS.diff
>  gtk3-hack-explicit-gmodule.diff
>  py2uno-module.diff
>  ignore-sc_cellrangesbase-fails.diff
> -disable-flaky-unoapi-tests.diff
> +disable-flaky-tests.diff
>  #dont-touch-urd.diff
>  wheezy-backports-python.diff
>  fix-internal-hsqldb-build.diff

Yeah, missed that. (Didn't notice as my snapshot is a bit further
and has that because of more checks disabled).

Fixed.

> --- a/rules
> +++ b/rules
> @@ -578,9 +584,12 @@ endif
>  # Distro-specific overrides
>  
>  # Debian WHeezy
> -ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
> +ifeq "$(shell dpkg-parsechangelog | sed -n 's/Distribution: *//p')" "wheezy-backports"
>    BUGS=mailto:debian-backports@lists.debian.org
>    SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz libatomic-ops libwpd redland libetonyek libfreehand libebook libvisio,$(
> +  ENABLE_LIBLANGTAG=n
> +  ENABLE_ORCUS=n

Why?
We shouldn't disable those, but use the internal ones. (see the filter-out above).

What didn't work here?

> +  ENABLE_EOT=n

Here indeed I forgot it in the filter-out.

Fixed.

>    PACKAGE_SDK_DOCS=n
>    WHEEZY_BACKPORT=y
>  endif
> @@ -857,7 +868,7 @@ endif
>  
>  ifeq "$(ENABLE_JAVA)" "y"
>    ifeq "$(JDK)" "default"
> -       BUILD_DEPS += , java-common (>= 0.49)
> +       BUILD_DEPS += , java-common (>= 0.47)

No. We *do* need (>= 0.49)

java-common (0.49) unstable; urgency=low
[...]
  * Provide a /usr/share/java/java_defaults.mk makefile fragment for
    supported java architectures and versions.

 -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 05 Aug 2013 17:18:05 +0200

and we use this file:

[...]
ifeq "$(ENABLE_JAVA)" "y"
  ifneq "$(WHEEZY_BACKPORT)" "y"
    JDK=default
    include /usr/share/java/java_defaults.mk
  else
    JDK=openjdk
  endif
[...]

Regards,

Rene