[SCM] KDE Development Platform Libraries module packaging branch, kde4.4, updated. debian/4.4.5-4-1-gab27b2a
Scott Kitterman
kitterman at alioth.debian.org
Wed May 4 19:01:10 UTC 2011
The following commit has been merged in the kde4.4 branch:
commit ab27b2a4042cdc0d62922e3841aa6e9c42d940fc
Author: Scott Kitterman <scott at kitterman.com>
Date: Wed May 4 14:46:39 2011 -0400
* Add missing include <cstddef> to kjs/collector.h (Closes: #625625)
32_missing_include_cstddef.diff
---
debian/changelog | 8 ++++++++
debian/patches/32_missing_include_cstddef.diff | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0266c04..bfbea28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kde4libs (4:4.4.5-5) unstable; urgency=low
+
+ * Team Upload
+ * Add missing include <cstddef> to kjs/collector.h (Closes: #625625)
+ 32_missing_include_cstddef.diff
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 04 May 2011 13:52:13 -0400
+
kde4libs (4:4.4.5-4) unstable; urgency=low
[ Sune Vuorela ]
diff --git a/debian/patches/32_missing_include_cstddef.diff b/debian/patches/32_missing_include_cstddef.diff
new file mode 100644
index 0000000..98abdba
--- /dev/null
+++ b/debian/patches/32_missing_include_cstddef.diff
@@ -0,0 +1,18 @@
+Description: Add missing include <cstddef> to kjs/collector.h. Taken from
+KDE SVN commit 1195598
+Author: Scott Kitterman <scott at kitterman.com>
+Bug-Debian: http://bugs.debian.org/625625
+Forwarded: not-needed
+Origin: upstream
+Last-Update: 2011-05-04
+
+--- kde4libs-4.4.5.orig/kjs/collector.h
++++ kde4libs-4.4.5/kjs/collector.h
+@@ -27,6 +27,7 @@
+
+ #include <wtf/HashCountedSet.h>
+ #include <cstring>
++#include <cstddef>
+
+ #define KJS_MEM_LIMIT 500000
+
diff --git a/debian/patches/series b/debian/patches/series
index 508fd22..5c4aee7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ qdbus_exports_changed.diff
cve_2011_1168_konqueror_xss.diff
cve_2010_3170_cn_wildcards.diff
cve_2011_1094_ssl_verify_hostname.diff
+32_missing_include_cstddef.diff
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list