diff options
| author |   eroen <eroen@occam.eroen.eu> | 2013-08-30 18:20:46 +0200 |
|---|---|---|
| committer | eroen <eroen@occam.eroen.eu> | 2013-08-30 18:20:46 +0200 |
| commit | 3489b8feeb505896a8d314a21ae05c7892038dfc (patch) | |
| tree | 2ce2106055a53a9d512c91454f2a090a5e6b584a /app-office | |
| parent | libreoffice-4.1.1.2 - make check failures optional (diff) | |
| download | eroen-3489b8feeb505896a8d314a21ae05c7892038dfc.tar.gz eroen-3489b8feeb505896a8d314a21ae05c7892038dfc.tar.bz2 eroen-3489b8feeb505896a8d314a21ae05c7892038dfc.zip | |
libreoffice-4.1.1.2 - ugly patches for libcxx
- drop old, unused patches
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/files/disable-CppunitTest_sw_uwriter.patch | 14 | ||||
| -rw-r--r-- | app-office/libreoffice/files/disable-bridge-test.patch | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.1.2.ebuild | 16 |
4 files changed, 16 insertions, 28 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 4482855..c3742dc 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,8 +2,6 @@ AUX Make-the-SAL_STREAM-thing-compile.patch 919 SHA256 c5bbc809fa159db8733057672 AUX Nah-we-still-need-the-dynamic_cast.patch 997 SHA256 55a5ff9b8f877fe522c27c1f8db0a93202030412be8cc2087026bd74753c4410 SHA512 9047f3c6d3530c02a8f3d924b48daf77dc9d0d04d5f219bbf1e7c83b4a2a2d8d47f0d4815364dd0e8aef32fcdb2fa25b13d190a283164ee28205b84052874544 WHIRLPOOL d6c836862ff97ef0dca0394105735d6236a6f2411acb0d29389dc948279640ac01ff5b8aadea0d2a89cbdac30d4c0ea4f25c32208b0755857e5d7098ebfe848c AUX No-need-for-a-buggy-rewrite.patch 1867 SHA256 188cd24434f7dad88d49f2d62324be641e4d6beb9613f55099b2c88b3746518b SHA512 1c322d5aa21adb72a66d53a2d739f19e8bdab02c4e05cdcec1db574414c2e9a1014f80eb84c854d29398447a93c4b41f7150e0e12b920d4afdaa87b93060ca11 WHIRLPOOL c9913b9cb517d418fbdf4d8f78f5530287c0105251659af80d818a387456fe0c2a7ea20c49ffdf6817f974e48864ffbe80eef09529f12ff98c240b2f9a4c8115 AUX cppcheck-fix-duplicateExpression.patch 1119 SHA256 0b9e4f5d37d1ad8c43f94df395f4011fab03a759d127a67a8b895c66d3b36f33 SHA512 cbc230442e283e814283be39c8ae150ddaff76db2d6ce13887f6f9fef3766de472ede7d7d22fe26b9b40ed0bb1e4b23a8429c16abb17a007a6557c4248aaf391 WHIRLPOOL fa8ce9b6937d5ad6bcf75cc20713f0739a73c2a04bf11f1e1d10abe4d2c4e19d8d68ce172abbddac4546ef1b0af1a3da3dae5eb61f92bf4c5d9d4469173fd193 -AUX disable-CppunitTest_sw_uwriter.patch 390 SHA256 fb82eec44d4b4114177f2b58bd04804c68c9f382529568346f5a09354fcb4f3a SHA512 c71482ecb07563689d037eefc18ae59670308cf639c3bb25f30b9a20ffa2b3e2c8779d064071218d8fcf9497916c8d32a8e3acd25f133788a2c44c92713da012 WHIRLPOOL b0495818178caa656419326ddd07cb46e8ae3fa8546c3dee8a319eb1f8e32616c0bf026308bc55af9b6eb8b0894eab8be37c36a246713024709f1a4a3909c4f0 -AUX disable-bridge-test.patch 391 SHA256 f844a20cc8aff5c6474938fc1061dbd5db3e27faaf9d667c5f3883d7170e7b2b SHA512 201c5a9c491303c4bc6647f5f27ada390380ac9412666ecf9e37d73f89bdf35c68bec8f9e3ceee81b331f8bf5376721257384fc8526e08280be7737ac7f864ec WHIRLPOOL 71c921150783864769139ade6c0c30f00b52f3db1e42842349d3164115fb7714eefe0bb5cd8e5e20b747718ea57fb190a3c398e05ea2327a7f2c3aa5ffee3c81 AUX disable-uno-test.patch 340 SHA256 6a1ba7096375416b5ebee4253bdfd1445f5072f3377455d57a33232b1b4887b0 SHA512 b647d6a87a5cae253400e086a53eda139bd9c5a2affc0ead4613e16c67cf1ff6ca5b6ac863a3951c7e13a559383b1f025c0e170a9e0a0618625289d3fc91b541 WHIRLPOOL 32aaeca9098749c94bb2f671c36bf7227406b6a221eb8d252826e64fff9b7a83cd72b27f04369d458b4de7c2552fd147dfc5e9c0036e3a9770c52e2ea15f8acc AUX eliminate-type-ambiguity-for-std-accumulate.patch 1617 SHA256 eace41e236379c320f940b76c84b7e612f694d2d1c779432261d78d39b2aff32 SHA512 e53a0dc05011373806fe3b60a832ce8375de23f9ecb5b15c2699cb0e4e0bd6a6f8a2ea4bc79c065a54274c9ea236c322621b0a4173ad0adebbe4b30c30d9c668 WHIRLPOOL 2011fb1b291a49af71b031d78f9a7a23da302dff289ab2c9b0d478e03ff171090807df83b4a1a480fd2a5657f2f749be9b42d09aec650513e950757603a9b26d AUX fake-exception-name2.patch 1651 SHA256 f21083cae202e59a87c0c8f4b747e6c254fa16719d0db52cd8b39c526b55db77 SHA512 155dc573a097f66d742231be55eddab38c0beb6a342d95abe61d94a31516fdd3b3db2fe55e520089cf43fbd7cf3bafce74105eca0d1c23b78503ae4dc9b004d2 WHIRLPOOL 380c5dd4daa626e273e40138a2e30ca516afd17b05bb80d9e021dd436803765285c37c0d5ad26aa7e75119ea73b7d726bbd8167da9e74d828fce19246d871c3c @@ -29,5 +27,5 @@ DIST libreoffice-help-4.1.0.4.tar.xz 1847260 SHA256 273003ceb9758ab0f4ee1952b61f DIST libreoffice-help-4.1.1.2.tar.xz 1847556 SHA256 5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965 SHA512 4c2b69b171a079b1169a2474f4fa9ca3f8f2c04fd564f724ea55588596d140486eebd06150edfe3b9f01a6324d142aa0222cdfa4fe28e2fb1571091aca42e426 WHIRLPOOL 9380d858c77afaf3b97d755327f8760705c4e78fa6e2045b0721d39b97deb9aa7f14bdc846b4399e16ee7f4a1b8043e267e6a5aed9a3c46bbaf687ccd97e3e62 EBUILD libreoffice-4.0.4.2.ebuild 17574 SHA256 e3ecc2b8082aedfc973917d290289c220e9ea2c9b629367bb5d6a94f6038d8dc SHA512 dc97d984260f657f6bebbf0f2fd0bf26611746381a00d68fcc118481ba438cdd16ca5b12f92648978eb486940a45d0858af2a1111cfb1a6957bd71b16e13a999 WHIRLPOOL 9d0fa5e6e6bd772d9cfc99c41e4bd38f33cef0ee66a84fcfb7b06c65a43ab71adcd2b5cb5b64148e78b7c18a66e81531ff8212f5094547a7f3c38993ee92e882 EBUILD libreoffice-4.1.0.4.ebuild 18126 SHA256 b9875c9d070a6f76561fea3910b51cd10c90f1b6db413da4e89cc6eafd449660 SHA512 82c56cd6bc318710f123106a9bc750950eae5532d537e777618055b81cfcfcfb0159767233e2969822e67deb7167f991b75532793f0ab64e691e6a6b1f2189be WHIRLPOOL 095ebe25c078ad386222103feb0e565c51dda3fdebe22f2ec6f8a18ced4a058e289c2abf5c65b913ae162c8cfd1bf23de2e083b3bebc5248486818df360d2870 -EBUILD libreoffice-4.1.1.2.ebuild 17527 SHA256 73549293f09ba5ed106ba2a15ce980e02f24aa1d696b969e8e5fb0de4fb2cb30 SHA512 a58ec04cfa11575124637a82ba8601a4ccf0988da4668596988b9cc0cfdcf625cd0e37252ffeb80e7695fc45674aeca05a4ec4d5499a519a505886d278a2abc2 WHIRLPOOL 2341b6a95d2096f3fd23304a305271f9c1b0a59c3f7367021ba2830588e1841fbf70a095a0dc1c608d132b9f939a43dd6d33ff827f8f5d44f1c0e26fe6c6410d +EBUILD libreoffice-4.1.1.2.ebuild 18066 SHA256 39115d2f489ba10849893ff9dd55106221c69ef2adc5cab91b0cff089fff11b7 SHA512 2a587111be193273a508023c4f22a27d8b29d86b149e374bb288b8a4627aa29f202e6f004698834db9a89d3871fe889194f3f73676f982bf2735059168d29999 WHIRLPOOL 7b4000793ee436cb349e9381f2f0ceaeb6d0132b00d7f0c31d00f641f4314011f545a7980bd1f26f7202b198c6231a92254630846a781503d86888b6d99cebd6 MISC metadata.xml 1070 SHA256 de41d50cd5feb95c56e82aba578d66b9a54441e292c119a1ae170bc148e35fad SHA512 3bc097f513cdfac24a9661cca38b484d006098d618c14ea4bbf9ee11704b6fbe9210dc0c808a82e09cc5940f2ac88e73327f292b95ff35c1637bf99afcf7ba2a WHIRLPOOL dd91776ae5538f175ef2cbd77a7dc5f0c2f97fc9f5683ccf7a79d7e87e2e6c8cc5cc863060f60ce5ab6ace11d946114c74dee6f98ea077e08719dbd781853a9c diff --git a/app-office/libreoffice/files/disable-CppunitTest_sw_uwriter.patch b/app-office/libreoffice/files/disable-CppunitTest_sw_uwriter.patch deleted file mode 100644 index dfe6d01..0000000 --- a/app-office/libreoffice/files/disable-CppunitTest_sw_uwriter.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/libreoffice-4.1.0.1/sw/Module_sw.mk 2013-07-13 22:50:48.735630800 +0200 -+++ b/libreoffice-4.1.0.1/sw/Module_sw.mk 2013-07-13 22:51:56.815235432 +0200 -@@ -41,10 +41,6 @@ - - endif - --$(eval $(call gb_Module_add_check_targets,sw,\ -- CppunitTest_sw_uwriter \ --)) -- - $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_htmlexport \ - CppunitTest_sw_macros_test \ - diff --git a/app-office/libreoffice/files/disable-bridge-test.patch b/app-office/libreoffice/files/disable-bridge-test.patch deleted file mode 100644 index 2480e8a..0000000 --- a/app-office/libreoffice/files/disable-bridge-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libreoffice-4.1.0.1/testtools/Module_testtools.mk 2013-07-13 22:04:00.717824708 +0200 -+++ b/libreoffice-4.1.0.1/testtools/Module_testtools.mk 2013-07-13 22:03:17.520527883 +0200 -@@ -12,7 +12,6 @@ - ifneq ($(CROSS_COMPILING),YES) - - $(eval $(call gb_Module_add_targets,testtools,\ -- CustomTarget_bridgetest \ - InternalUnoApi_bridgetest \ - StaticLibrary_bridgetest \ - Library_cppobj \ diff --git a/app-office/libreoffice/libreoffice-4.1.1.2.ebuild b/app-office/libreoffice/libreoffice-4.1.1.2.ebuild index 84383ac..2575ed9 100644 --- a/app-office/libreoffice/libreoffice-4.1.1.2.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.1.2.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: @@ -335,6 +335,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 |