diff --git a/libreoffice-mergedlibs-circular-deps.patch b/libreoffice-mergedlibs-circular-deps.patch new file mode 100644 index 0000000..2b3b263 --- /dev/null +++ b/libreoffice-mergedlibs-circular-deps.patch @@ -0,0 +1,24 @@ +From: Bjoern Michaelsen +Date: Tue, 23 Sep 2014 13:52:37 +0200 +Subject: [PATCH] remove circular deps on mergedlibs + +- add dbtools to mergedlibs + +--- + solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk +--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk ++++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk +@@ -112,6 +112,7 @@ gb_MERGEDLIBS := \ + canvastools \ + configmgr \ + cppcanvas \ ++ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ + deployment \ + deploymentmisc \ + $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ +-- +1.9.1 + diff --git a/libreoffice.changes b/libreoffice.changes index c519ba1..54d3c43 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 29 13:54:08 UTC 2014 - tchvatal@suse.com + +- Disable mergedlibs for now as it is not tested enough and broke + ------------------------------------------------------------------- Sat Sep 27 15:46:43 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 2c63b31..cd86d50 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -88,6 +88,8 @@ Patch12: mediawiki-no-broken-help.diff # LO never worked well with it Patch13: jvmfwk-disable-gcj.diff Patch14: libreoffice-4.3.0.3-themes-symlinks.patch +# Mergedlibs are broken as they circdep on each other +Patch15: libreoffice-mergedlibs-circular-deps.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -862,6 +864,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch12 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -951,7 +954,7 @@ export NOCONFIGURE=yes --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ - --enable-mergelibs \ + --disable-mergelibs \ --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \