summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-10-14 22:39:30 +0200
committereroen2013-10-14 22:39:30 +0200
commit325c8da7df423ff20916b5bc6330240bc23e7d36 (patch)
tree05a0020d2973408a30732ebd0c7309d5f75b3deb
parenta2d71c776839bc91fb5e97fdaf823665f12750f7 (diff)
downloaderoen-overlay-325c8da7df423ff20916b5bc6330240bc23e7d36.tar.gz
eroen-overlay-325c8da7df423ff20916b5bc6330240bc23e7d36.tar.bz2
eroen-overlay-325c8da7df423ff20916b5bc6330240bc23e7d36.tar.xz
libreoffice-4.1.2.3 - ugly patches for libcxx
-rw-r--r--app-office/libreoffice/Manifest2
-rw-r--r--app-office/libreoffice/libreoffice-4.1.2.3.ebuild16
2 files changed, 16 insertions, 2 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 50d0eaab..5d11306e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -29,5 +29,5 @@ DIST libreoffice-help-4.1.2.2.tar.xz 1847828 SHA256 bd9d53a76e460f5d17ab8be230bf
DIST libreoffice-help-4.1.2.3.tar.xz 1847696 SHA256 97724d05de5e8d22a3c248c0900d35031e9bd7757476c02b561e15e122822fe9 SHA512 76d178890bf28d47418123e0d6a3da6d5171af489e3fcf8df911df2fdbb8919407ab961f8ebffb7200ccee6da693f4258dc58fd7130bfe40e73ac349a5024bad WHIRLPOOL fcbc6c9ada537587d9ca93d48ca9453f1ea1f00bc838cbd3e18b436e8ffe24b1f08e2a3abd087e6aa9d616faac2cf58a69913cbf5b6211af4ec9b51107480bbb
EBUILD libreoffice-4.0.4.2.ebuild 17574 SHA256 e3ecc2b8082aedfc973917d290289c220e9ea2c9b629367bb5d6a94f6038d8dc SHA512 dc97d984260f657f6bebbf0f2fd0bf26611746381a00d68fcc118481ba438cdd16ca5b12f92648978eb486940a45d0858af2a1111cfb1a6957bd71b16e13a999 WHIRLPOOL 9d0fa5e6e6bd772d9cfc99c41e4bd38f33cef0ee66a84fcfb7b06c65a43ab71adcd2b5cb5b64148e78b7c18a66e81531ff8212f5094547a7f3c38993ee92e882
EBUILD libreoffice-4.1.2.2-r1.ebuild 18069 SHA256 0660b6e0dcab37815d7a6ea3a9bb33cce26cdc2d295f3f5c12b0d6cc36c2dff5 SHA512 b85db9f241ecbf68a2827537e1e78ef8da210a6aed0cc059aeac452d776d32c304c10701cd6bab04f4e3a3f856b1e9abfc3db680421b65c404fcb27f036197fc WHIRLPOOL ce2e6e3eeaa24a53b8503dd3b6b8db28cc4f61db5c093508693747e2d353d24fdd5a500eb68f82121becb6119971c9430627096f1487861aba3b1150fb3ae3d4
-EBUILD libreoffice-4.1.2.3.ebuild 17511 SHA256 9c4ba4f4ddb33dd5467c36d802902eb1b3dd8c0b2b9e43064d75f58a45eca52a SHA512 1020c5dc95141aabc466e9cfbe5b0b3ce45da7983d369285b480a1f6af213a679583931490461c0b888f61325059a2bf892648f30cc04add1803b89dd3b6b39b WHIRLPOOL f473267a2c6f6654f38d0cf875dc4d5bc0e125ba77416359e452b66432390aecbe2f00cef7d2bc219dccd625f999dd1ef9a9878455509f75303cbca69f6126a3
+EBUILD libreoffice-4.1.2.3.ebuild 18050 SHA256 c13b3e9c787945d32804e5d18f808ec0d9aee3d0371b921dcf6dd21749ffede8 SHA512 9a13c9cb7f2f1e347da06c8b7064cada3929bb3e5e019c9684f592f61ac523f89c73ffe3ab309bda55c8f0cdc0af3782fd8034da38424b11b7e5c4c20a0f116a WHIRLPOOL 0b706f682f9a3c40edd13a10f1beeba600850771877211593d703bb2c46e103223bb06a23a59bc755f91d91381d92c3d64fbd048cfe1f662ec6e5365edc36a27
MISC metadata.xml 1146 SHA256 3843bebbfd99d50aace09728a59b120493877fb4955e8593a06c80a8948c82ad SHA512 4922de602185c8e7e6c6e163d4c4afac09a0172f9c7816248478574d675cc3b389405a0ca32ebff4dd30d1f6515f86b94813d6e794435f5c7c18b8295b64f816 WHIRLPOOL 30619f4e9983ce11ce7a82352c1efa2c2308fb9c74a945a0c1385f42d341a8f1556b33c587a3e3f3942eaa07745abf5836aaa3ed28d30085db7048284f0e49c9
diff --git a/app-office/libreoffice/libreoffice-4.1.2.3.ebuild b/app-office/libreoffice/libreoffice-4.1.2.3.ebuild
index 433a99ed..dc502e83 100644
--- a/app-office/libreoffice/libreoffice-4.1.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.2.3.ebuild
@@ -72,7 +72,7 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
+gtk3 jemalloc kde libcxx mysql odk opengl postgres telepathy test +vba +webdav"
LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -334,6 +334,20 @@ src_prepare() {
epatch
fi
+ if use libcxx; then
+ epatch "${FILESDIR}"/Make-the-SAL_STREAM-thing-compile.patch
+ epatch "${FILESDIR}"/Nah-we-still-need-the-dynamic_cast.patch
+
+ epatch "${FILESDIR}"/i122208-replace-the-binaryurp-cache.patch
+ epatch "${FILESDIR}"/eliminate-type-ambiguity-for-std-accumulate.patch
+
+ ## by eroen
+ epatch "${FILESDIR}"/stop-messing-with-stdlib-internals.patch
+ epatch "${FILESDIR}"/fake-exception-name2.patch
+ epatch "${FILESDIR}"/stop-messing-with-stdlib-internals2.patch
+ epatch "${FILESDIR}"/disable-uno-test.patch
+ fi
+
base_src_prepare
AT_M4DIR="m4" eautoreconf