[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1-15-g5af3b20

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Mon Jun 4 22:06:38 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=26e5354

The following commit has been merged in the kde4.8 branch:
commit 26e5354ae09938b20b1300d66e5150e1c49237e7
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Jun 4 22:32:32 2012 +0200

    Drop upstream_Increase-max-global-stack-size-back-to-1000.patch.
---
 debian/changelog                                   |    6 +---
 debian/patches/series                              |    1 -
 ...crease-max-global-stack-size-back-to-1000.patch |   27 --------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 501d8f7..930015e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,6 @@ kde4libs (4:4.8.4-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
-  [ Pino Toscano ]
-  * Backport upstream commit 4f35dfae765a29819dc0bf7ac0dfdba21239f3ca to fix
-    Twitter in KHTML.
-
   [ Raúl Sánchez Siles ]
   * Added: upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
     Backport upstream commit 5feb2da93c4fcd18d3a38659abb9fb040704d123 to fix
@@ -16,6 +12,8 @@ kde4libs (4:4.8.4-0r0) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Add watch file.
+  * Update patches:
+    - refresh python3-support-bytecode.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 May 2012 12:10:37 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 0f2f3ca..1ae291e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,5 +22,4 @@ ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
 python3-support-bytecode.patch
-upstream_Increase-max-global-stack-size-back-to-1000.patch
 upstream_Avoid_infinite_recursion_khtml_renderwigdet_handleevent.diff
diff --git a/debian/patches/upstream_Increase-max-global-stack-size-back-to-1000.patch b/debian/patches/upstream_Increase-max-global-stack-size-back-to-1000.patch
deleted file mode 100644
index 0585a99..0000000
--- a/debian/patches/upstream_Increase-max-global-stack-size-back-to-1000.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4f35dfae765a29819dc0bf7ac0dfdba21239f3ca Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <sandsmark at samfundet.no>
-Date: Wed, 16 May 2012 02:45:09 +0200
-Subject: [PATCH] Increase max global stack size back to 1000.
-
-Some pages have started running out of stack frames (e. g. Twitter).
-Instead of reducing this the next time, consider reducing stack usage.
----
- kjs/bytecode/machine.cpp.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kjs/bytecode/machine.cpp.in b/kjs/bytecode/machine.cpp.in
-index 3a2686b..a434c36 100644
---- a/kjs/bytecode/machine.cpp.in
-+++ b/kjs/bytecode/machine.cpp.in
-@@ -42,7 +42,7 @@
- // If we improve our stack usage, we can bump this number.
- #define KJS_MAX_STACK 100
- #else
--#define KJS_MAX_STACK 700 // ### set system specific
-+#define KJS_MAX_STACK 1000 // ### set system specific
- #endif
- 
- namespace KJS {
--- 
-1.7.10
-

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list