commit kdebindings3

Hello community, here is the log from the commit of package kdebindings3 checked in at Tue Aug 1 16:59:04 CEST 2006. -------- --- KDE/kdebindings3/kdebindings3-java.changes 2006-06-19 00:15:48.000000000 +0200 +++ kdebindings3/kdebindings3-java.changes 2006-08-01 16:57:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 23 22:26:18 CEST 2006 - coolo@suse.de + +- update to KDE 3.5.4: + * several fixes to the qtruby bindings + +------------------------------------------------------------------- kdebindings3-javascript.changes: same change kdebindings3-python.changes: same change kdebindings3.changes: same change Old: ---- kdebindings-3.5.3.tar.bz2 New: ---- kdebindings-3.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings3-java.spec ++++++ --- /var/tmp/diff_new_pack.PH8Xml/_old 2006-08-01 16:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PH8Xml/_new 2006-08-01 16:57:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings3-java (Version 3.5.3) +# spec file for package kdebindings3-java (Version 3.5.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ Group: Development/Libraries/Java Summary: Java Bindings for KDE Provides: kdebindings3:/opt/kde3/lib/java -Version: 3.5.3 -Release: 3 +Version: 3.5.4 +Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -267,6 +267,9 @@ %endif %changelog -n kdebindings3-java +* Sun Jul 23 2006 - coolo@suse.de +- update to KDE 3.5.4: + * several fixes to the qtruby bindings * Sun Jun 18 2006 - coolo@suse.de - fix build on older distributions * Wed May 24 2006 - stbinner@suse.de ++++++ kdebindings3-javascript.spec ++++++ --- /var/tmp/diff_new_pack.PH8Xml/_old 2006-08-01 16:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PH8Xml/_new 2006-08-01 16:57:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings3-javascript (Version 3.5.3) +# spec file for package kdebindings3-javascript (Version 3.5.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ Group: System/GUI/KDE Summary: JavaScript Bindings and Interpreter for KDE Provides: kdebindings -Version: 3.5.3 -Release: 3 +Version: 3.5.4 +Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -274,6 +274,9 @@ %endif %changelog -n kdebindings3-javascript +* Sun Jul 23 2006 - coolo@suse.de +- update to KDE 3.5.4: + * several fixes to the qtruby bindings * Sun Jun 18 2006 - coolo@suse.de - fix build on older distributions * Wed May 24 2006 - stbinner@suse.de ++++++ kdebindings3-python.spec ++++++ --- /var/tmp/diff_new_pack.PH8Xml/_old 2006-08-01 16:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PH8Xml/_new 2006-08-01 16:57:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings3-python (Version 3.5.3) +# spec file for package kdebindings3-python (Version 3.5.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ Group: Development/Libraries/Python Summary: Python Bindings for KDE Provides: sip PyKDE -Version: 3.5.3 -Release: 3 +Version: 3.5.4 +Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) python-qt = %{version} Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -267,6 +267,9 @@ %endif %changelog -n kdebindings3-python +* Sun Jul 23 2006 - coolo@suse.de +- update to KDE 3.5.4: + * several fixes to the qtruby bindings * Sun Jun 18 2006 - coolo@suse.de - fix build on older distributions * Wed May 24 2006 - stbinner@suse.de ++++++ kdebindings3.spec ++++++ --- /var/tmp/diff_new_pack.PH8Xml/_old 2006-08-01 16:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PH8Xml/_new 2006-08-01 16:57:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings3 (Version 3.5.3) +# spec file for package kdebindings3 (Version 3.5.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -25,8 +25,8 @@ Group: System/GUI/KDE Summary: Bindings for Qt and KDE Libraries Provides: kdebindings -Version: 3.5.3 -Release: 3 +Version: 3.5.4 +Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -281,6 +281,9 @@ %endif %changelog -n kdebindings3 +* Sun Jul 23 2006 - coolo@suse.de +- update to KDE 3.5.4: + * several fixes to the qtruby bindings * Sun Jun 18 2006 - coolo@suse.de - fix build on older distributions * Wed May 24 2006 - stbinner@suse.de ++++++ kdebindings-3.5.3.tar.bz2 -> kdebindings-3.5.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/acinclude.m4 new/kdebindings-3.5.4/acinclude.m4 --- old/kdebindings-3.5.3/acinclude.m4 2006-05-23 22:24:12.000000000 +0200 +++ new/kdebindings-3.5.4/acinclude.m4 2006-07-24 16:58:13.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/admin/acinclude.m4.in new/kdebindings-3.5.4/admin/acinclude.m4.in --- old/kdebindings-3.5.3/admin/acinclude.m4.in 2006-05-23 14:54:05.000000000 +0200 +++ new/kdebindings-3.5.4/admin/acinclude.m4.in 2006-07-24 09:08:54.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/admin/cvs.sh new/kdebindings-3.5.4/admin/cvs.sh --- old/kdebindings-3.5.3/admin/cvs.sh 2006-05-23 14:54:05.000000000 +0200 +++ new/kdebindings-3.5.4/admin/cvs.sh 2006-07-24 09:08:54.000000000 +0200 @@ -32,7 +32,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf $required_autoconf_version" @@ -47,7 +47,7 @@ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader $required_autoconf_version" @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.3\"" + VERSION="\"3.5.4\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/configure new/kdebindings-3.5.4/configure --- old/kdebindings-3.5.3/configure 2006-05-23 22:25:14.000000000 +0200 +++ new/kdebindings-3.5.4/configure 2006-07-24 16:59:15.000000000 +0200 @@ -1994,7 +1994,7 @@ # Define the identity of the package. PACKAGE=kdebindings - VERSION="3.5.3" + VERSION="3.5.4" cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/configure.in new/kdebindings-3.5.4/configure.in --- old/kdebindings-3.5.3/configure.in 2006-05-23 22:24:13.000000000 +0200 +++ new/kdebindings-3.5.4/configure.in 2006-07-24 16:58:14.000000000 +0200 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kdebindings, "3.5.3") dnl searches for some needed programs +AM_INIT_AUTOMAKE(kdebindings, "3.5.4") dnl searches for some needed programs KDE_SET_PREFIX diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/kdebindings.lsm new/kdebindings-3.5.4/kdebindings.lsm --- old/kdebindings-3.5.3/kdebindings.lsm 2006-05-23 13:20:41.000000000 +0200 +++ new/kdebindings-3.5.4/kdebindings.lsm 2006-07-23 16:08:08.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: kdebindings -Version: 3.5.3 -Entered-date: 2006-05-23 +Version: 3.5.4 +Entered-date: 2006-08-02 Description: Non-C++ bindings for the K Desktop Environment (KDE) Keywords: KDE X11 desktop Qt Author: http://bugs.kde.org/ (KDE Bugtracking System) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/korundum/ChangeLog new/kdebindings-3.5.4/korundum/ChangeLog --- old/kdebindings-3.5.3/korundum/ChangeLog 2006-05-22 20:02:31.000000000 +0200 +++ new/kdebindings-3.5.4/korundum/ChangeLog 2006-07-22 10:09:12.000000000 +0200 @@ -1,3 +1,10 @@ +2006-06-05 Richard Dale + + * The metaObject methods for slots and signals are no longer added when + a Qt::Object is constructed, but when slots or signals are added to + a class. This means that signals as well as slots can be added to an + existing instance. + 2006-05-16 Richard Dale * Fixed regression causing KDE::UniqueApplication.exec to not work diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/korundum/rubylib/korundum/Korundum.cpp new/kdebindings-3.5.4/korundum/rubylib/korundum/Korundum.cpp --- old/kdebindings-3.5.3/korundum/rubylib/korundum/Korundum.cpp 2006-05-22 20:02:31.000000000 +0200 +++ new/kdebindings-3.5.4/korundum/rubylib/korundum/Korundum.cpp 2006-07-22 10:09:12.000000000 +0200 @@ -888,7 +888,6 @@ extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *)); extern const char * kde_resolve_classname(Smoke* smoke, int classId, void * ptr); extern VALUE new_qt(int argc, VALUE * argv, VALUE klass); -extern VALUE new_qobject(int argc, VALUE * argv, VALUE klass); extern VALUE qt_module; extern VALUE qt_internal_module; extern VALUE qt_base_class; @@ -1004,9 +1003,7 @@ static VALUE new_kde(int argc, VALUE * argv, VALUE klass) { - // Note this should really call only new_qobject if the instance is a QObject, - // and otherwise call new_qt(). - VALUE instance = new_qobject(argc, argv, klass); + VALUE instance = new_qt(argc, argv, klass); if (rb_funcall(kde_module, rb_intern("hasDCOPSignals"), 1, klass) == Qtrue) { VALUE signalNames = rb_funcall(kde_module, rb_intern("getDCOPSignalNames"), 1, klass); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/qtruby/ChangeLog new/kdebindings-3.5.4/qtruby/ChangeLog --- old/kdebindings-3.5.3/qtruby/ChangeLog 2006-05-22 20:02:31.000000000 +0200 +++ new/kdebindings-3.5.4/qtruby/ChangeLog 2006-07-22 10:09:12.000000000 +0200 @@ -1,3 +1,25 @@ +2006-07-12 Richard Dale + + * The Ruby String to 'char *' and String to 'unsigned char *' were using + the pointer within the Ruby String directly which meant they were + deleted when the Ruby String was gc'd. So they are copied with + strdup () instead. + +2006-06-05 Richard Dale + + * The metaObject methods for slots and signals are no longer added when + a Qt::Object is constructed, but when slots or signals are added to + a class. This means that signals as well as slots can be added to an + existing instance. + +2006-06-04 Richard Dale + + * For Qt::QObject classes which are immediate subclasses of Qt::Base, + don't add C metaObject() and qt_invoke() methods as they aren't + needed. This means that a QMetaObject is no longer constructed for + these classes, and the one that the corresponding C++ class has is + returned instead. + 2006-05-20 Richard Dale * Fix regression for dynamic class creation via QMetaObject info causing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/qtruby/rubylib/qtruby/Qt.cpp new/kdebindings-3.5.4/qtruby/rubylib/qtruby/Qt.cpp --- old/kdebindings-3.5.3/qtruby/rubylib/qtruby/Qt.cpp 2006-05-22 20:02:31.000000000 +0200 +++ new/kdebindings-3.5.4/qtruby/rubylib/qtruby/Qt.cpp 2006-07-22 10:09:12.000000000 +0200 @@ -889,7 +889,6 @@ if (classId == 0) { VALUE new_klass = Qnil; QString className(meta->className()); - // The konsolePart class is in kdebase, and so it can't be in the Smoke library. // This hack instantiates a Ruby KDE::KonsolePart instance if (className == "konsolePart") { @@ -1663,25 +1662,6 @@ return result; } -static VALUE qt_invoke(int argc, VALUE * argv, VALUE self); -static VALUE qt_signal(int argc, VALUE * argv, VALUE self); - -VALUE -new_qobject(int argc, VALUE * argv, VALUE klass) -{ - // TODO: Don't do this everytime a new instance is created, just once.. - rb_define_method(klass, "qt_invoke", (VALUE (*) (...)) qt_invoke, -1); - rb_define_method(klass, "qt_emit", (VALUE (*) (...)) qt_invoke, -1); - rb_define_method(klass, "metaObject", (VALUE (*) (...)) metaObject, 0); - VALUE signalNames = rb_funcall(qt_internal_module, rb_intern("getSignalNames"), 1, klass); - for (long index = 0; index < RARRAY(signalNames)->len; index++) { - VALUE signal = rb_ary_entry(signalNames, index); - rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) qt_signal, -1); - } - - return new_qt(argc, argv, klass); -} - static VALUE new_qapplication(int argc, VALUE * argv, VALUE klass) { @@ -1694,10 +1674,10 @@ rb_ary_unshift(temp, rb_gv_get("$0")); local_argv[0] = INT2NUM(RARRAY(temp)->len); local_argv[1] = temp; - result = new_qobject(2, local_argv, klass); + result = new_qt(2, local_argv, klass); free(local_argv); } else { - result = new_qobject(argc, argv, klass); + result = new_qt(argc, argv, klass); } rb_gv_set("$qApp", result); @@ -2199,6 +2179,25 @@ } static VALUE +add_metaobject_methods(VALUE self, VALUE klass) +{ + rb_define_method(klass, "qt_invoke", (VALUE (*) (...)) qt_invoke, -1); + rb_define_method(klass, "qt_emit", (VALUE (*) (...)) qt_invoke, -1); + rb_define_method(klass, "metaObject", (VALUE (*) (...)) metaObject, 0); + return self; +} + +static VALUE +add_signal_methods(VALUE self, VALUE klass, VALUE signalNames) +{ + for (long index = 0; index < RARRAY(signalNames)->len; index++) { + VALUE signal = rb_ary_entry(signalNames, index); + rb_define_method(klass, StringValuePtr(signal), (VALUE (*) (...)) qt_signal, -1); + } + return self; +} + +static VALUE dispose(VALUE self) { smokeruby_object *o = value_obj_info(self); @@ -2607,7 +2606,7 @@ } else if (packageName.startsWith("Kontact::")) { klass = rb_define_class_under(kontact_module, package+strlen("Kontact::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); - } else if (packageName.startsWith("Ko")) { + } else if (packageName.startsWith("Ko") && scope_op.search(packageName) == -1) { klass = rb_define_class_under(koffice_module, package+strlen("Ko"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (packageName.startsWith("Kate::")) { @@ -2647,15 +2646,12 @@ if (strcmp(package, "Qt::Application") == 0) { rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qapplication, -1); rb_define_method(klass, "ARGV", (VALUE (*) (...)) qapplication_argv, 0); - } else { - rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qobject, -1); } } else if (QString(package).startsWith("Qext::")) { if (qext_scintilla_module == Qnil) { qext_scintilla_module = rb_define_module("Qext"); } klass = rb_define_class_under(qext_scintilla_module, package+strlen("Qext::"), qt_base_class); - rb_define_singleton_method(klass, "new", (VALUE (*) (...)) new_qobject, -1); } else { klass = kde_package_to_class(package, qt_base_class); } @@ -2841,6 +2837,8 @@ rb_define_module_function(qt_internal_module, "make_QUMethod", (VALUE (*) (...)) make_QUMethod, 2); rb_define_module_function(qt_internal_module, "make_QMetaData_tbl", (VALUE (*) (...)) make_QMetaData_tbl, 1); rb_define_module_function(qt_internal_module, "make_metaObject", (VALUE (*) (...)) make_metaObject, 6); + rb_define_module_function(qt_internal_module, "addMetaObjectMethods", (VALUE (*) (...)) add_metaobject_methods, 1); + rb_define_module_function(qt_internal_module, "addSignalMethods", (VALUE (*) (...)) add_signal_methods, 2); rb_define_module_function(qt_internal_module, "mapObject", (VALUE (*) (...)) mapObject, 1); // isQOjbect => isaQObject rb_define_module_function(qt_internal_module, "isQObject", (VALUE (*) (...)) isaQObject, 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/qtruby/rubylib/qtruby/handlers.cpp new/kdebindings-3.5.4/qtruby/rubylib/qtruby/handlers.cpp --- old/kdebindings-3.5.3/qtruby/rubylib/qtruby/handlers.cpp 2006-03-17 11:09:37.000000000 +0100 +++ new/kdebindings-3.5.4/qtruby/rubylib/qtruby/handlers.cpp 2006-07-22 10:09:12.000000000 +0200 @@ -755,7 +755,7 @@ break; } - m->item().s_voidp = StringValuePtr(rv); + m->item().s_voidp = strdup(StringValuePtr(rv)); } break; case Marshall::ToVALUE: @@ -784,7 +784,7 @@ m->item().s_voidp = 0; break; } - m->item().s_voidp = StringValuePtr(rv); + m->item().s_voidp = strdup(StringValuePtr(rv)); } break; case Marshall::ToVALUE: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebindings-3.5.3/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb new/kdebindings-3.5.4/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb --- old/kdebindings-3.5.3/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb 2006-05-22 20:02:31.000000000 +0200 +++ new/kdebindings-3.5.4/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb 2006-07-22 10:09:12.000000000 +0200 @@ -1595,6 +1595,7 @@ slots.length, signalTable, signals.length) + addSignalMethods(qobject.class, getSignalNames(qobject.class)) meta.changed = false end @@ -1614,13 +1615,14 @@ class MetaInfo attr_accessor :signals, :slots, :metaobject, :mocargs, :changed - def initialize(aClass) - Meta[aClass.name] = self - @klass = aClass + def initialize(klass) + Meta[klass.name] = self + @klass = klass @metaobject = nil @signals = [] @slots = [] @changed = false + Internal.addMetaObjectMethods(klass) end def add_signals(signal_list) ++++++ kdebindings3.spec.in ++++++ --- KDE/kdebindings3/kdebindings3.spec.in 2006-06-18 21:12:30.000000000 +0200 +++ kdebindings3/kdebindings3.spec.in 2006-07-23 22:27:21.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: Bindings for Qt and KDE Libraries Provides: kdebindings -Version: 3.5.3 +Version: 3.5.4 Release: 1 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...