From: Michał Górny Date: Fri, 5 Aug 2011 07:41:12 +0000 (+0000) Subject: Fix avx patch wrt bug #377845. Proxied for scarabeus. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f3d14ba03ba4717f507241d4b48ad2f73a4d5287;p=gentoo.git Fix avx patch wrt bug #377845. Proxied for scarabeus. Package-Manager: portage-2.2.0_alpha50_p1/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d4e7b7428da5..50679492e6ff 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.85 2011/08/04 17:56:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.86 2011/08/05 07:41:11 mgorny Exp $ + + 05 Aug 2011; Michał Górny + files/libreoffice-check-for-avx.patch: + Fix avx patch wrt bug #377845. Proxied for scarabeus. 04 Aug 2011; Andreas K. Huettel libreoffice-3.4.2.3.ebuild, +files/libreoffice-binfilter-as-needed.patch: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 2e3138fc3797..1c6ed32fda29 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 @@ -16,7 +16,7 @@ AUX libreoffice-32b-qt4-libdir.patch 878 RMD160 5d1d90ca61106ac4962d7f7048991019 AUX libreoffice-append-no-avx.patch 2415 RMD160 b1080696d5a77eff0997422f73ba10c2d2a6b09f SHA1 ca026ee7941002e340e12b1bff164841024ca2dc SHA256 2d7542645585af2f485d38bbdb23c4c2f369301139de8cb441417e9ae15f85b6 AUX libreoffice-as-needed-gtk.patch 403 RMD160 c1c5733d282eb3b59b7fe03d5258e9c917d9c6c4 SHA1 7516a3d554d96b7a27e5884ef124f9f5166a5939 SHA256 88609b6bac793423dee7af79110a05981669471170f9473a2bc591d35927117a AUX libreoffice-binfilter-as-needed.patch 1112 RMD160 334c7ee6109b4121dea78715fef00320c945a49e SHA1 ca816ea54146c574fd18d9b8f616c4ae17f04a4d SHA256 b922b27ee671bd936709500ff750a48bba4463ea11738b798f643e5a7ac545a6 -AUX libreoffice-check-for-avx.patch 1913 RMD160 f3660a48be7a9eb553cef25784b2adc9d4e73c8e SHA1 2cce3839c9c1a31078427ca73c644d8dc7ed1365 SHA256 7d18e8ea61df6144fabb3b05d55edf450b5c270b3fb99c66167151d233f3aed0 +AUX libreoffice-check-for-avx.patch 1973 RMD160 49ec33a7a230886e59658000ff0469bdd7606df8 SHA1 08003e579eafaa09c2df211a27b36533cf5a90ca SHA256 3c31378033355efa499eafb0100d52dcd6b339b2fab067f6c159caf6d365fae8 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81 @@ -172,22 +172,14 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626 EBUILD libreoffice-3.4.2.3.ebuild 19238 RMD160 87a2e1c737c5cda6413f147ff18c24304b9bb6fc SHA1 2d3fe64537d794de371eb6aeaa1fb065b2785ce4 SHA256 c215656208b86f010b0485c71c2d054a8c7339c2d2883e8a56c905c1d0ec4175 EBUILD libreoffice-3.4.9999.ebuild 18678 RMD160 c403b7cc30f155a72ae77dbb06dbac43ebc5179b SHA1 36a8cb7cda0572b6122e206abd0072455a71c107 SHA256 962e44162d576603ad052253807b4a000fe6577b0f4058fd64b65f89dd3f71f5 -MISC ChangeLog 17015 RMD160 a40f399c785c90f89e5b53c6de86c4cfc1f5565f SHA1 7f121bb8a42ee40cd89cac90c4c262a09bcb7df3 SHA256 e4862c8bfdddf8d080436bb48e994450b6937da0319068dab24177ea2ff17929 +MISC ChangeLog 17160 RMD160 50eed85e7ce15aa6eb329111667b743ff21f6007 SHA1 ab0df6ebb05f0d7076b6ec28124fbbae2dbd1109 SHA256 ecd986652bd07007a55f7b448720b8db45ebcc58a19a498075db59d31f746400 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOOt17AAoJEEb+UGWnxTyHhpQP/35aeTKaSwNcWhr6uHCnrjCW -/1G2zqLMK4tcupQqKSSRIHHlc35H3Bnm4NsZOIv+qz9UGZbEoUFIu3BTqViXbyja -tBH999z6LxbHOLPkOhzYs/Qo4DcaJun5W6E9VQAB2B+IL+1kXPAJzMn3zPwoWYDY -j2XXVU2HGVFjfmUuGPnflR7Q0pI0E+D+q9LvsaRNc/ovHlvgFJKhZggduv2rdxK9 -P2wBtMGjI/ZjItzsVk4mHsbDFm23h2CppjFuB3wf9SxPV7n7uCwif7LZ3AulUfDe -9UsnBdQ6HuI6cyafBpKskKVrv2yWq6ZoniVwnPqmxQTya7fJadEQu6K3Um77YSnn -A8T0ij8BAeIt//bj87TuuMC2e45Ps31tOBprwrO6GaiNjrk3GzdCKoruL8iW+nOR -rPw8fd+sDZvZuTYbGO0RgdIHNbvgCXFycUjXGIpU+Bm1+v2GK5hfEhtz77ybQdtj -7J3FqK+3bYqzUqPPfEZdJeN+1H/3kwn9Qh8LOAw3NDnwZ6pDma22J1QQocaxdgb7 -qYf3v/5j2qCo3EnoGD89nJZZOTW/+Z0opRPzNS5V23LvKm4FlieYUWn6GTm3EdN+ -3ywsDgKgVpZnENxMxRx88kQZOwQrbT3dPKUlsMzKbge+GaN15f2rquKR7gH2VlxD -dtd2AvJyqeosXCs9TVEG -=jaes +iJwEAQEIAAYFAk47nvoACgkQfXuS5UK5QB1HtQQArI5ic5V1a3G93zDd1U1JbFdl +WgnNkawoqpLHncgYkvTINTDiuGj1ToJP1U0xprlj+mYnK4Cx5D526J35w3yZ2rSM +vnZE4d3P9Ut/4Rix2Lbhbe44sGut+WPJgUKjzlv8ZHVoklL0iAe5XwJ9YdOH1X/D +u1uXp3p9nqsEzfQ/MSs= +=quYO -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-check-for-avx.patch b/app-office/libreoffice/files/libreoffice-check-for-avx.patch index fd487d913605..57f479f7b67f 100644 --- a/app-office/libreoffice/files/libreoffice-check-for-avx.patch +++ b/app-office/libreoffice/files/libreoffice-check-for-avx.patch @@ -1,8 +1,8 @@ diff --git a/configure.in b/configure.in -index 65813cb..5f5085e 100755 +index 65813cb..bfa612c 100755 --- a/configure.in +++ b/configure.in -@@ -1984,6 +1984,36 @@ if test "$GCC" = "yes"; then +@@ -1984,6 +1984,41 @@ if test "$GCC" = "yes"; then fi AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) @@ -34,7 +34,12 @@ index 65813cb..5f5085e 100755 +}], have_avx_intrinsics=yes) +CFLAGS=$avx_save_CFLAGS +AC_MSG_RESULT([$have_avx_intrinsics]) -+AM_CONDITIONAL(HAVE_GCC_AVX, [test "x$have_avx_intrinsics" = "xyes"]) ++AS_IF([test "x$have_avx_intrinsics" = "xyes"], [ ++ HAVE_GCC_AVX=TRUE ++], [ ++ HAVE_GCC_AVX=FALSE ++]) ++AC_SUBST(HAVE_GCC_AVX) + dnl =================================================================== dnl Set the ENABLE_PCH variable. (Activate --enable-pch)