diff --git a/.cvsignore b/.cvsignore index cf84b0b..c943f91 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdelibs-4.2.2.tar.bz2 +kdelibs-4.2.3.tar.bz2 diff --git a/kdelibs-4.2.0-kjs-gcc44-crash.patch b/kdelibs-4.2.0-kjs-gcc44-crash.patch deleted file mode 100644 index dbb04d4..0000000 --- a/kdelibs-4.2.0-kjs-gcc44-crash.patch +++ /dev/null @@ -1,453 +0,0 @@ ---- kdelibs/kjs/dtoa.cpp 2009/04/28 10:20:35 960320 -+++ kdelibs/kjs/dtoa.cpp 2009/04/28 10:28:50 960321 -@@ -203,11 +203,7 @@ - #endif - - #ifdef MALLOC --#ifdef KR_headers --extern char *MALLOC(); --#else - extern void *MALLOC(size_t); --#endif - #else - #define MALLOC malloc - #endif -@@ -277,12 +273,8 @@ - #endif - - #ifndef CONST --#ifdef KR_headers --#define CONST /* blank */ --#else - #define CONST const - #endif --#endif - - #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1 - Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined. -@@ -290,37 +282,19 @@ - - typedef union { double d; ULong L[2]; } U; - --#ifdef YES_ALIAS --#define dval(x) x -+#define dval(x) (x).d - #ifdef IEEE_8087 --#define word0(x) ((ULong *)&x)[1] --#define word1(x) ((ULong *)&x)[0] -+#define word0(x) (x).L[1] -+#define word1(x) (x).L[0] - #else --#define word0(x) ((ULong *)&x)[0] --#define word1(x) ((ULong *)&x)[1] --#endif --#else --#ifdef IEEE_8087 --#define word0(x) ((U*)&x)->L[1] --#define word1(x) ((U*)&x)->L[0] --#else --#define word0(x) ((U*)&x)->L[0] --#define word1(x) ((U*)&x)->L[1] --#endif --#define dval(x) ((U*)&x)->d -+#define word0(x) (x).L[0] -+#define word1(x) (x).L[1] - #endif - - /* The following definition of Storeinc is appropriate for MIPS processors. - * An alternative that might be better on some machines is -- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) - */ --#if defined(IEEE_8087) + defined(VAX) --#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ --((unsigned short *)a)[0] = (unsigned short)c, a++) --#else --#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \ --((unsigned short *)a)[1] = (unsigned short)c, a++) --#endif -+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) - - /* #define P DBL_MANT_DIG */ - /* Ten_pmax = floor(P*log(2)/log(5)) */ -@@ -444,11 +418,7 @@ - #ifdef RND_PRODQUOT - #define rounded_product(a,b) a = rnd_prod(a, b) - #define rounded_quotient(a,b) a = rnd_quot(a, b) --#ifdef KR_headers --extern double rnd_prod(), rnd_quot(); --#else - extern double rnd_prod(double, double), rnd_quot(double, double); --#endif - #else - #define rounded_product(a,b) a *= b - #define rounded_quotient(a,b) a /= b -@@ -461,11 +431,7 @@ - #define Pack_32 - #endif - --#ifdef KR_headers --#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff) --#else - #define FFFFFFFF 0xffffffffUL --#endif - - #ifdef NO_LONG_LONG - #undef ULLong -@@ -506,11 +472,7 @@ - - static Bigint * - Balloc --#ifdef KR_headers -- (k) int k; --#else - (int k) --#endif - { - int x; - Bigint *rv; -@@ -546,11 +508,7 @@ - - static void - Bfree --#ifdef KR_headers -- (v) Bigint *v; --#else - (Bigint *v) --#endif - { - if (v) { - ACQUIRE_DTOA_LOCK(0); -@@ -565,11 +523,7 @@ - - static Bigint * - multadd --#ifdef KR_headers -- (b, m, a) Bigint *b; int m, a; --#else - (Bigint *b, int m, int a) /* multiply by m and add a */ --#endif - { - int i, wds; - #ifdef ULLong -@@ -622,11 +576,7 @@ - - static Bigint * - s2b --#ifdef KR_headers -- (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9; --#else - (CONST char *s, int nd0, int nd, ULong y9) --#endif - { - Bigint *b; - int i, k; -@@ -660,11 +610,7 @@ - - static int - hi0bits --#ifdef KR_headers -- (x) register ULong x; --#else - (register ULong x) --#endif - { - register int k = 0; - -@@ -694,11 +640,7 @@ - - static int - lo0bits --#ifdef KR_headers -- (y) ULong *y; --#else - (ULong *y) --#endif - { - register int k; - register ULong x = *y; -@@ -742,11 +684,7 @@ - - static Bigint * - i2b --#ifdef KR_headers -- (i) int i; --#else - (int i) --#endif - { - Bigint *b; - -@@ -758,11 +696,7 @@ - - static Bigint * - mult --#ifdef KR_headers -- (a, b) Bigint *a, *b; --#else - (Bigint *a, Bigint *b) --#endif - { - Bigint *c; - int k, wa, wb, wc; -@@ -870,11 +804,7 @@ - - static Bigint * - pow5mult --#ifdef KR_headers -- (b, k) Bigint *b; int k; --#else - (Bigint *b, int k) --#endif - { - Bigint *b1, *p5, *p51; - int i; -@@ -927,11 +857,7 @@ - - static Bigint * - lshift --#ifdef KR_headers -- (b, k) Bigint *b; int k; --#else - (Bigint *b, int k) --#endif - { - int i, k1, n, n1; - Bigint *b1; -@@ -987,11 +913,7 @@ - - static int - cmp --#ifdef KR_headers -- (a, b) Bigint *a, *b; --#else - (Bigint *a, Bigint *b) --#endif - { - ULong *xa, *xa0, *xb, *xb0; - int i, j; -@@ -1021,11 +943,7 @@ - - static Bigint * - diff --#ifdef KR_headers -- (a, b) Bigint *a, *b; --#else - (Bigint *a, Bigint *b) --#endif - { - Bigint *c; - int i, wa, wb; -@@ -1115,15 +1033,12 @@ - - static double - ulp --#ifdef KR_headers -- (x) double x; --#else -- (double x) --#endif -+ (double dx) - { - register Long L; -- double a; -+ U x, a; - -+ dval(x) = dx; - L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1; - #ifndef Avoid_Underflow - #ifndef Sudden_Underflow -@@ -1157,15 +1072,11 @@ - - static double - b2d --#ifdef KR_headers -- (a, e) Bigint *a; int *e; --#else - (Bigint *a, int *e) --#endif - { - ULong *xa, *xa0, w, y, z; - int k; -- double d; -+ U d; - #ifdef VAX - ULong d0, d1; - #else -@@ -1227,12 +1138,9 @@ - - static Bigint * - d2b --#ifdef KR_headers -- (d, e, bits) double d; int *e, *bits; --#else -- (double d, int *e, int *bits) --#endif -+ (double dd, int *e, int *bits) - { -+ U d; - Bigint *b; - int de, k; - ULong *x, y, z; -@@ -1241,6 +1149,9 @@ - #endif - #ifdef VAX - ULong d0, d1; -+#endif -+ dval(d) = dd; -+#ifdef VAX - d0 = word0(d) >> 16 | word0(d) << 16; - d1 = word1(d) >> 16 | word1(d) << 16; - #else -@@ -1365,13 +1276,9 @@ - - static double - ratio --#ifdef KR_headers -- (a, b) Bigint *a, *b; --#else - (Bigint *a, Bigint *b) --#endif - { -- double da, db; -+ U da, db; - int k, ka, kb; - - dval(da) = b2d(a, &ka); -@@ -1457,11 +1364,7 @@ - - static int - match --#ifdef KR_headers -- (sp, t) char **sp, *t; --#else - (CONST char **sp, CONST char *t) --#endif - { - int c, d; - CONST char *s = *sp; -@@ -1479,11 +1382,7 @@ - #ifndef No_Hex_NaN - static void - hexnan --#ifdef KR_headers -- (rvp, sp) double *rvp; CONST char **sp; --#else -- (double *rvp, CONST char **sp) --#endif -+ (U *rvp, CONST char **sp) - { - ULong c, x[2]; - CONST char *s; -@@ -1533,11 +1432,7 @@ - - double - strtod --#ifdef KR_headers -- (s00, se) CONST char *s00; char **se; --#else - (CONST char *s00, char **se) --#endif - { - #ifdef Avoid_Underflow - int scale; -@@ -1545,7 +1440,8 @@ - int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, - e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; - CONST char *s, *s0, *s1; -- double aadj, aadj1, adj, rv, rv0; -+ double aadj, aadj1, adj; -+ U aadj2, rv, rv0; - Long L; - ULong y, z; - Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL; -@@ -2306,7 +2202,9 @@ - aadj = z; - aadj1 = dsign ? aadj : -aadj; - } -- word0(aadj1) += (2*P+1)*Exp_msk1 - y; -+ dval(aadj2) = aadj1; -+ word0(aadj2) += (2*P+1)*Exp_msk1 - y; -+ aadj1 = dval(aadj2); - } - adj = aadj1 * ulp(dval(rv)); - dval(rv) += adj; -@@ -2423,11 +2321,7 @@ - - static int - quorem --#ifdef KR_headers -- (b, S) Bigint *b, *S; --#else - (Bigint *b, Bigint *S) --#endif - { - int n; - ULong *bx, *bxe, q, *sx, *sxe; -@@ -2544,11 +2438,7 @@ - #endif - - static char * --#ifdef KR_headers --rv_alloc(i) int i; --#else - rv_alloc(int i) --#endif - { - int j, k, *r; - -@@ -2567,11 +2457,7 @@ - } - - static char * --#ifdef KR_headers --nrv_alloc(s, rve, n) char *s, **rve; int n; --#else - nrv_alloc(CONST char *s, char **rve, int n) --#endif - { - char *rv, *t; - -@@ -2589,11 +2475,7 @@ - */ - - void --#ifdef KR_headers --freedtoa(s) char *s; --#else - freedtoa(char *s) --#endif - { - Bigint *b = (Bigint *)((int *)s - 1); - b->maxwds = 1 << (b->k = *(int*)b); -@@ -2640,12 +2522,7 @@ - - char * - dtoa --#ifdef KR_headers -- (d, mode, ndigits, decpt, sign, rve) -- double d; int mode, ndigits, *decpt, *sign; char **rve; --#else -- (double d, int mode, int ndigits, int *decpt, int *sign, char **rve) --#endif -+ (double dd, int mode, int ndigits, int *decpt, int *sign, char **rve) - { - /* Arguments ndigits, decpt, sign are similar to those - of ecvt and fcvt; trailing zeros are suppressed from -@@ -2690,7 +2567,8 @@ - ULong x; - #endif - Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S; -- double d2, ds, eps; -+ U d, d2, eps; -+ double ds; - char *s, *s0; - #ifdef Honor_FLT_ROUNDS - int rounding; -@@ -2706,6 +2584,7 @@ - } - #endif - -+ dval(d) = dd; - if (word0(d) & Sign_bit) { - /* set sign for everything, including 0's and NaNs */ - *sign = 1; diff --git a/kdelibs-4.2.2-bidi-kde#189161.patch b/kdelibs-4.2.2-bidi-kde#189161.patch deleted file mode 100644 index 21da024..0000000 --- a/kdelibs-4.2.2-bidi-kde#189161.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp 2009/04/02 20:19:16 948353 -+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp 2009/04/08 23:48:02 951343 -@@ -297,6 +297,7 @@ - && next->isInlineFlow())) - break; - current = next; -+ next = 0; - } - return next; - } diff --git a/kdelibs-4.2.2-kde#180785-2.patch b/kdelibs-4.2.2-kde#180785-2.patch deleted file mode 100644 index b2ed2bb..0000000 --- a/kdelibs-4.2.2-kde#180785-2.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/18 19:34:41 955904 -+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/19 10:43:38 956037 -@@ -254,10 +254,9 @@ - /* Notify wrapper program that the child it started has finished. */ - static void child_died(pid_t exit_pid, int exit_status) - { -- struct child *child = children; -- struct child *prev = NULL; -+ struct child *child, **childptr = &children; - -- while (child) -+ while ((child = *childptr)) - { - if (child->pid == exit_pid) - { -@@ -272,20 +271,12 @@ - write(child->sock, request_data, request_header.arg_length); - close(child->sock); - -- if (prev) -- { -- prev->next = child->next; -- } -- else -- { -- child = NULL; -- } -+ *childptr = child->next; - free(child); - return; - } - -- prev = child; -- child = child->next; -+ childptr = &child->next; - } - } - - diff --git a/kdelibs-4.2.2-kde#180785.patch b/kdelibs-4.2.2-kde#180785.patch deleted file mode 100644 index 0a1fca5..0000000 --- a/kdelibs-4.2.2-kde#180785.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/03/25 12:32:32 944314 -+++ branches/KDE/4.2/kdelibs/kinit/kinit.cpp 2009/04/18 19:34:41 955904 -@@ -184,6 +184,12 @@ - */ - static void close_fds() - { -+ while (struct child *child = children) { -+ close(child->sock); -+ children = child->next; -+ free(child); -+ } -+ - if (d.deadpipe[0] != -1) - { - close(d.deadpipe[0]); - diff --git a/kdelibs-4.2.2-kio_http.patch b/kdelibs-4.2.2-kio_http.patch deleted file mode 100644 index 7321f9d..0000000 --- a/kdelibs-4.2.2-kio_http.patch +++ /dev/null @@ -1,135 +0,0 @@ -Index: kioslave/http/http.cpp -=================================================================== ---- kioslave/http/http.cpp (Revision 950464) -+++ kioslave/http/http.cpp (Revision 950465) -@@ -229,16 +229,12 @@ - } - - -+#define NO_SIZE ((KIO::filesize_t) -1) - -- -- -- --#define NO_SIZE ((KIO::filesize_t) -1) -- - #ifdef HAVE_STRTOLL --#define STRTOLL strtoll -+#define STRTOLL strtoll - #else --#define STRTOLL strtol -+#define STRTOLL strtol - #endif - - -@@ -259,6 +255,7 @@ - , m_proxyAuth(0) - , m_socketProxyAuth(0) - , m_isError(false) -+ , m_isLoadingErrorPage(false) - , m_remoteRespTimeout(DEFAULT_RESPONSE_TIMEOUT) - { - reparseConfiguration(); -@@ -292,6 +289,7 @@ - { - m_isEOF = false; - m_isError = false; -+ m_isLoadingErrorPage = false; - } - - void HTTPProtocol::resetResponseParsing() -@@ -575,8 +573,11 @@ - m_server.initFrom(m_request); - } - break; -- } else if (m_isError) { -- // Hard error, abort everything. -+ } else if (m_isError || m_isLoadingErrorPage) { -+ // Unrecoverable error, abort everything. -+ // Also, if we've just loaded an error page there is nothing more to do. -+ // In that case we abort to avoid loops; some webservers manage to send 401 and -+ // no authentication request. Or an auth request we don't understand. - return false; - } - -@@ -1728,6 +1729,15 @@ - error( ERR_SLAVE_DEFINED, errorString ); - } - -+void HTTPProtocol::setLoadingErrorPage() -+{ -+ if (m_isLoadingErrorPage) { -+ kWarning(7113) << "called twice during one request, something is probably wrong."; -+ } -+ m_isLoadingErrorPage = true; -+ SlaveBase::errorPage(); -+} -+ - bool HTTPProtocol::isOffline(const KUrl &url) - { - const int NetWorkStatusUnknown = 1; -@@ -2720,7 +2730,7 @@ - ; // Ignore error - } else { - if (m_request.preferErrorPage) { -- errorPage(); -+ setLoadingErrorPage(); - } else { - error(ERR_INTERNAL_SERVER, m_request.url.url()); - return false; -@@ -2743,7 +2753,7 @@ - // Any other client errors - // Tell that we will only get an error page here. - if (m_request.preferErrorPage) { -- errorPage(); -+ setLoadingErrorPage(); - } else { - error(ERR_DOES_NOT_EXIST, m_request.url.url()); - return false; -@@ -3303,14 +3313,14 @@ - kDebug(7113) << "pointer to auth class is now" << *auth; - if (!(*auth)) { - if (m_request.preferErrorPage) { -- errorPage(); -+ setLoadingErrorPage(); - } else { - error(ERR_UNSUPPORTED_ACTION, "Unknown Authorization method!"); - return false; - } - } - -- // auth may still be null due to errorPage(). -+ // *auth may still be null due to setLoadingErrorPage(). - - if (*auth) { - // remove trailing space from the method string, or digest auth will fail -@@ -3357,7 +3367,7 @@ - - if ((*auth)->isError()) { - if (m_request.preferErrorPage) { -- errorPage(); -+ setLoadingErrorPage(); - } else { - error(ERR_UNSUPPORTED_ACTION, "Authorization failed!"); - return false; -Index: kioslave/http/http.h -=================================================================== ---- kioslave/http/http.h (Revision 950464) -+++ kioslave/http/http.h (Revision 950465) -@@ -259,6 +259,7 @@ - void cacheUpdate( const KUrl &url, bool nocache, time_t expireDate); - - void httpError(); // Generate error message based on response code -+ void setLoadingErrorPage(); // Call SlaveBase::errorPage() and remember that we've called it - - bool isOffline(const KUrl &url); // Check network status - -@@ -523,6 +524,8 @@ - - // Indicates whether there was some connection error. - bool m_isError; -+ // Whether we are loading an error page (we should close the connection afterwards) -+ bool m_isLoadingErrorPage; - - // Values that determine the remote connection timeouts. - int m_remoteRespTimeout; diff --git a/kdelibs-4.2.2-kjob.patch b/kdelibs-4.2.2-kjob.patch deleted file mode 100644 index 86efa44..0000000 --- a/kdelibs-4.2.2-kjob.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: kdeui/jobs/kuiserverjobtracker.cpp -=================================================================== ---- kdeui/jobs/kuiserverjobtracker.cpp (Revision 950982) -+++ kdeui/jobs/kuiserverjobtracker.cpp (Revision 950983) -@@ -35,13 +35,32 @@ - class KUiServerJobTracker::Private - { - public: -- Private() { } -+ Private(KUiServerJobTracker *parent) -+ : q(parent) -+ { -+ } - -+ KUiServerJobTracker *const q; -+ -+ void _k_killJob(); -+ - QHash progressJobView; - }; - -+void KUiServerJobTracker::Private::_k_killJob() -+{ -+ org::kde::JobView *jobView = qobject_cast(q->sender()); -+ -+ if (jobView) { -+ KJob *job = progressJobView.key(jobView); -+ -+ if (job) -+ job->kill(KJob::EmitResult); -+ } -+} -+ - KUiServerJobTracker::KUiServerJobTracker(QObject *parent) -- : KJobTrackerInterface(parent), d(new Private) -+ : KJobTrackerInterface(parent), d(new Private(this)) - { - - } -@@ -81,8 +100,8 @@ - reply.value().path(), - QDBusConnection::sessionBus()); - -- QObject::connect(jobView, SIGNAL(cancelRequested()), job, -- SLOT(kill())); -+ QObject::connect(jobView, SIGNAL(cancelRequested()), this, -+ SLOT(_k_killJob())); - QObject::connect(jobView, SIGNAL(suspendRequested()), job, - SLOT(suspend())); - QObject::connect(jobView, SIGNAL(resumeRequested()), job, -Index: kdeui/jobs/kuiserverjobtracker.h -=================================================================== ---- kdeui/jobs/kuiserverjobtracker.h (Revision 950982) -+++ kdeui/jobs/kuiserverjobtracker.h (Revision 950983) -@@ -78,6 +78,8 @@ - private: - class Private; - Private *const d; -+ -+ Q_PRIVATE_SLOT(d, void _k_killJob()) - }; - - #endif diff --git a/kdelibs-4.2.2-plasma-focus.patch b/kdelibs-4.2.2-plasma-focus.patch deleted file mode 100644 index affdc33..0000000 --- a/kdelibs-4.2.2-plasma-focus.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up kdelibs-4.2.2/plasma/popupapplet.cpp.orig kdelibs-4.2.2/plasma/popupapplet.cpp ---- kdelibs-4.2.2/plasma/popupapplet.cpp.orig 2009-03-30 23:41:08.000000000 +0200 -+++ kdelibs-4.2.2/plasma/popupapplet.cpp 2009-04-21 12:52:16.000000000 +0200 -@@ -275,14 +275,8 @@ void PopupAppletPrivate::popupConstraint - //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can - //emulate the same kind of behavior as Qt::Popup (close when you click somewhere - //else. -- //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924). -- Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint; -- -- if (passive) { -- wflags |= Qt::X11BypassWindowManagerHint; -- } -- -- dialog->setWindowFlags(wflags); -+ dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); -+ updateDialogFlags(); - KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager); - dialog->installEventFilter(q); - -@@ -340,7 +334,7 @@ void PopupApplet::mouseReleaseEvent(QGra - - bool PopupApplet::eventFilter(QObject *watched, QEvent *event) - { -- if (watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) { -+ if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) { - d->popupLostFocus = true; - hidePopup(); - QTimer::singleShot(100, this, SLOT(clearPopupLostFocus())); -@@ -411,15 +405,7 @@ void PopupApplet::setPassivePopup(bool p - d->passive = passive; - - if (d->dialog) { -- Qt::WindowFlags wflags = d->dialog->windowFlags(); -- -- if (d->passive) { -- wflags |= Qt::X11BypassWindowManagerHint; -- } else { -- wflags &= ~Qt::X11BypassWindowManagerHint; -- } -- -- d->dialog->setWindowFlags(wflags); -+ d->updateDialogFlags(); - } - } - -@@ -628,6 +614,15 @@ void PopupAppletPrivate::updateDialogPos - - dialog->move(pos); - } -+ -+ -+void PopupAppletPrivate::updateDialogFlags() -+{ -+ Q_ASSERT(dialog); -+ dialog->setAttribute(Qt::WA_X11NetWmWindowTypeNotification, passive); -+} -+ -+ - } // Plasma namespace - - #include "popupapplet.moc" -diff -up kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig kdelibs-4.2.2/plasma/private/popupapplet_p.h ---- kdelibs-4.2.2/plasma/private/popupapplet_p.h.orig 2009-04-21 12:59:29.000000000 +0200 -+++ kdelibs-4.2.2/plasma/private/popupapplet_p.h 2009-04-21 12:52:16.000000000 +0200 -@@ -35,6 +35,7 @@ public: - void dialogSizeChanged(); - void dialogStatusChanged(bool status); - void updateDialogPosition(); -+ void updateDialogFlags(); - void popupConstraintsEvent(Plasma::Constraints constraints); - void checkExtenderAppearance(Plasma::FormFactor f); - diff --git a/kdelibs.spec b/kdelibs.spec index bbdd972..9b41b89 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.2.2 -Release: 13%{?dist} +Version: 4.2.3 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -80,18 +80,10 @@ Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch Patch23: kdelibs-4.2.0-gcc44-workaround.patch -# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968) -Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch Patch25: kdelibs-4.2.0-gcc44-misc.patch # upstream # 4.2 branch -Patch100: kdelibs-4.2.2-kio_http.patch -Patch101: kdelibs-4.2.2-kjob.patch -Patch102: kdelibs-4.2.2-bidi-kde#189161.patch -Patch103: kdelibs-4.2.2-kde#180785.patch -Patch104: kdelibs-4.2.2-kde#180785-2.patch -Patch105: kdelibs-4.2.2-plasma-focus.patch # 4.3 branch Patch200: kdelibs-4.1.96-AllowExternalPaths.patch @@ -226,17 +218,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch20 -p1 -b .xxcmake %patch22 -p1 -b .kdepimlibs-cmake %patch23 -p1 -b .gcc44 -%patch24 -p1 -b .kjs-gcc44-crash %patch25 -p1 -b .gcc44-misc # upstream patches # 4.2 -%patch100 -p0 -b .kio_http -%patch101 -p0 -b .kjob -%patch102 -p4 -b .bidi-kde#189161 -%patch103 -p4 -b .kde#180785 -%patch104 -p4 -b .kde#180785-2 -%patch105 -p1 -b .kickoff-focus # 4.3 %patch200 -p1 -b .AllowExternalPaths @@ -422,6 +407,9 @@ rm -rf %{buildroot} %changelog +* Sun May 03 2009 Than Ngo - 4.2.3-1 +- 4.2.3 + * Tue Apr 28 2009 Lukáš Tinkl - 4.2.2-13 - upstream patch to fix GCC4.4 crashes in kjs (kdebug:189809) diff --git a/sources b/sources index 7405e6f..04120ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff54817efef952e8812c607f5089c2e1 kdelibs-4.2.2.tar.bz2 +73f76b0521dff7d9aaf1057499624a8d kdelibs-4.2.3.tar.bz2