projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e36d6c)
Backport build fixes to 4.4.0
authorAndreas Hüttel <dilfridge@gentoo.org>
Mon, 23 Feb 2015 11:34:40 +0000 (11:34 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Mon, 23 Feb 2015 11:34:40 +0000 (11:34 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x94BFDF4484AD142F

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch [new file with mode: 0644] patch | blob
app-office/libreoffice/libreoffice-4.4.0.3.ebuild patch | blob | history

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 07cfe7da99d215412fb2696d33593dd59f922aa9..171572e606e5790b18f43aa5415d3ed8bb45bf6e 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.620 2015/02/22 22:38:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.621 2015/02/23 11:34:32 dilfridge Exp $
+
+  23 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch,
+  libreoffice-4.4.0.3.ebuild:
+  Backport build fixes to 4.4.0
 
   22 Feb 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   files/libreoffice-4.3.5.2-DPI.patch:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 424f44acd5a3878df5258c59507356bdcfa1eeee..2d9ae1ea4610e5e8e606824c789fa6afc5fd8f93 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,6 +21,7 @@ AUX libreoffice-4.3.5.2-remove-bashisms.patch 1180 SHA256 60c9874b724cd0de61578e
 AUX libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch 1379 SHA256 f64326c3089189520683b8def52dadd73225abf259212ff22cd8e0f5ef183767 SHA512 1366e3914d78ddc22c2dd324b53478c5d76fc8d563f46d02f83b09cceded2e71ea19311e29e6fa23ce230d3bec8f3a56c5ff18572050c6e5a4e03a975d54c38e WHIRLPOOL 2d16b6f90e6bb16de3a53a38e146930eb15685e306558c362e08ffe8c3b410a5124860e22475410f8db6e71fedbed4098b292c8efddfeb8570158046c5736f8a
 AUX libreoffice-4.3.5.2-system-opencollada.patch 5810 SHA256 5ae98f04551520db1118a873a8cb02c0b3306db0d55e3d5b863729e5393c280e SHA512 6749be7d372d2e92ba16697c3bf90be4bdda01d759100a13fcfe89c935e5291715e8556bc42ab8ce5fa47b6dced95f750c7c497051bdf140e8e504e281e2fe58 WHIRLPOOL 47f02ce1e5ca88cef50c75b339206ee0768a0e74862ab37040be7260c35b6c1d5c56a16fe9f2ca077ab457f1bec3b166c8ee031722eb9711cd63e9222e20a33f
 AUX libreoffice-4.4-system-pyuno.patch 1598 SHA256 444ba9a06a548952cd82f7ea2ff17e5bd7b04788dc894ef5376bf3440749de9e SHA512 043c78f923b941a1e8985ee16d8e6b23859207eac0f4fdc52fedbce0103d62309aa7aae14e19f8bb26bef9d4213dee9871fcc3770f99be84f3405573e32ced78 WHIRLPOOL 51f85f39847a587551b6887362557771a81b6abc59b926eace36f8e2eb61cd4895486c28d44fe38e77fc1b77b0ed4e142d65f4793bf2161c9d0c5c0abeca07f7
+AUX libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch 4304 SHA256 33c662ee9a0645b2827c3810f373b5fd84eafbfc9a0fb434cc8d0973daa4ae13 SHA512 6f001ce7dbca593a9c1c91e375df7e0631c2bdf87f84b3ec03fcfb460a698beaa2e99d5a79669aa2de549c47ba8faeb74947d855685db4475fd6f818ac38c5f2 WHIRLPOOL 488b28df2db267affcbe4b6ec956312b7da52d3deb51f64ee2e49388b2f29909c9994a8f597727a72383c81973c115539a8a47d74f5efeaa370aee2eada8367f
 AUX libreoffice-4.4.0.3-telepathy-build-fix.patch 1503 SHA256 d23431960aa3898331b0e80f827c2eb224c3586bdaf9d2bb9dc10e2aa58ae6f3 SHA512 cf76698e851e31646ad7e6f9547d8c0917a047fa93b5132d00f0ea246945344f3e1df2376a9e3ffcd7ee7a4a200e24e213330482fddf50fc47558b5a9b949426 WHIRLPOOL 92e870da0ea77954d2b04e39887909a0cf20fe4277388be0074c01fac5c7adfa1cfed84333b3e7ae26f7866082bb1711ba453f877b8bc2b390d74a17d41830c0
 AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
@@ -42,28 +43,28 @@ DIST libreoffice-help-4.4.0.3.tar.xz 1875968 SHA256 2d805934b8fe74ca9478d550ca21
 EBUILD libreoffice-4.3.5.2.ebuild 19012 SHA256 9555ff6b93870326fcf36b91071f0d8089f0063f0945ed2eceaccda8ca735190 SHA512 e9a2a887fed2c742f6308f4b5ef0d857195c6155251d4d6451078108a8c908bef20fe1c3fa6c3e0c3faf574fe160199dc0fce6c73beaf99b75ff1957b7868e39 WHIRLPOOL 9faebcec975ed9faeac82f5b23ff3bb2689c8fa58d9bae8d207fb75e6412b153b32fc80f3f188f9e3e2afef527bded5e246f608e84a0b02c5e4cab4321f40a06
 EBUILD libreoffice-4.3.6.2.ebuild 19110 SHA256 e88b4fcb5ae3898c37453f955acab7f64ac4b926454cfe8c77ae361b1b1a612d SHA512 3143b3f20e46ec4d3e3348d6c7babb99e483cdd508ff726cd6ea3f5d93f7f7e01db3245b3ebfaaaa68251cbadfe316364e05917bef80971cd47c4e96e68a8bb8 WHIRLPOOL 27958b25234a189f88d498c0157a7572c3cb52045208bbc21aed59fe24e531b51dbbeb1ca9e237a1cdd1babb38994c96a2769be73b8abb0d1083ce26d0a9bed8
 EBUILD libreoffice-4.3.9999.ebuild 19112 SHA256 670748e90e0699ec363803b596f4074a35d36d3cac9457d82b7dfb0ed48cb6f2 SHA512 94445afedf3beccb477baea68bde0dd9231969d2305d2e2d0dd4f722f6b3b64983e6089dd222c1f32d01d0e1b1fbb0cf162296bedd2a7c7c16e77d5e9e4e002e WHIRLPOOL 8e380416e6e0d3947412ecb6325576128eb484a9c3741e6ea2e54886f53a50cf48e487e969e4fd0152677c04e8b86323468f1f0e1020739b54ea9f6ce941bfdb
-EBUILD libreoffice-4.4.0.3.ebuild 18607 SHA256 66b50686113c4f7670ed71b79d95e613cfdd761003805df8d0dcbef299736f47 SHA512 03ebd9b1892352a8191b2eb2b1a115db237166e4d8e5a050619c32f6d255fc4457d6dbf7d1e6917dd6ac3851c42e1b2130398983c4cb1e59bd928c29129b741d WHIRLPOOL 095a51fbe52a937cec529216e486624e1f71c6808432a8802bbfedf4b29614169ca7691f53ffc10087cd1e2c95643d0e5b0dcbcf5135e84d8bd8b367011adf23
+EBUILD libreoffice-4.4.0.3.ebuild 18871 SHA256 dcecf48d1d3c21ed71c096f56ec7132a48cf4e01441b587b4d9d79fbc71719b9 SHA512 dfe6392b3869e1b6f817f8bc5ea1eb4e0997c1536b196772fb1bd3ed395ab7d4e7b3ce25a53e875de5745410bebde5211d04e9c948ad3a896567d48fd91e1605 WHIRLPOOL feee50b4a470e608ec4292051be4c8fa6ee1f7638e86718e9cd12639e613b520f93353097697b7876f0bcd8fb972e6cf809dd10c9b8d3a4b42dd2bd1e9c8a947
 EBUILD libreoffice-4.4.9999.ebuild 18765 SHA256 0e039ed3dd73f13f69468963c38d04bc6eee1aab6a8e816bde26d44a9aa39e06 SHA512 4cbffecea20f7369db5b16fbb2d00108d920be1633d9c921409739df65bb54671b3a5d70c51abbc6bef95f3e9e57bf8bd1bd59fbba0291ce01957834ba1f5868 WHIRLPOOL 2b045db957e3fd5564c19e964f7d7cb49219cb5a934a67fde2447e05bfa25a5265d141c28c46e7b8cf14492b8a081012f1f052ad62ea93582821d7d26b2eab94
 EBUILD libreoffice-9999.ebuild 18684 SHA256 27dd83470d87503e85b4a838c4525f20d42a0090026be2c55da2c8fc146331bd SHA512 4bcf3cea52d75ede4322ba28aa572cfe60f017a5464a8e9835f61b43fe26d313a76a894ad3e798d40f55624247cb0cff0e243ff093b8ee95722d4787e9ec1464 WHIRLPOOL 887ebf2480d2478ec0a659a464e56736f95cef99b0c5ec5f5694e0d1ff67b83ffcd28824af965fbb52b288bdf05253ce4ed6388afa1a8163ea4fad6c670cf881
-MISC ChangeLog 3739 SHA256 f35abf0d9f98d98b98a0c52ee3e0ab4398dfbadbe211a8d98e5da4525848b5b7 SHA512 c92ad3e9f41c50fa4deb354501ba20371f2f6d77807fba80408e5c0b71383f7e950c1ad808c567b80f0a1b46ada8d453d67d047560ce96ada957b515484dadf1 WHIRLPOOL f9aa12b40223f449f3f3754708a5bfebb0224e8930d16f0a89580a1e60d1ab69bc25cc1a5ccd5e9ea7a929f5e2527f1e5580caabfad8b36c511faf4871635481
+MISC ChangeLog 3919 SHA256 1b123fe709eaaf8b295df35e0547518dc480fcf09c2ea7d3031bccd16f792ca4 SHA512 dd62ef5cace4c8cb646422bec326358f1d0f5d8ae071cfd446795047582822a54796eb0d60963fa38f3c3a69bf281f134f44d4eae74fe73c023b7c885d4c65d7 WHIRLPOOL f804ab5927539b626603b72fdccaf4d236461e05d24659d8bd06c2df15d0e6bad5363cc3bd1d752f1f98950fb1081a8bf6b6e8bdd621bf57f0fe620aa3bbe59b
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU6lpnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcAFwP/1MLeFQLB2xk9QoJkVPsDLom
-ggrf8AlJq+td9mRrFjAqyy/McK4CNIgadEIhBfV5jAGg/81I6fpYMIx+fzcpOaeL
-LEUftO5QY/hlBL0l86tqek6ZnIEmsFrdnNexX8D83+U8O0zaV0R6k/YnJd4T8Ctm
-5UbxHfKpzJCB9bSxQKa9swkJXvYEZnp3zr/rBfn92dWCvtq4oXBy9rjlpt3gOOA0
-r+tjYao/HkDqGnavtHUowZ1d/YbJiyhOIfEdJVA0dgeItKB/xoBhjpIBZn78bjfE
-LdEyp1B8k8qbBv3nCNrl+CdaSLikdZ/HQ2f2Y41zty1YTjCMDtaeNYqRc6FY0jBr
-sE+1BPxjlMiwMV/pm1HBvrw18bKhoIWrxz4IUm+Nv6WUvKpCpn29hEZfr9Nad9sT
-7+bSZB+EgiOlZfJs5Pp7aLT8Yo81lU6Mn0JQeL0bQheYnwi++Q/XIGTuzSnjEyb4
-jWTg98V1A1uG/vB2huRrHr21TVd6OvitxuCBtKBSZZq5F37C8vK0jr5raGRbthsV
-plfINqRcvnHf6OWaZX3E1lmOrzJedJDbt36i05iplDxNzE0FUe8Srt2weMHWjm9b
-PK6cq7Kkj2dHxkdGLkHEOdkp6/rqlJKP1VWGQksmXG5xkiLFJcNFgt/RMBVLyFmC
-+DrqqUJtoFJ25/u+uz8u
-=wxNH
+iQJ8BAEBCABmBQJU6xADXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMkRCMDNGRDg4MkUwQTczOTgwMkE3RUEx
+RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKVgBIP/jrG3khqcj3ZtJUN23FkeRmp
+/a53hkM2Y9J050xfTJOlYv2FR0berREC7sBdlQV94j+t+0pclYUt3vOB12QZWHmn
+QZvkv+VwOzTm2BtCMAXX8HtwNr2GY1IBwmoGieJ/qhZrhtOvA/d1V4TQA9xL07pM
+Ju9/qvdFuivRhUUhtDIrF2Zdcwo5rcCA86NB/T90L3+9rSiuzwagwpGXy7eV/Zi5
+E4Cw5EQA2cbZL/iuwjwoSbZ1H8sqFSI+xnXdELokLxushIRGicT3Xk4uBvVjHGf3
+Pc0J8edwlUpDT5qsGOgMGvau558yNXd7AeuoDnfLCWHNEvo34H24Z5kNxtnCNaxD
+NSg5fxmKZtp+u7TOQwBoyTyQuiQLGjZf9XLzUS728G4TmRSA1Uph/4QzL49gYwXr
+9Rl6l+KPA6MS9r4Xc2RSrC7Nn5obXkIWfbxTsVx85RH+ritYeSGZf3897r3WCQvD
+8zWHHDlGn6Zf1jpA9pdFM6P3BQZfopm7j/lDyQfTFpge5CZZC1rQITVHm5OzeS/T
+TaLcfcmzojHXm/VXVbrgr05DLOgh/jZ2vO8HgTEeOqQCu30nf3U3VC5S7w0qYSUl
+AK1/AXIn6GM9dffS5fvmAiTvmlZFmtlaKedHrNQ5qDUwmYV8NPuHAIeJOpHjJUry
+02UJ8e5OTZTPXr3vPZ+p
+=WoSx
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
new file mode 100644 (file)
index 0000000..0f39688
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
@@ -0,0 +1,80 @@
+From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl@redhat.com>
+Date: Sat, 14 Feb 2015 00:17:06 +0100
+Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
+
+A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
+fails because of these undefined symbols:
+
+> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
+ \\bWindowListenerMultiplexer::acquire
+         U non-virtual thunk to WindowListenerMultiplexer::acquire()
+
+They should probably be generated inline.  Work around by out-lining the
+definition of the methods.
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
+
+Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
+(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
+Reviewed-on: https://gerrit.libreoffice.org/14509
+Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
+Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
+
+diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
+index e048e75..b212dff 100644
+--- a/include/toolkit/helper/macros.hxx
++++ b/include/toolkit/helper/macros.hxx
+@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
+ public: \
+     ClassName( ::cppu::OWeakObject& rSource ); \
+     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
+-    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
+-    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
++    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
++    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
+     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ 
+ 
+@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
+ public: \
+     ClassName( ::cppu::OWeakObject& rSource ); \
+     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
+-    void                        SAL_CALL acquire() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::acquire(); } \
+-    void                        SAL_CALL release() throw() SAL_OVERRIDE  { ListenerMultiplexerBase::release(); } \
++    void                        SAL_CALL acquire() throw() SAL_OVERRIDE; \
++    void                        SAL_CALL release() throw() SAL_OVERRIDE; \
+     void                        SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ 
+ 
+@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
+     : ListenerMultiplexerBase( rSource ) \
+ { \
+ } \
++void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
++void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
+ ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
+ { \
+     ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
+diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
+index 797fad2..b109c5f 100644
+--- a/toolkit/source/helper/listenermultiplexer.cxx
++++ b/toolkit/source/helper/listenermultiplexer.cxx
+@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
+ {
+ }
+ 
++void SAL_CALL EventListenerMultiplexer::acquire() throw ()
++{
++    return ListenerMultiplexerBase::acquire();
++}
++void SAL_CALL EventListenerMultiplexer::release() throw ()
++{
++    return ListenerMultiplexerBase::release();
++}
++
+ // ::com::sun::star::uno::XInterface
+ ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+ {
+-- 
+cgit v0.10.2
diff --git a/app-office/libreoffice/libreoffice-4.4.0.3.ebuild b/app-office/libreoffice/libreoffice-4.4.0.3.ebuild
index 83c227af8f44f762c90c6ddd462c91ffa367ffae..d461ee3b5080bcff201bff2d956e793371f4151d 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.4.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild,v 1.3 2015/02/22 10:16:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.0.3.ebuild,v 1.4 2015/02/23 11:34:32 dilfridge Exp $
 
 EAPI=5
 
@@ -244,6 +244,9 @@ PATCHES=(
        # not upstreamable stuff
        "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 
+       # from 4.4 branch
+       "${FILESDIR}/${PN}-4.4.0.3-gcc-4.9-Os-link-failure.patch" # bug 538348
+
        # from master branch
        "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
 )
@@ -524,6 +527,11 @@ src_configure() {
 }
 
 src_compile() {
+       # more and more LO stuff tries to use OpenGL, including tests during build
+       # bug 501508, bug 540624 and probably more
+       addpredict /dev/dri
+       addpredict /dev/nvidiactl
+
        # hack for offlinehelp, this needs fixing upstream at some point
        # it is broken because we send --without-help
        # https://bugs.freedesktop.org/show_bug.cgi?id=46506
Unnamed repository; edit this file 'description' to name the repository.