[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

WHEEZY_BACKPORT fixes for libreoffice 4.2



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:

--- 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
--- 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
+  ENABLE_EOT=n
   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)
        JAVA_HOME=/usr/lib/jvm/default-java
        BUILD_DEPS += , default-jdk$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
     ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))

-- 
bye,
pabs

http://wiki.debian.org/PaulWise

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: