Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
dev-lang/python-2.7.9: fix timsort
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-kubacki committed Feb 24, 2015
1 parent ff9e3ee commit d4892aa
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
3 changes: 2 additions & 1 deletion dev-lang/python/Manifest
Expand Up @@ -4,6 +4,7 @@ AUX python-2.7-02-Use-stronger-ciphers-by-default.patch 1668 SHA256 ba4c7ff79141
AUX python-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch 2885 SHA256 1f5da8646c678144ecdcf14809ba74d0575fc0321b8838a88c725369e7bf5d95 SHA512 b2672a992388c095556599b84938965a704587c6e3a5be997eacbce7d534cf3558c5be888883a197b0e32283394563d33b02adc7a01be73542fd198af56d246a WHIRLPOOL 644de7191db8c2f83a194f688a040c6b3f90a93e7d4b07a918c0929ab53029e0f07ccd2a0f58a67f1ae7abc0957b0ce4fe21335dc48f6579186d6ca286d6a56d
AUX python-2.7-Enable-static-linking-of-libraries.patch 2133 SHA256 32f42d870590732079f9948ad02ec04ff6c3092d4aba5114231ce5d493bc2369 SHA512 ba1c619b76833a16297bd4be6c26c6e12a3ff7641d9f43e1ac83cc147ca4ff33123dd9aa354d15f3b45c9f3394c0ce2a5b6ef7e34142b0ba35cea4198ddcbbc3 WHIRLPOOL eea4ec8c49c4744c57d69a6eab7328aa61218fd5ff79f8488bf4f4f5cada3b004bc8e5d52817d96e57566ce33af0cbd767387d4aef9163b544a69cb8af33ca8c
AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2
AUX python-2.7.9-Fix-merge_collapse-of-Timsort.patch 869 SHA256 b7446dd4687e3891d87475be4641d65b3971372f58ef48352a2e617949273fd5 SHA512 8ed9d6843efdc552fb8ad866fe9244003876b1b08011d59ed78cf9729e9847a66c41f161b3d507a157c60c99a12dbad6583915e0d0ee232c9b6d06f15749fb8a WHIRLPOOL 147b924746b7780489344e08b678210535a002871f069660fe00f5a743b17010673bd9fb958b5968542023505cdb1b7df6bed90ab15cd4c646b25cce56d0a620
DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4
DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b
EBUILD python-2.7.9.ebuild 10943 SHA256 a743c3d8e6919835e057f983b1466543cecf71af56ac924248621953ba7a6879 SHA512 0838158fe53951e4e1ccf3186ee7e9ba05ee308bf0efb81ddd623e03c43558734dcd54495602c0a199e65519e213c2b8588086b6312e12cbe5ce05e72aa47db1 WHIRLPOOL f61cd5d490acffc113eccb2b4d99aba0a084c87e7d79683d931e238417ac62f159bd3710693c942a5d18d5d79c4a5a53ad774db3c6d75e7ac30445071efdf459
EBUILD python-2.7.9.ebuild 11013 SHA256 5097534180443ab89f154793be904326cd9c0572f64a9308f623dbe5e89580ba SHA512 4863f8e23b27dd07fc5b852c807b3771f6707561ef5fade3cbae9a584495997897a1d30edd99816fcf81dd8238f07eae7dd486a2c85fa1db51eca7417d3daa38 WHIRLPOOL 4efd79b7ebc7c3308ac9c2cefb805145701bd2cb284808d412834396ed564402ae1be4cc23b63c1c11a1b9252897b2949d71b53938a9c46e4b7452f34f6b381f
@@ -0,0 +1,26 @@
From 2bbb9cc6136ba73da558e7dfd79df3787fbc30fc Mon Sep 17 00:00:00 2001
From: Stijn de Gouw <info@envisage-project.eu>
Date: Tue, 24 Feb 2015 15:53:25 +0100
Subject: [PATCH] Fix merge_collapse() of Timsort.

---
Objects/listobject.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Objects/listobject.c b/Objects/listobject.c
index f753643..94fc5e7 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1800,7 +1800,8 @@ merge_collapse(MergeState *ms)
assert(ms);
while (ms->n > 1) {
Py_ssize_t n = ms->n - 2;
- if (n > 0 && p[n-1].len <= p[n].len + p[n+1].len) {
+ if ( n > 0 && p[n-1].len <= p[n].len + p[n+1].len
+ || (n-1 > 0 && p[n-2].len <= p[n].len + p[n-1].len)) {
if (p[n-1].len < p[n+1].len)
--n;
if (merge_at(ms, n) < 0)
--
2.0.4

1 change: 1 addition & 0 deletions dev-lang/python/python-2.7.9.ebuild
Expand Up @@ -98,6 +98,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-2.7-02-Use-stronger-ciphers-by-default.patch"
epatch "${FILESDIR}/${PN}-2.7-03-Support-SSL_CTX_set_ecdh_auto-on-newer-OpenSSLs.patch"
epatch "${FILESDIR}/${PN}-2.7.9-Fix-merge_collapse-of-Timsort.patch"

if use semi-static; then
epatch "${FILESDIR}/${PN}-2.7-Enable-static-linking-of-libraries.patch"
Expand Down

0 comments on commit d4892aa

Please sign in to comment.