diff options
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 31 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-3.5.2-tests-headless.patch | 37 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.2.2.ebuild | 3 |
4 files changed, 61 insertions, 17 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 3b96e23904a0..2d79d56c349b 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.274 2012/04/03 07:28:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.275 2012/04/03 12:34:21 scarabeus Exp $ + + 03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libreoffice-3.5.2-tests-headless.patch, libreoffice-3.5.2.2.ebuild: + Pass headless to test runs. This should solve various dbus/assert crashes and + bug#410317. 03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +files/libreoffice-3.5.2-icu-49-part2.patch, libreoffice-3.5.2.2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 2e096dde91ce..333c22d864be 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -9,6 +9,7 @@ AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 RMD160 251ea777df53418e6acbb AUX libreoffice-3.5.1-kde-4.8.1-namespace.patch 1053 RMD160 e36f8df60d988a5b2f086f1829e391c5df1c85f9 SHA1 0192c9f014adf932f9c734a50de8dac7d397c376 SHA256 c55e411f59e97cee0edb551e017422fce83ceafa80ea2c8912d59698a0c088de AUX libreoffice-3.5.2-icu-49-part2.patch 5091 RMD160 a55e52f5d74d987610e6fa762f7da0d1b7d43c92 SHA1 6cc36bd21b446bda36e8515591255d93fbf915f4 SHA256 2d71fb694b210af8a8ad218e392e0908ccb4c60f013dc70277344a70df53a0ce AUX libreoffice-3.5.2-icu-49.patch 2220 RMD160 dfac3775b6133950db86b8d0c4f065aeaab19273 SHA1 350193c0aeecf172dc5801005f27b0408392e331 SHA256 000cbf3bce4234e59d0f1c8f737e088842a13b47e8e95b4053ec48c755f0b47b +AUX libreoffice-3.5.2-tests-headless.patch 1454 RMD160 1ccaef750685e358b358d8d3f094ba888d3d8d0c SHA1 8b84eda96ec4583adb42a3786566b27879a8c000 SHA256 35453c99132f8c65b744f43cbb93f42a668298aa2d752039842cb830844230f9 AUX libreoffice-3.6-system-pyuno.patch 1628 RMD160 c35c4a457fad1f216e9c8f469522f8b92eb4b1b4 SHA1 5319ff747ff78a225013e65046c82548617234ed SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f70489910191f4347b6 SHA1 5be37237f9564613c893a7e486b2a1ebb24584c7 SHA256 9785fe9ae6c11f922b13941a5b60733a8bce70b08db71a9447e960191b210f0d AUX libreoffice-append-no-avx.patch 2418 RMD160 8c9a45ccb95425c13a2de5895761703022d99ac9 SHA1 f181c74bb600c9ecafc9d295148061cc0e0be701 SHA256 1720741dcfbd48345140029b405db68c25564245eaaa3b336113a59b005df611 @@ -114,25 +115,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 0b79b699e3d60974db7793b41c9f8dfb7f6951fd SHA1 f3b7ee7f389077f56c4c6efc8583aa7cf85d23eb SHA256 9e7f82d19a8a762698efa2af848076d15df4fb702612e6dfd5635e10512bbeb3 EBUILD libreoffice-3.4.5.2.ebuild 15232 RMD160 246fd5a3007a6de67ee6023c7bd6a89794692d6d SHA1 29546cda5ce47875b54c9b583261e0bc1b35e514 SHA256 24bff75483db00b80173eff9f60e4fe4117ee871183042a7f8bc2455a08e90cb -EBUILD libreoffice-3.5.2.2.ebuild 14755 RMD160 26fd7745244c172e00f88d283ed9efe68342f83a SHA1 8c5495fa88ecc10094e10dc69ddba9087469343f SHA256 4db70ab3080d2b3e8a13e7abcf0a748eae9e51712aa460620362bc3d0bd00713 +EBUILD libreoffice-3.5.2.2.ebuild 14803 RMD160 5d64ebab3f2baada181f79639e036e86d501b44e SHA1 2ab5ff7e86b923bc7f71d0f215e17d29d7881487 SHA256 04919a5a2c3c1cb9d3b9edbbdd4ce8a8b6a0b24376296cd4d00608e9dae0616e EBUILD libreoffice-3.5.9999.ebuild 14666 RMD160 6b795a520f30d8de61ffaf944b4c7d06eb691cb6 SHA1 de61b8865eee93e095b90591dbf2bd44a1f257a7 SHA256 b22c11fe9f4a1126060e05c3b2d86bddbe5935462906acd926ac00f90b1af33c EBUILD libreoffice-9999-r2.ebuild 14504 RMD160 d7e63ffb3943402b7140fa65c0ab8ffe04364a13 SHA1 f9cbd23599ff0d0299492c4dc228cf6922f339cc SHA256 35be48e208887b9eeb8412ab0bf5992b56581347686c31918445bbd3bbc883f8 -MISC ChangeLog 50279 RMD160 cf43ae8d4e9addc08ed63e9c61d3740f45406c76 SHA1 088d77a4bc991c408981a22909aed9478abbf2a7 SHA256 c2b71ce6229cde323950d51871e06a88b72fadab8ba5dba4812b2e4f972af7a1 +MISC ChangeLog 50506 RMD160 e71656b59da25560cccc3c5ff3040833c8afdc36 SHA1 1a1747ff125264185365b4381f6f93092bfa0410 SHA256 40a1bda0c24d4119f15d44ffa48ca98493a19695715e5db260f7216c7b309f09 MISC metadata.xml 1490 RMD160 0c1570336daac60ec87e2dc84a4f3897d5c3feda SHA1 5efa4d2ef0eb9bd9daa685202b97fdb6a18a7250 SHA256 6ab64c192679a514a95c3c594ca5d212ba60f02b1760352bcc1a6c22838a6c96 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPeqdRAAoJEOSiRoyO7jvo74oP/RV2PUXv2TYkgqvcEtOauq3X -If6XJlHIOKvmsz8Qvsm15SiwU/Npk3MXzrdmMktIXF2TWB7jRmeaawFsCa1+Oq3d -0cbxa//oWbuBSIY+Q1ofFOReqRv6eAt7HTFb4G0CKPF13H4pGP3as2vvCkaAdquA -Cp3A+78LqB1j3BN1CuPnPQWgnychba7Pq68K5amGjQffaOp32WaaaAcXDOC0nk1T -Xp0XdXyWddOc7JXTVlmOAUye5Hc5yEPnt6kohGhocSCOci9Dwp/8KQqdQM/fGDah -MzgbBeJudRjvj5Ic9ME0cArJ4vCYUXt6dBBBTCQD4UUookhzAuFWVfyJh3PMhp4d -OynBeWssifKfwQ9aVeNtpi5a/hnfwyOzr1DsTv66HZWy4Rh6LZ+zTwLwJwm9Nxoi -vpTovPhGNEHXW4x8lzRVcrwV1eE6QraJbPxOCxYQOgHZEEa8SjmPrw6/HluyFgPV -zPagi0fyPFp4ci7m3SZrj/TX5c1yr0DbI1jsDiAPnYd3qLTFtowj7IdSTvLwjD7L -QgYP5W/95htjg0XQnRH4o4eB4ELe0jbOZZl/vMCScRugEj/IH1Tokc9jFHyL4pTq -78cJHDc8FEorwqjUPyVfkG52RGlcEX1c+oPjsKY6AdLMKBPw3MfKpImUQ/wR4lJh -FCX/eveY7I6Bn+z8NoD7 -=YLji +iQIcBAEBAgAGBQJPeu6EAAoJEOSiRoyO7jvomHYP/R8QAWgkyCoSTJrBcCKew8JQ +fd/ZuVnA5Yq/VzDDkaimq9GuWhyhPD7bOiFRQPEDb9C13U6PRUinIaI20aAWBHoY +pqr48se0gPQkeJfHS263Kht2i7guIFTuaqzDWlE25XGKKtAXzEhMGei9gk7YtPNx +MHKS6I5FngCM5XH+noXXzGAWx+AO/NHaSuuIOyf7bt9y9MrSXfJ/OVaVZvd4mVlY +KNYueV5mecA7vXlSshM9CL+2x1SGrnjK7FPW41Rc+QtS8oQzqbY3/0Xhbwwtompf ++8zdzlaB1WI94Lj/zHCu/ILffkmXIugTgUFO7sXYob/nPUZ/8tUwnMQcycMbO3wl +c9Kjcr6vmh0ftCYVsDk09bwWDG/JnZ6f1kjz0O04hfAY2WdauXx8qpgeSm9Vb+gY +xPyvbX8InZEe7XaIfs4rIEbAoCypHlr5a0Nd7r4qBZ9F/pv/fmOBbaSRIDxYlUb2 +nKdXrfzIGgICIpE8XKpUCwi7RpFB22VBAg+JJm3pSkZURgtUEf3YOwU6DQv8WF4s +fkLEiyXFtYT0mVED5ySputS1mLOELKlTSf485QGJh18pPWfFy3HHU6dBcN0Zy1VZ +Qn3uUC5AcTWEOZ4yscfs6Ne6sG1yFI/a5jf5ViDL8qFi+DLlK2eu5sUgdeb1D8IV +W158bIrmGXirptkE+jv1 +=i2sU -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-3.5.2-tests-headless.patch b/app-office/libreoffice/files/libreoffice-3.5.2-tests-headless.patch new file mode 100644 index 000000000000..e654c9b384c0 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.5.2-tests-headless.patch @@ -0,0 +1,37 @@ +From b8ec5464300a0c909166197a09a80c837b90fef5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz> +Date: Tue, 3 Apr 2012 14:21:23 +0200 +Subject: [PATCH] always pass --headless to cppunits +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +They should not need any actual UI anyway, and most of them already +pass the option manually. +http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html + +This is partial code grab as cherry-pick had the test-mk files collisions +all over the place. I pick only the additional define which results in some +tests adding --headless twice, which does no harm. + +Author: Luboš Luňák <l.lunak@suse.cz> +Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz> +--- + solenv/gbuild/CppunitTest.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk +index 0d8959e..826d3f5 100644 +--- a/solenv/gbuild/CppunitTest.mk ++++ b/solenv/gbuild/CppunitTest.mk +@@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(1) + gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb + define gb_CppunitTest__make_args + $(ARGS) \ ++--headless \ + $(if $(strip $(UNO_TYPES)),\ + "-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\ + $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \ +-- +1.7.7 + diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild index 6953b6d7cde4..54f74cf97bd1 100644 --- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.6 2012/04/03 07:28:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.7 2012/04/03 12:34:21 scarabeus Exp $ EAPI=4 @@ -196,6 +196,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" "${FILESDIR}/${PN}-3.5.2-icu-49.patch" "${FILESDIR}/${PN}-3.5.2-icu-49-part2.patch" + "${FILESDIR}/${PN}-3.5.2-tests-headless.patch" ) REQUIRED_USE=" |