Hello community,
here is the log from the commit of package kdebindings4
checked in at Mon Sep 1 15:00:52 CEST 2008.
--------
--- KDE/kdebindings4/kdebindings4.changes 2008-08-18 12:16:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2008-08-28 15:52:54.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 28 15:52:33 CEST 2008 - dmueller@suse.de
+
+- update to 4.1.1
+
+-------------------------------------------------------------------
python-kde4.changes: same change
ruby-kde4.changes: same change
Old:
----
kdebindings-4.1.0.tar.bz2
New:
----
kdebindings-4.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings4.spec ++++++
--- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200
+++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebindings4 (Version 4.1.0)
+# spec file for package kdebindings4 (Version 4.1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,8 +30,8 @@
License: LGPL v2.1 or later
Group: Development/Libraries/KDE
Summary: Bindings for KDE 4.x libraries
-Version: 4.1.0
-Release: 5
+Version: 4.1.1
+Release: 1
Source0: kdebindings-%version.tar.bz2
Patch0: 4_1_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -238,6 +238,8 @@
%endif
%changelog
+* Thu Aug 28 2008 dmueller@suse.de
+- update to 4.1.1
* Mon Aug 18 2008 stbinner@suse.de
- fix build of ruby-kde4
* Thu Aug 07 2008 dmueller@suse.de
++++++ python-kde4.spec ++++++
--- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200
+++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-kde4 (Version 4.1.0)
+# spec file for package python-kde4 (Version 4.1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,8 +30,8 @@
License: LGPL v2.1 or later
Group: Development/Libraries/KDE
Summary: Python Bindings for KDE 4.x Platform
-Version: 4.1.0
-Release: 17
+Version: 4.1.1
+Release: 1
Source0: kdebindings-%version.tar.bz2
Patch0: 4_1_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -238,6 +238,8 @@
%endif
%changelog
+* Thu Aug 28 2008 dmueller@suse.de
+- update to 4.1.1
* Mon Aug 18 2008 stbinner@suse.de
- fix build of ruby-kde4
* Thu Aug 07 2008 dmueller@suse.de
++++++ ruby-kde4.spec ++++++
--- /var/tmp/diff_new_pack.M27641/_old 2008-09-01 15:00:32.000000000 +0200
+++ /var/tmp/diff_new_pack.M27641/_new 2008-09-01 15:00:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ruby-kde4 (Version 4.1.0)
+# spec file for package ruby-kde4 (Version 4.1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,8 +30,8 @@
License: LGPL v2.1 or later
Group: Development/Libraries/KDE
Summary: Ruby bindings for KDE 4
-Version: 4.1.0
-Release: 5
+Version: 4.1.1
+Release: 1
Source0: kdebindings-%version.tar.bz2
Patch0: 4_1_BRANCH.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -238,6 +238,8 @@
%endif
%changelog
+* Thu Aug 28 2008 dmueller@suse.de
+- update to 4.1.1
* Mon Aug 18 2008 stbinner@suse.de
- fix build of ruby-kde4
* Thu Aug 07 2008 dmueller@suse.de
++++++ kdebindings-4.1.0.tar.bz2 -> kdebindings-4.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/CMakeLists.txt new/kdebindings-4.1.1/csharp/akonadi/CMakeLists.txt
--- old/kdebindings-4.1.0/csharp/akonadi/CMakeLists.txt 2008-07-24 14:56:34.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/akonadi/CMakeLists.txt 2008-08-28 10:06:45.000000000 +0200
@@ -18,7 +18,15 @@
${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
ADD_LIBRARY(akonadi-sharp MODULE ${SRC_CPP})
-TARGET_LINK_LIBRARIES(akonadi-sharp smokeqt smokeakonadi qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(akonadi-sharp
+ smokeqt
+ smokekde
+ smokeakonadi
+ qyotoshared
+ akonadi-kde
+ akonadi-kmime
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY})
SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(akonadi "${SRC_CS}" ALL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/src/Akonadi.cs new/kdebindings-4.1.1/csharp/akonadi/src/Akonadi.cs
--- old/kdebindings-4.1.0/csharp/akonadi/src/Akonadi.cs 2008-07-23 10:25:00.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/akonadi/src/Akonadi.cs 2008-08-28 10:06:45.000000000 +0200
@@ -7,10 +7,10 @@
public class InitAkonadi {
[DllImport("libakonadi-sharp", CharSet=CharSet.Ansi)]
- static extern void Init_Akonadi();
+ static extern void Init_akonadi();
public static void InitSmoke() {
- Init_Akonadi();
+ Init_akonadi();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/akonadi/src/akonadihandlers.cpp new/kdebindings-4.1.1/csharp/akonadi/src/akonadihandlers.cpp
--- old/kdebindings-4.1.0/csharp/akonadi/src/akonadihandlers.cpp 2008-07-23 10:25:00.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/akonadi/src/akonadihandlers.cpp 2008-08-28 10:06:45.000000000 +0200
@@ -28,11 +28,11 @@
#include
DEF_LIST_MARSHALLER( AkonadiAttributeList, QListAkonadi::Attribute*, Akonadi::Attribute )
+
DEF_VALUELIST_MARSHALLER( AkonadiAgentInstanceList, QListAkonadi::AgentInstance, Akonadi::AgentInstance )
DEF_VALUELIST_MARSHALLER( AkonadiAgentTypeList, QListAkonadi::AgentType, Akonadi::AgentType )
DEF_VALUELIST_MARSHALLER( AkonadiCollectionList, QListAkonadi::Collection, Akonadi::Collection )
DEF_VALUELIST_MARSHALLER( AkonadiItemList, QListAkonadi::Item, Akonadi::Item )
-DEF_VALUELIST_MARSHALLER( QModelIndexList, QList<QModelIndex>, QModelIndex )
TypeHandler Akonadi_handlers[] = {
{ "QListAkonadi::AgentInstance", marshall_AkonadiAgentInstanceList },
@@ -42,7 +42,5 @@
{ "QListAkonadi::Collection&", marshall_AkonadiCollectionList },
{ "QListAkonadi::Item", marshall_AkonadiItemList },
{ "QListAkonadi::Item&", marshall_AkonadiItemList },
- { "QList<QModelIndex>", marshall_QModelIndexList },
- { "QList<QModelIndex>&", marshall_QModelIndexList },
{ 0, 0 }
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/kimono/kde/KApplication.cs new/kdebindings-4.1.1/csharp/kimono/kde/KApplication.cs
--- old/kdebindings-4.1.0/csharp/kimono/kde/KApplication.cs 2008-07-23 10:25:07.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/kimono/kde/KApplication.cs 2008-08-28 10:06:46.000000000 +0200
@@ -60,10 +60,12 @@
public KApplication(bool GUIenabled) : this((Type) null) {
CreateProxy();
interceptor.Invoke("KApplication$", "KApplication(bool)", typeof(void), typeof(bool), GUIenabled);
+ qApp = this;
}
public KApplication() : this((Type) null) {
CreateProxy();
interceptor.Invoke("KApplication", "KApplication()", typeof(void));
+ qApp = this;
}
/// <remarks>
/// Returns the application session config object.
@@ -235,6 +237,7 @@
public KApplication(bool GUIenabled, KComponentData cData) : this((Type) null) {
CreateProxy();
interceptor.Invoke("KApplication$#", "KApplication(bool, const KComponentData&)", typeof(void), typeof(bool), GUIenabled, typeof(KComponentData), cData);
+ qApp = this;
}
~KApplication() {
interceptor.Invoke("~KApplication", "~KApplication()", typeof(void));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/nepomuk/src/Nepomuk.cs new/kdebindings-4.1.1/csharp/nepomuk/src/Nepomuk.cs
--- old/kdebindings-4.1.0/csharp/nepomuk/src/Nepomuk.cs 2008-07-23 10:25:08.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/nepomuk/src/Nepomuk.cs 2008-08-28 10:06:46.000000000 +0200
@@ -7,10 +7,10 @@
public class InitNepomuk {
[DllImport("libnepomuk-sharp", CharSet=CharSet.Ansi)]
- static extern void Init_Nepomuk();
+ static extern void Init_nepomuk();
public static void InitSmoke() {
- Init_Nepomuk();
+ Init_nepomuk();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/CMakeLists.txt new/kdebindings-4.1.1/csharp/plasma/CMakeLists.txt
--- old/kdebindings-4.1.0/csharp/plasma/CMakeLists.txt 2008-07-24 14:56:34.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/plasma/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200
@@ -34,7 +34,7 @@
SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/qtwebkit.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(plasma "${SRC_CS}" ALL)
-ADD_DEPENDENCIES(plasma qtwebkit)
+ADD_DEPENDENCIES(plasma qtwebkit kde-dotnet)
SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/plasma.dll -warn:0 -keyfile:${KEYFILE})
ADD_CS_LIBRARY(PlasmaScriptengineKimono "${SRC_PLASMASCRIPTENGINEKIMONO}" ALL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt new/kdebindings-4.1.1/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt
--- old/kdebindings-4.1.0/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt 2008-07-08 11:27:40.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/plasma/examples/applets/tiger/contents/code/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200
@@ -3,3 +3,4 @@
-r:${LIBRARY_OUTPUT_PATH}/kde-dotnet.dll
-r:${LIBRARY_OUTPUT_PATH}/plasma.dll -target:library -target:library )
ADD_CS_EXECUTABLE(main ${SRC_TIGER} ALL)
+ADD_DEPENDENCIES(main kde-dotnet plasma)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs new/kdebindings-4.1.1/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs
--- old/kdebindings-4.1.0/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs 2008-07-08 11:27:39.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/plasma/src/PlasmaScriptengineKimono_Applet.cs 2008-08-28 10:06:46.000000000 +0200
@@ -38,16 +38,40 @@
public Applet(QObject parent, List<QVariant> args) : base(parent) {}
public override bool Init() {
- Applet().Resize(200, 200);
+ QSizeF oldSize = Applet().Size;
QFileInfo program = new QFileInfo(MainScript());
appletAssembly = Assembly.LoadFile(program.AbsoluteFilePath());
+
+ // the newly loaded assembly might contain reference other bindings that need to be initialized
+ foreach (AssemblyName an in appletAssembly.GetReferencedAssemblies()) {
+ // if the binding has already been initialized (e.g. in SmokeInvocation.InitRuntime()), continue.
+ Assembly a = Assembly.Load(an);
+ if (SmokeInvocation.InitializedAssemblies.Contains(a)) continue;
+ AssemblySmokeInitializer attr = (AssemblySmokeInitializer) Attribute.GetCustomAttribute(a, typeof(AssemblySmokeInitializer));
+ if (attr != null) attr.CallInitSmoke();
+ SmokeInvocation.InitializedAssemblies.Add(a);
+ }
+
string typeName = Camelize(Package().Metadata().PluginName()) + "."; // namespace
typeName += Camelize(program.CompleteBaseName());
appletType = appletAssembly.GetType(typeName);
+ if (appletType == null) {
+ foreach (Type t in appletAssembly.GetTypes()) {
+ for (Type tmp = t.BaseType; tmp != null; tmp = tmp.BaseType) {
+ if (tmp == typeof(PlasmaScripting.Applet)) {
+ appletType = t;
+ break;
+ }
+ }
+ if (appletType != null) break;
+ }
+ }
applet = (PlasmaScripting.Applet) Activator.CreateInstance(appletType, new object[] { this });
applet.Init();
+ if (oldSize.Width() > 10 && oldSize.Height() > 10)
+ Applet().Size = oldSize;
SetUpEventHandlers();
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qtuitools/src/QtUiTools.cs new/kdebindings-4.1.1/csharp/qtuitools/src/QtUiTools.cs
--- old/kdebindings-4.1.0/csharp/qtuitools/src/QtUiTools.cs 2008-07-23 10:25:00.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/qtuitools/src/QtUiTools.cs 2008-08-28 10:06:45.000000000 +0200
@@ -7,10 +7,10 @@
public class InitQtUiTools {
[DllImport("libqtuitools-sharp", CharSet=CharSet.Ansi)]
- static extern void Init_QtUiTools();
+ static extern void Init_qtuitools();
public static void InitSmoke() {
- Init_QtUiTools();
+ Init_qtuitools();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qtwebkit/src/QtWebKit.cs new/kdebindings-4.1.1/csharp/qtwebkit/src/QtWebKit.cs
--- old/kdebindings-4.1.0/csharp/qtwebkit/src/QtWebKit.cs 2008-07-23 10:25:00.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/qtwebkit/src/QtWebKit.cs 2008-08-28 10:06:46.000000000 +0200
@@ -7,10 +7,10 @@
public class InitQtWebKit {
[DllImport("libqtwebkit-sharp", CharSet=CharSet.Ansi)]
- static extern void Init_QtWebKit();
+ static extern void Init_qtwebkit();
public static void InitSmoke() {
- Init_QtWebKit();
+ Init_qtwebkit();
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/core/QObjectExtras.cs new/kdebindings-4.1.1/csharp/qyoto/core/QObjectExtras.cs
--- old/kdebindings-4.1.0/csharp/qyoto/core/QObjectExtras.cs 2008-05-21 10:32:32.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/qyoto/core/QObjectExtras.cs 2008-08-28 10:06:46.000000000 +0200
@@ -25,26 +25,33 @@
private static extern bool ConnectDelegate(IntPtr obj, string signal, Delegate d);
public static bool Connect(QObject obj, string signal, NoArgDelegate d) {
+ // allocate a gchandle so the delegate won't be collected
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
public static bool Connect<T>(QObject obj, string signal, OneArgDelegate<T> d) {
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
public static bool Connect(QObject obj, string signal, TwoArgDelegate d) {
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
public static bool Connect(QObject obj, string signal, ThreeArgDelegate d) {
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
public static bool Connect(QObject obj, string signal, FourArgDelegate d) {
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
public static bool Connect(QObject obj, string signal, FiveArgDelegate d) {
+ GCHandle.Alloc(d);
return ConnectDelegate((IntPtr) GCHandle.Alloc(obj), signal, d);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/src/delegateinvocation.h new/kdebindings-4.1.1/csharp/qyoto/src/delegateinvocation.h
--- old/kdebindings-4.1.0/csharp/qyoto/src/delegateinvocation.h 2008-07-23 10:25:01.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/qyoto/src/delegateinvocation.h 2008-08-28 10:06:46.000000000 +0200
@@ -45,6 +45,8 @@
}
sig = ba;
_mocargs = GetMocArguments(_o->smoke, "", mo->method(sigIndex).parameterTypes());
+ _mocargs.removeFirst(); // junk the return type - we don't care about that at the moment.
+ _items = _mocargs.size();
_sp = new Smoke::StackItem[_items];
_stack = new Smoke::StackItem[_items];
}
@@ -69,7 +71,7 @@
if (call == QMetaObject::InvokeMetaMethod) {
if (id == 0) {
- smokeStackFromQtStack(_stack, a + 1, _items, 1, _mocargs);
+ smokeStackFromQtStack(_stack, a + 1, 0, _items, _mocargs);
next();
(*InvokeDelegate)(_delegate, _sp);
}
@@ -78,7 +80,7 @@
return id;
}
- inline const MocArgument &arg() { return *_mocargs[_cur + 1]; }
+ inline const MocArgument &arg() { return *_mocargs[_cur]; }
inline SmokeType type() { return arg().st; }
inline Marshall::Action action() { return Marshall::ToObject; }
inline Smoke::StackItem &item() { return _stack[_cur]; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/csharp/qyoto/src/SmokeInvocation.cs new/kdebindings-4.1.1/csharp/qyoto/src/SmokeInvocation.cs
--- old/kdebindings-4.1.0/csharp/qyoto/src/SmokeInvocation.cs 2008-07-08 11:27:33.000000000 +0200
+++ new/kdebindings-4.1.1/csharp/qyoto/src/SmokeInvocation.cs 2008-08-28 10:06:46.000000000 +0200
@@ -400,15 +400,6 @@
args[i] = stackPtr[i].s_float;
} else if (parameters[i].ParameterType == typeof(double)) {
args[i] = stackPtr[i].s_double;
- } else if (parameters[i].ParameterType == typeof(string)) {
- if (stackPtr[i].s_class != IntPtr.Zero) {
- args[i] = (string) ((GCHandle) stackPtr[i].s_class).Target;
-#if DEBUG
- DebugGCHandle.Free((GCHandle) stackPtr[i].s_class);
-#else
- ((GCHandle) stackPtr[i].s_class).Free();
-#endif
- }
} else {
if (stackPtr[i].s_class != IntPtr.Zero) {
args[i] = ((GCHandle) stackPtr[i].s_class).Target;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/kalyptus/kalyptusCxxToKimono.pm new/kdebindings-4.1.1/kalyptus/kalyptusCxxToKimono.pm
--- old/kdebindings-4.1.0/kalyptus/kalyptusCxxToKimono.pm 2008-07-24 14:56:35.000000000 +0200
+++ new/kdebindings-4.1.1/kalyptus/kalyptusCxxToKimono.pm 2008-08-28 10:06:47.000000000 +0200
@@ -2313,6 +2313,9 @@
$methodCode .= " public $csharpClassName($csharpparams) : this((Type) null) {\n";
$methodCode .= " CreateProxy();\n";
$methodCode .= smokeInvocation("interceptor", \@csharpArgTypeList, "void", $mungedMethod, $signature, $addImport);
+ if ($name eq 'KApplication') {
+ $methodCode .= " qApp = this;\n";
+ }
$methodCode .= " }\n";
}
} elsif ( $mainClassNode->{Pure} && $isPure ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/kalyptus/kalyptusCxxToSmoke.pm new/kdebindings-4.1.1/kalyptus/kalyptusCxxToSmoke.pm
--- old/kdebindings-4.1.0/kalyptus/kalyptusCxxToSmoke.pm 2008-07-24 14:56:35.000000000 +0200
+++ new/kdebindings-4.1.1/kalyptus/kalyptusCxxToSmoke.pm 2008-08-28 10:06:47.000000000 +0200
@@ -2144,7 +2144,7 @@
push @classlist, $className;
push @moduleclasslist, $className unless (defined($excludeClasses{$className}) && !defined($externClasses{$className}));
$enumclasslist{$className}++ if keys %{$classNode->{enumerations}};
- $classNode->{ClassIndex} = $#classlist;
+ $classNode->{ClassIndex} = $#moduleclasslist;
addIncludeForClass( $classNode, \%allIncludes, undef ) unless (defined($excludeClasses{$className}) && !defined($externClasses{$className}));
} );
Files old/kdebindings-4.1.0/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 and new/kdebindings-4.1.1/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/akonadi/akonadihandlers.cpp new/kdebindings-4.1.1/ruby/akonadi/akonadihandlers.cpp
--- old/kdebindings-4.1.0/ruby/akonadi/akonadihandlers.cpp 2008-06-10 13:40:53.000000000 +0200
+++ new/kdebindings-4.1.1/ruby/akonadi/akonadihandlers.cpp 2008-08-28 10:06:46.000000000 +0200
@@ -26,9 +26,7 @@
#include
#include
#include
-#include
-DEF_LIST_MARSHALLER( AkonadiJobList, QListAkonadi::Job*, Akonadi::Job )
DEF_LIST_MARSHALLER( AkonadiAttributeList, QListAkonadi::Attribute*, Akonadi::Attribute )
DEF_VALUELIST_MARSHALLER( AkonadiAgentInstanceList, QListAkonadi::AgentInstance, Akonadi::AgentInstance )
@@ -44,7 +42,5 @@
{ "Akonadi::Collection::List&", marshall_AkonadiCollectionList },
{ "Akonadi::Item::List", marshall_AkonadiItemList },
{ "Akonadi::Item::List&", marshall_AkonadiItemList },
- { "Akonadi::Job::List", marshall_AkonadiJobList },
- { "Akonadi::Job::List&", marshall_AkonadiJobList },
{ 0, 0 }
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/akonadi/CMakeLists.txt new/kdebindings-4.1.1/ruby/akonadi/CMakeLists.txt
--- old/kdebindings-4.1.0/ruby/akonadi/CMakeLists.txt 2008-06-25 09:53:37.000000000 +0200
+++ new/kdebindings-4.1.1/ruby/akonadi/CMakeLists.txt 2008-08-28 10:06:46.000000000 +0200
@@ -4,7 +4,15 @@
set(rubyakonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp)
add_library(rubyakonadi MODULE ${rubyakonadi_LIBRARY_SRC})
-target_link_libraries(rubyakonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi qtruby4shared)
+target_link_libraries(rubyakonadi
+ ${QT_QTCORE_LIBRARY}
+ ${RUBY_LIBRARY}
+ akonadi-kde
+ akonadi-kmime
+ smokeqt
+ smokekde
+ smokeakonadi
+ qtruby4shared)
set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi)
install(TARGETS rubyakonadi DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
install(FILES akonadi.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/akonadi)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-4.1.0/ruby/plasma/src/applet.rb new/kdebindings-4.1.1/ruby/plasma/src/applet.rb
--- old/kdebindings-4.1.0/ruby/plasma/src/applet.rb 2008-07-08 11:27:50.000000000 +0200
+++ new/kdebindings-4.1.1/ruby/plasma/src/applet.rb 2008-08-28 10:06:46.000000000 +0200
@@ -30,7 +30,7 @@
end
def init
- applet.resize(200, 200)
+ oldSize = applet.size
puts "RubyAppletScript::Applet#init mainScript: #{mainScript}"
program = Qt::FileInfo.new(mainScript)
@@ -42,6 +42,9 @@
klass = Object.const_get(moduleName.to_sym).const_get(className.to_sym)
@applet_script = klass.new(self)
@applet_script.init
+ if oldSize.height > 10 && oldSize.width > 10
+ applet.resize(oldSize)
+ end
set_up_event_handlers
return true
++++++ kdebindings4.spec.in ++++++
--- KDE/kdebindings4/kdebindings4.spec.in 2008-08-18 12:16:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.spec.in 2008-08-28 15:52:56.000000000 +0200
@@ -21,7 +21,7 @@
License: GPL
Group: System/GUI/KDE
Summary: kdebindings build
-Version: 4.1.0
+Version: 4.1.1
Release: 1
Source0: kdebindings-%version.tar.bz2
Patch0: 4_1_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org