Hello community,
here is the log from the commit of package kdebindings3
checked in at Wed Aug 23 20:54:08 CEST 2006.
--------
--- KDE/kdebindings3/kdebindings3-java.changes 2006-08-01 16:57:20.000000000 +0200
+++ kdebindings3/kdebindings3-java.changes 2006-08-23 20:53:34.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 23 11:44:01 CEST 2006 - stbinner@suse.de
+
+- add 3_5_BRANCH.diff (ruby binding fixes)
+
+-------------------------------------------------------------------
kdebindings3-javascript.changes: same change
kdebindings3-python.changes: same change
kdebindings3.changes: same change
New:
----
3_5_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings3-java.spec ++++++
--- /var/tmp/diff_new_pack.FtAQzZ/_old 2006-08-23 20:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.FtAQzZ/_new 2006-08-23 20:53:40.000000000 +0200
@@ -26,12 +26,12 @@
Summary: Java Bindings for KDE
Provides: kdebindings3:/opt/kde3/lib/java
Version: 3.5.4
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -86,7 +86,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -267,6 +267,8 @@
%endif
%changelog -n kdebindings3-java
+* Wed Aug 23 2006 - stbinner@suse.de
+- add 3_5_BRANCH.diff (ruby binding fixes)
* Sun Jul 23 2006 - coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
++++++ kdebindings3-javascript.spec ++++++
--- /var/tmp/diff_new_pack.FtAQzZ/_old 2006-08-23 20:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.FtAQzZ/_new 2006-08-23 20:53:40.000000000 +0200
@@ -26,12 +26,12 @@
Summary: JavaScript Bindings and Interpreter for KDE
Provides: kdebindings
Version: 3.5.4
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -45,10 +45,10 @@
Required libraries to write applications in Java for Qt and KDE.
Additionally, it also contains KJSEmbed, which is a command line
-interpreter to execute JavaScript applications. You can very easily
+interpreter for executing JavaScript applications. You can very easily
write small KDE applications using it.
-These applications are NOT running in a sandbox, so they have access to
+These applications are not running in a sandbox, so they have access to
all files, as does every other application.
@@ -93,7 +93,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -274,6 +274,8 @@
%endif
%changelog -n kdebindings3-javascript
+* Wed Aug 23 2006 - stbinner@suse.de
+- add 3_5_BRANCH.diff (ruby binding fixes)
* Sun Jul 23 2006 - coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
++++++ kdebindings3-python.spec ++++++
--- /var/tmp/diff_new_pack.FtAQzZ/_old 2006-08-23 20:53:41.000000000 +0200
+++ /var/tmp/diff_new_pack.FtAQzZ/_new 2006-08-23 20:53:41.000000000 +0200
@@ -26,12 +26,12 @@
Summary: Python Bindings for KDE
Provides: sip PyKDE
Version: 3.5.4
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) python-qt = %{version}
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -86,7 +86,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -267,6 +267,8 @@
%endif
%changelog -n kdebindings3-python
+* Wed Aug 23 2006 - stbinner@suse.de
+- add 3_5_BRANCH.diff (ruby binding fixes)
* Sun Jul 23 2006 - coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
++++++ kdebindings3.spec ++++++
--- /var/tmp/diff_new_pack.FtAQzZ/_old 2006-08-23 20:53:41.000000000 +0200
+++ /var/tmp/diff_new_pack.FtAQzZ/_new 2006-08-23 20:53:41.000000000 +0200
@@ -26,12 +26,12 @@
Summary: Bindings for Qt and KDE Libraries
Provides: kdebindings
Version: 3.5.4
-Release: 1
+Release: 3
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -100,7 +100,7 @@
%endif
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
@@ -281,6 +281,8 @@
%endif
%changelog -n kdebindings3
+* Wed Aug 23 2006 - stbinner@suse.de
+- add 3_5_BRANCH.diff (ruby binding fixes)
* Sun Jul 23 2006 - coolo@suse.de
- update to KDE 3.5.4:
* several fixes to the qtruby bindings
++++++ 3_5_BRANCH.diff ++++++
package: kdebindings-3.5.4.tar.bz2
kdemod: kdebindings
svn di between /tags/KDE/3.5.4 and /branches/KDE//branches/KDE/3.5
Index: qtruby/ChangeLog
===================================================================
--- qtruby/ChangeLog (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ qtruby/ChangeLog (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -1,3 +1,9 @@
+2006-08-10 Richard Dale
+
+ * The Ruby VALUE to 'uchar *' marshaller wasn't working correctly if the
+ Ruby string contained nulls. Fixed by Dirk Mueller (thanks) and also
+ applied for 'char *' types.
+
2006-07-12 Richard Dale
* The Ruby String to 'char *' and String to 'unsigned char *' were using
Index: qtruby/rubylib/qtruby/handlers.cpp
===================================================================
--- qtruby/rubylib/qtruby/handlers.cpp (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ qtruby/rubylib/qtruby/handlers.cpp (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -747,17 +747,21 @@
static void marshall_charP(Marshall *m) {
switch(m->action()) {
- case Marshall::FromVALUE:
- {
- VALUE rv = *(m->var());
- if(rv == Qnil) {
- m->item().s_voidp = 0;
- break;
- }
-
- m->item().s_voidp = strdup(StringValuePtr(rv));
- }
- break;
+ case Marshall::FromVALUE:
+ {
+ VALUE rv = *(m->var());
+ if (rv == Qnil) {
+ m->item().s_voidp = 0;
+ break;
+ }
+
+ int len = RSTRING(rv)->len;
+ char* mem = (char*) malloc(len+1);
+ memcpy(mem, StringValuePtr(rv), len);
+ mem[len] ='\0';
+ m->item().s_voidp = mem;
+ }
+ break;
case Marshall::ToVALUE:
{
char *p = (char*)m->item().s_voidp;
@@ -777,14 +781,18 @@
void marshall_ucharP(Marshall *m) {
switch(m->action()) {
- case Marshall::FromVALUE:
- {
- VALUE rv = *(m->var());
- if(rv == Qnil) {
- m->item().s_voidp = 0;
- break;
- }
- m->item().s_voidp = strdup(StringValuePtr(rv));
+ case Marshall::FromVALUE:
+ {
+ VALUE rv = *(m->var());
+ if (rv == Qnil) {
+ m->item().s_voidp = 0;
+ break;
+ }
+ int len = RSTRING(rv)->len;
+ char* mem = (char*) malloc(len+1);
+ memcpy(mem, StringValuePtr(rv), len);
+ mem[len] ='\0';
+ m->item().s_voidp = mem;
}
break;
case Marshall::ToVALUE:
@@ -1836,8 +1844,8 @@
}
}
-#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; }; \
- Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList- ;
+#define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace dummy { char ListIdent##STR[] = #Item; }; \
+ Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList
- ;
DEF_VALUELIST_MARSHALLER( QVariantList, QValueList<QVariant>, QVariant, QValueList<QVariant>::Iterator )
DEF_VALUELIST_MARSHALLER( QPixmapList, QValueList<QPixmap>, QPixmap, QValueList<QPixmap>::Iterator )
Index: korundum/ChangeLog
===================================================================
--- korundum/ChangeLog (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ korundum/ChangeLog (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -1,3 +1,8 @@
+2006-08-18 Richard Dale
+
+ * Added a KActionPtrList marshaller. Fixes problem reported by
+ eskatos on the #qtruby irc channel.
+
2006-06-05 Richard Dale
* The metaObject methods for slots and signals are no longer added when
Index: korundum/rubylib/korundum/kdehandlers.cpp
===================================================================
--- korundum/rubylib/korundum/kdehandlers.cpp (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ korundum/rubylib/korundum/kdehandlers.cpp (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -642,6 +642,60 @@
}
#endif
+void marshall_KActionPtrList(Marshall *m) {
+ switch(m->action()) {
+ case Marshall::FromVALUE:
+ {
+ }
+ break;
+ case Marshall::ToVALUE:
+ {
+ KActionPtrList *valuelist = (KActionPtrList*)m->item().s_voidp;
+ if (!valuelist) {
+ *(m->var()) = Qnil;
+ break;
+ }
+
+ VALUE av = rb_ary_new();
+
+ int ix = m->smoke()->idClass("KAction");
+ const char * className = m->smoke()->binding->className(ix);
+
+ for ( KActionPtrList::Iterator it = valuelist->begin();
+ it != valuelist->end();
+ ++it )
+ {
+ void *p = (*it);
+
+ if (m->item().s_voidp == 0) {
+ *(m->var()) = Qnil;
+ break;
+ }
+
+ VALUE obj = getPointerObject(p);
+ if (obj == Qnil) {
+ smokeruby_object * o = ALLOC(smokeruby_object);
+ o->smoke = m->smoke();
+ o->classId = o->smoke->idClass("KAction");
+ o->ptr = p;
+ o->allocated = false;
+ obj = set_obj_info(className, o);
+ }
+ rb_ary_push(av, obj);
+ }
+
+ if (m->cleanup())
+ delete valuelist;
+ else
+ *(m->var()) = av;
+ }
+ break;
+ default:
+ m->unsupported();
+ break;
+ }
+}
+
void marshall_KTraderOfferList(Marshall *m) {
switch(m->action()) {
case Marshall::FromVALUE:
@@ -1261,6 +1315,7 @@
TypeHandler KDE_handlers[] = {
{ "QCStringList", marshall_QCStringList },
{ "KCmdLineOptions*", marshall_KCmdLineOptions },
+ { "KActionPtrList", marshall_KActionList },
{ "QPtrList<KAction>", marshall_KActionList },
{ "QPtrList<KAction>&", marshall_KActionList },
{ "KMimeType::List", marshall_KMimeTypeList },
@@ -1291,6 +1346,8 @@
{ "QPtrListKParts::Plugin", marshall_KPartPluginList },
{ "QPtrListKParts::ReadOnlyPart", marshall_KPartReadOnlyPartList },
{ "QPtrList<KServiceTypeProfile>&", marshall_KServiceTypeProfileList },
+ { "QValueList", marshall_KActionPtrList },
+ { "KActionPtrList", marshall_KActionPtrList },
{ "QValueList<KAboutPerson>", marshall_KAboutPersonList },
{ "QValueList<KAboutTranslator>", marshall_KAboutTranslatorList },
{ "QValueListKIO::CopyInfo&", marshall_KIOCopyInfoList },
Index: kdejava/koala/kdejava/KDEJavaSlot.h
===================================================================
--- kdejava/koala/kdejava/KDEJavaSlot.h (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ kdejava/koala/kdejava/KDEJavaSlot.h (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -69,7 +69,7 @@
void invoke(const KFileItem* arg1,const QPixmap&);
void invoke(const KFileItem* arg1,const QPoint&);
void invoke(const KFileItemList& arg1);
- void invoke(const KFileItem* arg1,QDropEvent* arg1,const KURL::List& arg3);
+ void invoke(const KFileItem* arg1,QDropEvent* arg2,const KURL::List& arg3);
void invoke(const KShortcut& arg1);
void invoke(const KURL& arg1);
void invoke(const KURL& arg1,const KURL& arg2);
Index: Makefile.am.in
===================================================================
--- Makefile.am.in (.../tags/KDE/3.5.4/kdebindings) (revision 576157)
+++ Makefile.am.in (.../branches/KDE/3.5/kdebindings) (revision 576157)
@@ -12,7 +12,7 @@
# the below is for proper referencing of dcopperl into SUBDIRS
COMPILE_BEFORE_dcopc = dcopperl
-AUTOMAKE_OPTIONS = foreign 1.5
+AUTOMAKE_OPTIONS = foreign 1.6.1
$(top_srcdir)/acinclude.m4: $(top_srcdir)/dcopc/glib.m4 $(top_srcdir)/dcopc/gtk.m4
Property changes on: .
___________________________________________________________________
Name: svn:externals
+ admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
++++++ kdebindings3.spec.in ++++++
--- KDE/kdebindings3/kdebindings3.spec.in 2006-07-23 22:27:21.000000000 +0200
+++ kdebindings3/kdebindings3.spec.in 2006-08-23 11:43:53.000000000 +0200
@@ -32,7 +32,7 @@
Url: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdebindings-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: python2.diff
Patch2: perl.diff
Patch3: lib64.diff
@@ -76,7 +76,7 @@
%prep
%setup -q -n kdebindings-%{version}
-#%patch0
+%patch0
%patch1
%patch2
if [ "lib64" = %_lib ]; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org