Hello community,
here is the log from the commit of package kdebase3
checked in at Thu Jan 17 23:16:30 CET 2008.
--------
--- KDE/kdebase3/kdebase3.changes 2008-01-02 08:37:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2008-01-17 10:54:10.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 17 10:53:53 CET 2008 - stbinner@suse.de
+
+- update 3_5_BRANCH.diff for 64bit Flash fixes
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
++++ 3304 lines (skipped)
++++ between KDE/kdebase3/kdebase3.spec
++++ and /mounts/work_src_done/STABLE/kdebase3/kdebase3.spec
++++++ 3_5_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.XJ6001/_old 2008-01-17 23:15:25.000000000 +0100
+++ /var/tmp/diff_new_pack.XJ6001/_new 2008-01-17 23:15:26.000000000 +0100
@@ -1,6 +1,6 @@
package: kdebase-3.5.8.tar.bz2
kdemod: kdebase
-current HEAD: 755533
+current HEAD: 762481
svn di between /tags/KDE/3.5.8 and /branches/KDE//branches/KDE/3.5
--- ksmserver/legacy.cpp
+++ ksmserver/legacy.cpp
@@ -56,6 +56,142 @@
t << "widget \"gtk-tooltips\" style \"ToolTip\"" << endl;
t << endl;
+--- kcontrol/kcontrol/modules.cpp
++++ kcontrol/kcontrol/modules.cpp
+@@ -48,7 +48,7 @@
+
+ ConfigModule::ConfigModule(const KService::Ptr &s)
+ : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
+- _rootProcess(0), _embedLayout(0), _embedFrame(0)
++ _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0)
+ {
+ }
+
+@@ -97,6 +97,8 @@
+
+ delete _embedWidget;
+ _embedWidget = 0;
++ delete _embedStack;
++ _embedStack = 0;
+ delete _embedFrame;
+ _embedFrame = 0;
+ kapp->syncX();
+@@ -136,6 +138,7 @@
+ delete _rootProcess;
+ delete _embedWidget;
+ delete _embedLayout;
++ delete _embedStack;
+
+ // create an embed widget that will embed the
+ // kcmshell running as root
+@@ -149,14 +152,18 @@
+ _embedFrame->setLineWidth( 2 );
+ _embedFrame->setMidLineWidth( 2 );
+ _embedLayout->addWidget(_embedFrame,1);
+- _embedWidget = new QXEmbed(_embedFrame );
++ // cannot reparent anything else inside QXEmbed, so put the busy label separately
++ _embedStack = new QWidgetStack(_embedFrame);
++ _embedWidget = new KControlEmbed(_embedStack);
+ _module->hide();
+ _embedFrame->show();
+- QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedWidget);
++ QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedStack);
+ _busy->setAlignment(AlignCenter);
+ _busy->setTextFormat(RichText);
+ _busy->setGeometry(0,0, _module->width(), _module->height());
+ _busy->show();
++ _embedStack->raiseWidget(_busy);
++ connect(_embedWidget, SIGNAL( windowEmbedded(WId)), SLOT( embedded()));
+
+ // prepare the process to run the kcmshell
+ QString cmd = service()->exec().stripWhiteSpace();
+@@ -209,6 +216,8 @@
+ }
+
+ // clean up in case of failure
++ delete _embedStack;
++ _embedStack = 0;
+ delete _embedFrame;
+ _embedWidget = 0;
+ delete _embedLayout;
+@@ -239,6 +248,11 @@
+ emit childClosed();
+ }
+
++void ConfigModule::embedded()
++{
++ _embedStack->raiseWidget(_embedWidget); // put it above the busy label
++}
++
+ const KAboutData *ConfigModule::aboutData() const
+ {
+ if (!_module) return 0;
+--- kcontrol/kcontrol/modules.h
++++ kcontrol/kcontrol/modules.h
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+
+ template<class ConfigModule> class QPtrList;
+ class QStringList;
+@@ -33,6 +34,7 @@
+ class QXEmbed;
+ class QVBoxLayout;
+ class QVBox;
++class QWidgetStack;
+
+ class ConfigModule : public QObject, public KCModuleInfo
+ {
+@@ -62,6 +64,7 @@
+ void clientChanged(bool state);
+ void runAsRoot();
+ void rootExited(KProcess *proc);
++ void embedded();
+
+
+ signals:
+@@ -80,6 +83,7 @@
+ KProcess *_rootProcess;
+ QVBoxLayout *_embedLayout;
+ QVBox *_embedFrame;
++ QWidgetStack *_embedStack;
+
+ };
+
+@@ -119,4 +123,14 @@
+ QDict<Menu> subMenus;
+ };
+
++class KControlEmbed : public QXEmbed
++ {
++ Q_OBJECT
++ public:
++ KControlEmbed( QWidget* w ) : QXEmbed( w ) {}
++ virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); }
++ signals:
++ void windowEmbedded( WId w );
++ };
++
+ #endif
+--- kcontrol/input/mouse.cpp
++++ kcontrol/input/mouse.cpp
+@@ -725,8 +725,12 @@
+ XChangePointerControl( kapp->getDisplay(),
+ true, true, int(qRound(accelRate*10)), 10, thresholdMove);
+
+- unsigned char map[20];
+- num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 20);
++ // 256 might seems extreme, but X has already been known to return 32,
++ // and we don't want to truncate things. Xlib limits the table to 256 bytes,
++ // so it's a good uper bound..
++ unsigned char map[256];
++ num_buttons = XGetPointerMapping(kapp->getDisplay(), map, 256);
++
+ int remap=(num_buttons>=1);
+ if (handedEnabled && (m_handedNeedsApply || force)) {
+ if( num_buttons == 1 )
--- kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
@@ -27,7 +27,6 @@
@@ -918,6 +1054,16 @@
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+@@ -629,7 +629,9 @@
+ #define BITS_PER_SHORT PR_BITS_PER_SHORT
+ #define BITS_PER_INT PR_BITS_PER_INT
+ #define BITS_PER_INT64 PR_BITS_PER_INT64
++#ifndef BITS_PER_LONG
+ #define BITS_PER_LONG PR_BITS_PER_LONG
++#endif
+ #define BITS_PER_FLOAT PR_BITS_PER_FLOAT
+ #define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE
+ #define BITS_PER_WORD PR_BITS_PER_WORD
--- nsplugins/sdk/jni_md.h
+++ nsplugins/sdk/jni_md.h
@@ -1,23 +1,40 @@
@@ -1379,24 +1525,6 @@
+#endif
--- nsplugins/sdk/npupp.h
+++ nsplugins/sdk/npupp.h
-@@ -1,11 +1,11 @@
--/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /* ***** BEGIN LICENSE BLOCK *****
-- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
-- * The contents of this file are subject to the Netscape Public License
-- * Version 1.1 (the "License"); you may not use this file except in
-- * compliance with the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/NPL/
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ -58,6 +57,8 @@
#include "npapi.h"
#endif
@@ -2093,6 +2221,17 @@
#endif /* XP_UNIX */
NPWindowType type; /* Is this a window or a drawable? */
} NPWindow;
+--- nsplugins/NSPluginCallbackIface.h
++++ nsplugins/NSPluginCallbackIface.h
+@@ -37,7 +37,7 @@
+ virtual ASYNC requestURL(QString url, QString target) = 0;
+ virtual ASYNC postURL(QString url, QString target, QByteArray data, QString mime) = 0;
+ virtual ASYNC statusMessage( QString msg ) = 0;
+- virtual ASYNC evalJavaScript( int id, QString script ) = 0;
++ virtual ASYNC evalJavaScript( Q_INT32 id, QString script ) = 0;
+
+ };
+
--- nsplugins/viewer/nsplugin.cpp
+++ nsplugins/viewer/nsplugin.cpp
@@ -180,6 +180,12 @@
@@ -2252,14 +2391,25 @@
if (_npp) {
::free(_npp); // matched with malloc() in newInstance
-@@ -902,7 +916,6 @@
+@@ -806,7 +820,7 @@
+ s->post( url, req.data, req.mime, req.notify, req.args );
+ } else if (url.lower().startsWith("javascript:")){
+ if (_callback) {
+- static int _jsrequestid = 0;
++ static Q_INT32 _jsrequestid = 0;
+ _jsrequests.insert(_jsrequestid, new Request(req));
+ _callback->evalJavaScript(_jsrequestid++, url.mid(11));
+ } else {
+@@ -902,8 +916,7 @@
_timer->start( 100, true );
}
-
- int NSPluginInstance::setWindow(int remove)
+-int NSPluginInstance::setWindow(int remove)
++int NSPluginInstance::setWindow(Q_INT8 remove)
{
if (remove)
+ {
@@ -926,14 +939,24 @@
_win.clipRect.bottom = _height;
_win.clipRect.right = _width;
@@ -2292,9 +2442,12 @@
_win.ws_info = &_win_info;
-@@ -959,9 +982,6 @@
+@@ -957,11 +980,8 @@
+ }
- void NSPluginInstance::resizePlugin(int w, int h)
+
+-void NSPluginInstance::resizePlugin(int w, int h)
++void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
{
- if (!_visible)
- return;
@@ -2349,12 +2502,25 @@
setWindow();
-@@ -1405,7 +1433,7 @@
- DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, bool embed,
+@@ -993,7 +1021,7 @@
+ }
+
+
+-void NSPluginInstance::javascriptResult(int id, QString result) {
++void NSPluginInstance::javascriptResult(Q_INT32 id, QString result) {
+ QMap::iterator i = _jsrequests.find( id );
+ if (i != _jsrequests.end()) {
+ Request *req = i.data();
+@@ -1402,10 +1430,10 @@
+ }
+
+
+-DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, bool embed,
++DCOPRef NSPluginClass::newInstance( QString url, QString mimeType, Q_INT8 embed,
QStringList argn, QStringList argv,
QString appId, QString callbackId,
- bool reload, bool doPost, QByteArray postData )
-+ bool reload, bool doPost, QByteArray postData, long xembed )
++ Q_INT8 reload, Q_INT8 doPost, QByteArray postData, Q_UINT32 xembed )
{
kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl;
@@ -2426,15 +2592,35 @@
{
--- nsplugins/viewer/NSPluginClassIface.h
+++ nsplugins/viewer/NSPluginClassIface.h
-@@ -50,7 +50,7 @@
- virtual DCOPRef newInstance(QString url, QString mimeType, bool embed,
+@@ -47,10 +47,10 @@
+
+ k_dcop:
+
+- virtual DCOPRef newInstance(QString url, QString mimeType, bool embed,
++ virtual DCOPRef newInstance(QString url, QString mimeType, Q_INT8 embed,
QStringList argn, QStringList argv,
- QString appId, QString callbackId, bool reload,
+- QString appId, QString callbackId, bool reload,
- bool doPost, QByteArray postData) = 0;
-+ bool doPost, QByteArray postData, long xembed) = 0;
++ QString appId, QString callbackId, Q_INT8 reload,
++ Q_INT8 doPost, QByteArray postData, Q_UINT32 xembed) = 0;
virtual QString getMIMEDescription() = 0;
};
+@@ -66,11 +66,11 @@
+
+ virtual int winId() = 0;
+
+- virtual int setWindow(int remove=0) = 0;
++ virtual int setWindow(Q_INT8 remove=0) = 0;
+
+- virtual void resizePlugin(int w, int h) = 0;
++ virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0;
+
+- virtual void javascriptResult(int id, QString result) = 0;
++ virtual void javascriptResult(Q_INT32 id, QString result) = 0;
+
+ virtual void displayPlugin() = 0;
+ };
--- nsplugins/viewer/glibevents.cpp
+++ nsplugins/viewer/glibevents.cpp
@@ -0,0 +1,43 @@
@@ -2483,7 +2669,7 @@
+#include "glibevents.moc"
--- nsplugins/viewer/nsplugin.h
+++ nsplugins/viewer/nsplugin.h
-@@ -165,13 +165,13 @@
+@@ -165,16 +165,16 @@
// constructor, destructor
NSPluginInstance( NPP privateData, NPPluginFuncs *pluginFuncs, KLibrary *handle,
int width, int height, QString src, QString mime,
@@ -2495,10 +2681,16 @@
// DCOP functions
void shutdown();
- int winId() { return XtWindow(_form); }
+- int setWindow(int remove=0);
+- void resizePlugin(int w, int h);
+- void javascriptResult(int id, QString result);
+ int winId() { return _form != 0 ? XtWindow(_form) : 0; }
- int setWindow(int remove=0);
- void resizePlugin(int w, int h);
- void javascriptResult(int id, QString result);
++ int setWindow(Q_INT8 remove=0);
++ void resizePlugin(Q_INT32 w, Q_INT32 h);
++ void javascriptResult(Q_INT32 id, QString result);
+ void displayPlugin();
+
+ // value handling
@@ -232,6 +232,7 @@
NPPluginFuncs _pluginFuncs;
@@ -2507,15 +2699,31 @@
QString _baseURL;
int _width, _height;
-@@ -281,7 +282,7 @@
- DCOPRef newInstance(QString url, QString mimeType, bool embed,
+@@ -278,10 +279,10 @@
+ ~NSPluginClass();
+
+ QString getMIMEDescription();
+- DCOPRef newInstance(QString url, QString mimeType, bool embed,
++ DCOPRef newInstance(QString url, QString mimeType, Q_INT8 embed,
QStringList argn, QStringList argv,
- QString appId, QString callbackId, bool reload, bool post,
+- QString appId, QString callbackId, bool reload, bool post,
- QByteArray postData );
-+ QByteArray postData, long xembed );
++ QString appId, QString callbackId, Q_INT8 reload, Q_INT8 post,
++ QByteArray postData, Q_UINT32 xembed );
void destroyInstance( NSPluginInstance* inst );
bool error() { return _error; }
+--- nsplugins/viewer/resolve.h
++++ nsplugins/viewer/resolve.h
+@@ -40,7 +40,7 @@
+
+
+ #define CHECK(fname,error) \
+- kdDebug() << "Result of " << endl; \
++ kdDebug() << "Result of " << #fname << ":" << error << endl; \
+ return error;
+
+
--- nsplugins/viewer/glibevents.h
+++ nsplugins/viewer/glibevents.h
@@ -0,0 +1,41 @@
@@ -2578,6 +2786,48 @@
NSPluginCallbackIface_DIR = $(srcdir)/..
-
+--- nsplugins/viewer/qxteventloop.cpp
++++ nsplugins/viewer/qxteventloop.cpp
+@@ -72,7 +72,7 @@
+
+ QIntDict<QSocketNotifier> socknotDict;
+ bool activate_timers;
+- int timerid;
++ XtIntervalId timerid;
+
+ // arguments for Xt display initialization
+ const char* applicationClass;
+@@ -110,7 +110,7 @@
+
+ QXtEventLoopPrivate::QXtEventLoopPrivate()
+ : appContext(NULL), ownContext(NULL),
+- activate_timers(FALSE), timerid(-1)
++ activate_timers(FALSE), timerid(0)
+ {
+ }
+
+@@ -416,7 +416,7 @@
+ void qmotif_timeout_handler( XtPointer, XtIntervalId * )
+ {
+ static_d->activate_timers = TRUE;
+- static_d->timerid = -1;
++ static_d->timerid = 0;
+ }
+
+ /*! \reimp
+@@ -429,10 +429,10 @@
+
+ // make sure we fire off Qt's timers
+ int ttw = timeToWait();
+- if ( d->timerid != -1 ) {
++ if ( d->timerid != 0 ) {
+ XtRemoveTimeOut( d->timerid );
+ }
+- d->timerid = -1;
++ d->timerid = 0;
+ if ( ttw != -1 ) {
+ d->timerid =
+ XtAppAddTimeOut( d->appContext, ttw,
--- nsplugins/nspluginloader.cpp
+++ nsplugins/nspluginloader.cpp
@@ -41,6 +41,7 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org