diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-06-09 18:48:04 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-06-09 18:48:04 +0000 |
| commit | 456c1cc4d9bc03f6da46b522f49ed08fdf466789 (patch) | |
| tree | 9fe48f8676909f5db0b2bf3600ba16d4794407e1 /dev-libs | |
| parent | dev-db/pygresql -> dev-python/pygresql. (diff) | |
| download | historical-456c1cc4d9bc03f6da46b522f49ed08fdf466789.tar.gz historical-456c1cc4d9bc03f6da46b522f49ed08fdf466789.tar.bz2 historical-456c1cc4d9bc03f6da46b522f49ed08fdf466789.zip | |
Fix build failure with Emacs 24.5, bug 545486.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/protobuf/Manifest | 17 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 11 |
3 files changed, 21 insertions, 13 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index edfe94844d2c..0ffc34896492 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.89 2015/05/17 20:18:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.90 2015/06/09 18:47:53 ulm Exp $ + + 09 Jun 2015; Ulrich Müller <ulm@gentoo.org> + files/protobuf-2.5.0-emacs-24.4.patch: + Fix build failure with Emacs 24.5, bug 545486. 17 May 2015; Pacho Ramos <pacho@gentoo.org> protobuf-2.6.1-r3.ebuild: ppc64 stable wrt bug #528240 diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index e62cdf6ecc78..0a47c9d3fdec 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -4,7 +4,7 @@ Hash: SHA256 AUX 70protobuf-gentoo.el 170 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c WHIRLPOOL aeffdec54d947cc219058a1efbe54898b2917947f07cd2249064593542b51e3c772a584106365d57dd9ea7fdf078bea388f6ff73ff857cabefa04aabda07495d AUX proto.vim 49 SHA256 17e7773363e3f5469c717e4173a6f6fa959a6bb30c6ee71f3bdeee159ee5b784 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e WHIRLPOOL 79c1fb6392c0a04fc6a4aec40c983b43f2eb2a3bd5cf807d37fa65b15191b6839a2c9cc182f9f05b7f2873e6689559f634d51c7db5f837d683d5411ecd50a43a AUX protobuf-2.3.0-asneeded-2.patch 705 SHA256 558ea98a54e544919837f88d133b8887ad5101b4493a62737d3cea94ae58464c SHA512 2f9d047ac64ac19bab2a793990de5070ac24604bf81622520a1f9b2e86aecbd125c9cba5b62bc7e296ecc3724069dbd9b07f7d7292be280403fc37af5c52cccf WHIRLPOOL 0b943cdda7feac71d394a9e72bdcbe1dfc3d7efb390496244cf511cbd1468b4b11d9f42501a62fe02b2fab7b4bf0867eb5739cb02af8d4777d22fe781ccd841e -AUX protobuf-2.5.0-emacs-24.4.patch 408 SHA256 1ca039e40ad6379302aeb1a2eb5391c66cef07a5e8e670fa4bac5bfa5fc4e3fb SHA512 243d468780ab65911d791f09f7584287cc4a4b368f7fb3ce517ef01345f1cf26ea5a4c2b264b857aaf5b0c110ff18a22b96020f0602019eae5bd9ddc8526e93b WHIRLPOOL 57a83062ffde2ebb2641899cc7dad57fda929a51d3c194db188dc3f53548c15ba4564eefcb13435d848a57d1ae5cfca6036e65a2987e3590c34f2e85536e2e77 +AUX protobuf-2.5.0-emacs-24.4.patch 294 SHA256 3a60bcd371afe270d3c21cb4ebddb272bd9cf25a281fc0abb03c5981d94f0c07 SHA512 fbf5a44753ea40732decb5b5bf94355f741223cb8d5d09e166b333d4d857340dc937bb5176591645a737ddb3d04203d95462e128655c7236195fe8c1c6e8ef21 WHIRLPOOL 634b0afd5195efa1ddb6f395fd25a20ed0e43faa54e3c0674a18231bc76d0f1d039cce37a94924244722815ad5f8aba3ec0384017d4e43f0ef59cf15eaaa0ba6 AUX protobuf-2.5.0-x32.patch 677 SHA256 8a4378b5b84cf1b91e88344eead7c3e8f3ae848540e7a850bff48994704e8752 SHA512 fa28941ff21785505f616e4da4be964e18de5d52a25224059431054ad7853693ca4281819d690e76eb4064d9d7b729eb1ad10388d43d437b975e62b66f5de1bc WHIRLPOOL 2ae6b2dd9c6d9f63ae2d8caa630e4720d66a30ac3e21bf135f10d4b567a08fecd8757b575a749a95050c6b673b787c09b18f48452cc7d0eaa019b8aa5903d3d4 AUX protobuf-2.6.1-protoc-cmdline.patch 11184 SHA256 c931fcf5b0484d41465e9bc11598379fcdc85d58a882ea209795e5858b5fb4b4 SHA512 17855acd577412866e6e0a515e4dd754ae5aa9e75a9fdd44bb80f4061b28bda1bee5a45671819021ac1487852c20e2404f79ef13b711140cf204cbfb6142ad36 WHIRLPOOL 310f58414cc6ae642d19e29dedce7c6f2d6ae3e0962d526b7421ccf37078372ad046b29206336794898c9ee8f22cc08f0b441db44538174ef19ba50c45513af9 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e @@ -13,12 +13,19 @@ DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f5 EBUILD protobuf-2.4.1.ebuild 3035 SHA256 5c8690b49a5b80b8a4adf028a0d45f0f4ddfdae05e9ba8245f48814d50fc1185 SHA512 1e71dc30d60cab213cfd06c03dc01206ff29740cb852ec8ef87eeffc550af2df2fd4bd396ed900fd0125ce08c469820ab45967cbf46a6514f7e447a1e1bdfa29 WHIRLPOOL a66587c3c187601ac9398a53be03055e0d013d3f16a6fdb4f62e007aa8c469bed9015c480f69734915751df2930a2d589f0bac599cbebed895d1bd1fceb616c0 EBUILD protobuf-2.5.0-r2.ebuild 3262 SHA256 0b215818bce2ff8edeb398d1b53d41c1544f93ea5e00a531c047a8ddce0dbb27 SHA512 eda91eb9c95c21fc7d7a4b6f8385db0aeb80284325d816e08b8cb295ebd3ab2206f756bd70df029f60dd069488741adbd0645573e9437b70cab41dea36ad8e78 WHIRLPOOL d28b104bb69156b0c17e97f056ad3a994a81670d752c76a729533f601a6551bb204194d420d4064bbdb3d16db38ea575cc239e2e5134087f1e3639cb8f8aa446 EBUILD protobuf-2.6.1-r3.ebuild 4093 SHA256 8f9724b7c5ff4872091a1fa4fb97b83311f9f226ef315b0d4db8701b2da8ce40 SHA512 0d065a572e552f6ae042a7c3070b5fe9519104f7d13ca988ac3f090684c62ff04dd8c380eaa97b3c1748c2620f5f72a45a4934571941c6a67cc797db7aac5c95 WHIRLPOOL a00550093096503795fa1b9255a6eaffe3670307ebfe5ea874b5210bb29b1cb59a0fb58640578e6ce1f385d6fbb817414cbb1bd5b304209bc38ff41dfe599f6f -MISC ChangeLog 12573 SHA256 818510535a3e5990ba7c03c04ac85b44188deb8dd140f5e21e3cc8c87330a0a6 SHA512 486c81c092ec0d84dd82455242c41db0c00b4f6fbc55ebefd621c6cf7fa0f0fbcb99b9bc0fda7d14f07d9e3d19a3d16cf2dcaeb5b521fa3641bd7302613b2ba0 WHIRLPOOL 7df1ad6e22fb103c8a4138ae82fe5c6a67f74fd29f5bf2305bb86292702b617e3d405273c9553ccdd4365e62a5b122da75ecea70e73aadfed8ea952fd8ff35dc +MISC ChangeLog 12709 SHA256 a4b9866e50c903a6a8f86a0666f305cbae26ef17beb016642a63b55099a2ade4 SHA512 9d75404c39d3e9b3062a97f9994a7e25459ae3516139f31253b39ca45791de1b23681fb70cde71dea07115a3edf092bb9942f1d60a180d302684b95b8fae6fa9 WHIRLPOOL bdc4d840a2ca5c4559bc45919a27b9191d5e2fa2b39579981bef7c4d601639352ba6759eb34abd203eb51c71a7fd3456d18eb977babed2b707ee15b3c5e8cfb6 MISC metadata.xml 294 SHA256 7060252f98d7d7c362b56dd1f99576e89265a5eb27dbff8e495e6c66256b19ce SHA512 d317e16f9253e18006a165d5b625150cc0d68f0bc943f55fef5df705b5bac9bc3be9ae3183b159b02dd56a2d885897a51791155033ada09793802ec7fda07675 WHIRLPOOL f00e33c0be7cb927cdeb59b5542915f350bedcb496e35de3f71ba612507348b6d92b61ac004edaa749d0f299e830a370a55468487121bfc2fab544536b3b40e3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlVY940ACgkQCaWpQKGI+9T1qQCfVyiv8cMzwwXx2dZoIppsK9rw -nvgAnjKZ6XkeLDoiL4Q+rH9PTO+HLywq -=NHVI +iQGcBAEBCAAGBQJVdzRsAAoJEJQzkH1pP7W4864L/2Xc40Bc1YaHV3Rhn0AgDVtp +YPcJkIMFYR9jE6T1BF6JdiLPg1X1yiyVzZFBLKMAhGysz7L33ioAHOJhJfTE8jPR +LlJOjAu5wD5sO019daiGlufg8Iou0F7U0C9GmbmJCXJTgdJ+KHoOKL6Zou6mkKkf +nNtrosX2tBGsQA3XbpBz+Fa2VeZRy9ErLtq10n2pUnUehyGbE4cjCar6PJjnZs6L +HUhlnurhUp7nC4oXvLq4Od9loW6qq5LQlG6IboK3YmlbHS29/b/sn9NNpMHHJGBC +g5DmW7oDK7T7NtEz9IcZLN1yLVD5RP1rJ6dfjCe4JCQPzLQOFrPq8RvvPvEkVhGq +qzsl3h0bCP+elsswTUhKwsbxDPaiYTNOAMvKfiDB6XkGtUr/43y2ueymk/i8Y6GU +G9f2xuC1xzKifKzdJH6Y4oCEHLPXRLJv28MUtrV6JwcUGx/pOAuUL5fjehGVNwCY +cyxOxkwdP+xllv/DQQ3vwMGhuWAAB60LxsmuxAdLQg== +=YNTt -----END PGP SIGNATURE----- diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch index 5154bd3a0999..77d624938243 100644 --- a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch +++ b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch @@ -4,14 +4,11 @@ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 --- protobuf-2.5.0/editors/protobuf-mode.el +++ protobuf-2.5.0/editors/protobuf-mode.el -@@ -66,6 +66,10 @@ +@@ -66,6 +66,7 @@ (require 'cc-mode) - + (eval-when-compile -+ (and (= emacs-major-version 24) -+ (= emacs-minor-version 4) -+ (null emacs-repository-version) -+ (require 'cl)) ++ (require 'cl) (require 'cc-langs) (require 'cc-fonts)) - + |