[python3/nightly] Fix the patch

[Miro Hrončok]

commit 144849eafe6aeb65b1f56e986e9fdb93944741c1
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Sat Jun 7 12:03:19 2014 +0200

    Fix the patch

 00055-systemtap.patch                            |   15 ---------------
 00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch |    4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/00055-systemtap.patch b/00055-systemtap.patch
index 3200c15..db4d006 100644
--- a/00055-systemtap.patch
+++ b/00055-systemtap.patch
@@ -674,21 +674,6 @@ diff -up Python-3.3.0rc2/Makefile.pre.in.systemtap Python-3.3.0rc2/Makefile.pre.
  
  profile-removal:
  	find . -name '*.gc??' -exec rm -f {} ';'
-diff -up Python-3.3.0rc2/Misc/NEWS.systemtap Python-3.3.0rc2/Misc/NEWS
---- Python-3.3.0rc2/Misc/NEWS.systemtap	2012-09-09 05:11:05.000000000 -0400
-+++ Python-3.3.0rc2/Misc/NEWS	2012-09-10 09:17:21.120511781 -0400
-@@ -619,6 +619,11 @@ Core and Builtins
- 
- - Issue #15038: Optimize python Locks on Windows.
- 
-+- Issue #14776: Added a new --with-systemtap configure-time option, which adds
-+  static markers for SystemTap so that SystemTap scripts can observe bytecode
-+  frames being entered and exited and so generate reports on what Python code
-+  is being exectuted.
-+
- Library
- -------
- 
 diff -up Python-3.3.0rc2/pyconfig.h.in.systemtap Python-3.3.0rc2/pyconfig.h.in
 --- Python-3.3.0rc2/pyconfig.h.in.systemtap	2012-09-09 05:11:14.000000000 -0400
 +++ Python-3.3.0rc2/pyconfig.h.in	2012-09-10 09:17:21.120511781 -0400
diff --git a/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch b/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
index afd8685..d926662 100644
--- a/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
+++ b/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
@@ -1,7 +1,7 @@
 diff -up Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys Python-3.3.0b2/Lib/test/test_sys.py
 --- Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sys	2012-08-11 02:54:16.000000000 -0400
 +++ Python-3.3.0b2/Lib/test/test_sys.py	2012-08-13 14:50:15.253720597 -0400
-@@ -835,12 +835,17 @@ class SizeofTest(unittest.TestCase):
+@@ -969,12 +969,17 @@ class SizeofTest(unittest.TestCase):
          # type
          # static type: PyTypeObject
          s = vsize('P2n15Pl4Pn9Pn11PIP')
@@ -11,7 +11,7 @@ diff -up Python-3.3.0b2/Lib/test/test_sys.py.fix-COUNT_ALLOCS-failure-in-test_sy
          check(int, s)
          # (PyTypeObject + PyNumberMethods + PyMappingMethods +
          #  PySequenceMethods + PyBufferProcs + 4P)
-         s = vsize('P2n15Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 10P 2P 4P')
+         s = vsize('P2n17Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 10P 2P 4P')
          # Separate block for PyDictKeysObject with 4 entries
          s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P")
 +        if hasattr(sys, 'getcounts'):