Hello community,

here is the log from the commit of package kdelibs4 for openSUSE:Factory 
checked in at 2013-04-15 11:15:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
 and      /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdelibs4", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes        
2013-03-15 10:38:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes   
2013-04-15 11:15:19.000000000 +0200
@@ -1,0 +2,25 @@
+Thu Apr 11 06:25:59 UTC 2013 - [email protected]
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
+Mon Apr  1 19:13:48 UTC 2013 - [email protected]
+
+- Update to 4.10.2
+  * Bugfixes
+- Drop kdelibs-4.10.0-giflib5.patch, it is pushed upstream
+- Replace kjs-stacklimit.diff with a correct fix
+
+-------------------------------------------------------------------
+Sat Mar 16 20:54:16 UTC 2013 - [email protected]
+
+- Add kjs-stacklimit.diff:
+  * Fix overflow computing availableStackSize from stack limit (kde#316923)
+
+-------------------------------------------------------------------
+Wed Mar 13 20:44:30 UTC 2013 - [email protected]
+
+- fix build with giflib-5 (kdelibs-4.10.0-giflib5.patch)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes        2013-03-30 
14:57:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes   2013-04-15 
11:15:19.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Apr 11 06:22:25 UTC 2013 - [email protected]
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
+Tue Apr  9 06:36:04 UTC 2013 - [email protected]
+
+- Drop kio_revert_slow_filesystems.patch, fixed upstream (kde#288824).
+
+-------------------------------------------------------------------
+Mon Apr  1 19:13:48 UTC 2013 - [email protected]
+
+- Update to 4.10.2
+  * Bugfixes
+- Drop kdelibs-4.10.0-giflib5.patch, it is pushed upstream
+- Replace kjs-stacklimit.diff with a correct fix
+
+-------------------------------------------------------------------

Old:
----
  kdelibs-4.10.0-giflib5.patch
  kdelibs-4.10.1.tar.xz
  kio_revert_slow_filesystems.patch

New:
----
  kdelibs-4.10.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.ZnqhLT/_old  2013-04-15 11:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZnqhLT/_new  2013-04-15 11:15:23.000000000 +0200
@@ -17,13 +17,13 @@
 
 
 Name:           kdelibs4-apidocs
-Version:        4.10.1
+Version:        4.10.2
 Release:        0
 Summary:        KDE 4 API documentation
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org
-Source0:        kdelibs-%{version}.tar.xz
+Source0:        
http://download.kde.org/stable/%{version}/src/kdelibs-%{version}.tar.xz
 Source1:        baselibs.conf
 Source2:        hidden.desktop
 Source3:        ycp.xml

++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.ZnqhLT/_old  2013-04-15 11:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZnqhLT/_new  2013-04-15 11:15:23.000000000 +0200
@@ -24,7 +24,7 @@
 %define kderev 0
 
 Name:           kdelibs4
-Version:        4.10.1
+Version:        4.10.2
 Release:        0
 %define default_branding 4.10
 BuildRequires:  OpenEXR-devel
@@ -88,7 +88,7 @@
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org
-Source0:        kdelibs-%{version}.tar.xz
+Source0:        
http://download.kde.org/stable/%{version}/src/kdelibs-%{version}.tar.xz
 Source1:        baselibs.conf
 Source2:        hidden.desktop
 Source3:        ycp.xml
@@ -106,16 +106,13 @@
 Patch10:        kdebug-areas-update.diff
 Patch12:        desktop-translations.diff
 Patch13:        kjs-mark-register-stack.diff
-# PATCH-FIX-UPSTREAM kjs-stacklimit.diff -- Fix overflow computing 
availableStackSize - [email protected]
+# PATCH-FIX-UPSTREAM kjs-stacklimit.diff -- kjs: Avoid overflow computing 
availableStackSize in KJS::RegExp::match - [email protected]
 Patch14:        kjs-stacklimit.diff
 Patch17:        flash-player-non-oss.diff
 Patch18:        plasma-libs.diff
 Patch20:        ignore-inline-menu.diff
 Patch24:        ksuseinstall.diff
 Patch26:        fix_kdeclarative_install_location.diff
-Patch28:        kio_revert_slow_filesystems.patch
-# PATCH-FIX-UPSTREAM kdelibs-4.10.0-giflib5.patch -- fix for changed giflib-5 
API [email protected]
-Patch29:        kdelibs-4.10.0-giflib5.patch
 PreReq:         permissions
 Requires:       soprano >= %( echo `rpm -q --queryformat '%{VERSION}' 
libsoprano-devel`)
 Recommends:     strigi >= %( echo `rpm -q --queryformat '%{VERSION}' 
strigi-devel`)
@@ -179,14 +176,12 @@
 %patch10
 %patch12
 %patch13
-%patch14
+%patch14 -p1
 %patch17
 %patch18
 %patch20
 %patch24
 %patch26 -p1
-%patch28 -p1
-%patch29 -p1
 
 #
 # define KDE version exactly

++++++ kdelibs-4.10.1.tar.xz -> kdelibs-4.10.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.10.1.tar.xz 
/work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.10.2.tar.xz differ: char 26, 
line 1

++++++ kjs-stacklimit.diff ++++++
--- /var/tmp/diff_new_pack.ZnqhLT/_old  2013-04-15 11:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZnqhLT/_new  2013-04-15 11:15:23.000000000 +0200
@@ -1,13 +1,56 @@
-Index: kjs/regexp.cpp
-===================================================================
---- kjs/regexp.cpp.orig
-+++ kjs/regexp.cpp
-@@ -505,7 +505,7 @@ UString RegExp::match(const RegExpString
-     if (tryGrowingMaxStackSize) {
-       rlimit l;
-       getrlimit(RLIMIT_STACK, &l);
--      availableStackSize = l.rlim_cur;
-+      availableStackSize = l.rlim_cur == RLIM_INFINITY ? 
sWantedStackSizeLimit : l.rlim_cur;
-       if (l.rlim_cur < sWantedStackSizeLimit && 
-           (l.rlim_max > l.rlim_cur || l.rlim_max == RLIM_INFINITY)) {
-         l.rlim_cur = (l.rlim_max == RLIM_INFINITY) ? 
+commit ffc8a6a316cacc8df6a91584653fe2c867a5d489
+Author: Bernd Buschinski <[email protected]>
+Date:   Fri Mar 29 21:26:40 2013 +0100
+
+    kjs: Avoid overflow computing availableStackSize in KJS::RegExp::match
+    
+    REVIEW:109555
+    BUG:316923
+
+diff --git a/kjs/regexp.cpp b/kjs/regexp.cpp
+index 5294d62..3622194 100644
+--- a/kjs/regexp.cpp
++++ b/kjs/regexp.cpp
+@@ -258,7 +258,12 @@ static bool sanitizePatternExtensions(UString &p, 
WTF::Vector<int>* parenIdx)
+ 
+ bool RegExp::tryGrowingMaxStackSize = true;
+ bool RegExp::didIncreaseMaxStackSize = false;
++
++#if HAVE(SYS_TIME_H)
++rlim_t RegExp::availableStackSize = 8*1024*1024;
++#else
+ int RegExp::availableStackSize = 8*1024*1024;
++#endif
+ 
+ RegExp::RegExp(const UString &p, char flags)
+   : _pat(p), _flags(flags), _valid(true), _numSubPatterns(0)
+diff --git a/kjs/regexp.h b/kjs/regexp.h
+index f6132e6..67446fc 100644
+--- a/kjs/regexp.h
++++ b/kjs/regexp.h
+@@ -36,6 +36,13 @@ extern "C" { // bug with some libc5 distributions
+ }
+ #endif //HAVE_PCREPOSIX
+ 
++#if defined _WIN32 || defined _WIN64
++#undef HAVE_SYS_TIME_H
++#endif
++#if HAVE(SYS_TIME_H)
++#include <sys/resource.h>
++#endif
++
+ #include "ustring.h"
+ 
+ namespace KJS {
+@@ -81,7 +88,11 @@ namespace KJS {
+ 
+     static bool tryGrowingMaxStackSize;
+     static bool didIncreaseMaxStackSize;
++#if HAVE(SYS_TIME_H)
++    static rlim_t availableStackSize;
++#else
+     static int availableStackSize;
++#endif
+   private:
+ #ifdef HAVE_PCREPOSIX
+     pcre *_regex;

++++++ plasma-libs.diff ++++++
--- /var/tmp/diff_new_pack.ZnqhLT/_old  2013-04-15 11:15:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZnqhLT/_new  2013-04-15 11:15:23.000000000 +0200
@@ -1,7 +1,7 @@
 --- plasma/containment.cpp     2012-10-12 14:26:42.586367366 +0200
 +++ plasma/containment.cpp     2012-10-12 20:54:32.890230374 +0200
-@@ -143,6 +143,18 @@
-     setHasConfigurationInterface(false);
+@@ -140,6 +140,18 @@
+     setBackgroundHints(NoBackground);
  }
  
 +Containment::Containment(QObject *parent, const QVariantList &args, bool 
showToolBox)


-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to