Hello community, here is the log from the commit of package perl-qt4 for openSUSE:Factory checked in at 2013-12-02 12:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-qt4 (Old) and /work/SRC/openSUSE:Factory/.perl-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-qt4/perl-qt4.changes 2013-10-03 16:06:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-qt4.new/perl-qt4.changes 2013-12-02 12:31:28.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 17:51:06 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sat Nov 9 22:52:08 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:05:49 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- perlqt-4.11.2.tar.xz New: ---- perlqt-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-qt4.spec ++++++ --- /var/tmp/diff_new_pack.p31TWl/_old 2013-12-02 12:31:29.000000000 +0100 +++ /var/tmp/diff_new_pack.p31TWl/_new 2013-12-02 12:31:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-qt4 -Version: 4.11.2 +Version: 4.11.90 Release: 0 Summary: PerlQt kdebindings library License: GPL-2.0+ ++++++ perlqt-4.11.2.tar.xz -> perlqt-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/cmake/MacroProve.cmake new/perlqt-4.11.90/cmake/MacroProve.cmake --- old/perlqt-4.11.2/cmake/MacroProve.cmake 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/cmake/MacroProve.cmake 2013-11-02 19:10:01.000000000 +0100 @@ -1,5 +1,5 @@ -MACRO( MACRO_PROVE _testname _path) +FUNCTION( MACRO_PROVE _testname _path) if(WIN32) set(prove_cmd "prove.bat") @@ -20,4 +20,4 @@ endif(_workingdir) add_test(${_testname} ${prove_cmd} ${prove_args} ${escaped_path}) -ENDMACRO( MACRO_PROVE _testname _path ) +ENDFUNCTION( MACRO_PROVE _testname _path ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/lib/QtCore4.pm new/perlqt-4.11.90/qtcore/lib/QtCore4.pm --- old/perlqt-4.11.2/qtcore/lib/QtCore4.pm 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/lib/QtCore4.pm 2013-11-02 19:10:01.000000000 +0100 @@ -1301,12 +1301,15 @@ foreach my $sp ('', ' ') { my $where = $sp . $perlClassName; - installautoload($where); - # Putting this in one package gives XS_AUTOLOAD one spot to look for - # the autoload variable - package Qt::AutoLoad; - my $autosub = \&{$where . '::_UTOLOAD'}; - Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); + + if (!exists &{$where . '::AUTOLOAD'}) { + installautoload($where); + # Putting this in one package gives XS_AUTOLOAD one spot to look for + # the autoload variable + package Qt::AutoLoad; + my $autosub = \&{$where . '::_UTOLOAD'}; + Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); + } } installSub("$perlClassName\::NEW", sub { @@ -1417,9 +1420,9 @@ my $signals = $meta->{signals}; my $slots = $meta->{slots}; - @{$classinfos} = () if !defined @{$classinfos}; - @{$signals} = () if !defined @{$signals}; - @{$slots} = () if !defined @{$slots}; + @{$classinfos} = () if !defined $classinfos; + @{$signals} = () if !defined $signals; + @{$slots} = () if !defined $slots; # Each entry in 'stringdata' corresponds to a string in the # qt_meta_stringdata_<classname> structure. @@ -1646,6 +1649,8 @@ use strict; use warnings; +use Scalar::Util; + # Called in the DESTROY method for all QObjects to see if they still have a # parent, and avoid deleting them if they do. sub Qt::Object::ON_DESTROY { @@ -1805,67 +1810,91 @@ }); sub String { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::String'; + } return bless \shift, 'Qt::String'; - } else { - return bless '', 'Qt::String'; } + return bless '', 'Qt::String'; } sub CString { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::CString'; + } return bless \shift, 'Qt::CString'; - } else { - return bless '', 'Qt::CString'; } + return bless '', 'Qt::CString'; } sub Int { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Int'; + } return bless \shift, 'Qt::Int'; - } else { - return bless '', 'Qt::Int'; } + return bless '', 'Qt::Int'; } sub Uint { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Uint'; + } return bless \shift, 'Qt::Uint'; - } else { - return bless '', 'Qt::Uint'; } + return bless '', 'Qt::Uint'; } sub Bool { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Bool'; + } return bless \shift, 'Qt::Bool'; - } else { - return bless '', 'Qt::Bool'; } + return bless '', 'Qt::Bool'; } sub Short { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Short'; + } return bless \shift, 'Qt::Short'; - } else { - return bless '', 'Qt::Short'; } + return bless '', 'Qt::Short'; } sub Ushort { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Ushort'; + } return bless \shift, 'Qt::Ushort'; - } else { - return bless '', 'Qt::Ushort'; } + return bless '', 'Qt::Ushort'; } sub Uchar { - if ( @_ ) { + if ( scalar @_ ) { + if ( Scalar::Util::readonly( $_[0] ) ) { + my $val = shift; + return bless \$val, 'Qt::Uchar'; + } return bless \shift, 'Qt::Uchar'; - } else { - return bless '', 'Qt::Uchar'; } + return bless '', 'Qt::Uchar'; } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/src/QtCore4.xs new/perlqt-4.11.90/qtcore/src/QtCore4.xs --- old/perlqt-4.11.2/qtcore/src/QtCore4.xs 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/src/QtCore4.xs 2013-11-02 19:10:01.000000000 +0100 @@ -249,6 +249,8 @@ char* autoload = new char[strlen(package) + 11]; sprintf(autoload, "%s::_UTOLOAD", package); newXS(autoload, XS_AUTOLOAD, __FILE__); + sprintf(autoload, "%s::DESTROY", package); + newXS(autoload, XS_DESTROY, __FILE__); delete[] autoload; void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/src/util.cpp new/perlqt-4.11.90/qtcore/src/util.cpp --- old/perlqt-4.11.2/qtcore/src/util.cpp 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/src/util.cpp 2013-11-02 19:10:01.000000000 +0100 @@ -1939,6 +1939,109 @@ XSRETURN(1); } +XS(XS_DESTROY) { + dXSARGS; + PERL_SET_CONTEXT(PL_curinterp); + char* package = HvNAME(SvSTASH(SvRV(ST(0)))); + ++package; + +#ifdef PERLQTDEBUG + if( do_debug && ( do_debug & qtdb_autoload ) ) { + fprintf(stderr, "In XS DESTROY for %s", package); + if((do_debug & qtdb_verbose)) { + smokeperl_object *o = sv_obj_info(ST(0)); + if(o) + fprintf(stderr, " - SV*: %p this: (%s)%p\n", ST(0), o->smoke->classes[o->classId].className, o->ptr); + else + fprintf(stderr, " - this: (unknown)(nil)\n"); + } + else { + fprintf(stderr, "\n"); + } + } +#endif + + // For anything we do here where withObject is true, sv_this should be set + // to the first argument on the stack, since that's where perl puts it. + // Wherever we return, be sure to restore sv_this. + SV* old_this = 0; + old_this = sv_this; + sv_this = newSVsv(ST(0)); + + smokeperl_object* o = sv_obj_info(sv_this); + + // Check to see that o exists (has a smokeperl_object in sv_this), has + // a valid pointer, and (is allocated or has an entry in the pointer + // map). If all of that's true, or we're in global destruction, we + // don't really care what happens. + if( PL_dirty ) { + // This block will be repeated a lot to clean stuff up. + // Restore sv_this + SvREFCNT_dec(sv_this); + sv_this = old_this; + XSRETURN_YES; + } + if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { + // This block will be repeated a lot to clean stuff up. + // Restore sv_this + SvREFCNT_dec(sv_this); + sv_this = old_this; + XSRETURN_YES; + } + + // Check to see if a delete of this object has been tried before, by + // seeing if the object's hash has the "has been hidden" key + static const char* key = "has been hidden"; + U32 klen = 15; + SV** svp = 0; + if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { + HV* hv = (HV*)SvRV(sv_this); + svp = hv_fetch( hv, key, klen, 0); + } + if(svp) { + // Found "has been hidden", so don't do anything, just clean up + // Restore sv_this + SvREFCNT_dec(sv_this); + sv_this = old_this; + XSRETURN_YES; + } + +#ifdef PERLQTDEBUG + // The following perl call seems to stomp on the package name, let's copy it + char* packagecpy = new char[strlen(package)+1]; + strcpy( packagecpy, package ); +#endif + + // Call the ON_DESTROY method, that stores a reference (increasing the + // refcnt) if necessary + HV* stash = gv_stashpv(package, TRUE); + GV* gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); + int retval = 0; + if( gv ) { + PUSHMARK(SP); + int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); + SPAGAIN; + if (count != 1) { + // Restore sv_this + SvREFCNT_dec(sv_this); + sv_this = old_this; + croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); + } + retval = POPi; + PUTBACK; + } + +#ifdef PERLQTDEBUG + if( do_debug && retval && (do_debug & qtdb_gc) ) + fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); + delete[] packagecpy; +#endif + + // Now clean up + SvREFCNT_dec(sv_this); + sv_this = old_this; +} + XS(XS_AUTOLOAD) { dXSARGS; PERL_SET_CONTEXT(PL_curinterp); @@ -2045,95 +2148,12 @@ else XSRETURN(count); } - else if( !strcmp( methodname, "DESTROY" ) ) { - smokeperl_object* o = sv_obj_info(sv_this); - - // Check to see that o exists (has a smokeperl_object in sv_this), has - // a valid pointer, and (is allocated or has an entry in the pointer - // map). If all of that's true, or we're in global destruction, we - // don't really care what happens. - if( PL_dirty ) { - // This block will be repeated a lot to clean stuff up. - if( withObject ) { - // Restore sv_this - SvREFCNT_dec(sv_this); - sv_this = old_this; - } - XSRETURN_YES; - } - if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { - // This block will be repeated a lot to clean stuff up. - if( withObject ) { - // Restore sv_this - SvREFCNT_dec(sv_this); - sv_this = old_this; - } - XSRETURN_YES; - } - - // Check to see if a delete of this object has been tried before, by - // seeing if the object's hash has the "has been hidden" key - static const char* key = "has been hidden"; - U32 klen = 15; - SV** svp = 0; - if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { - HV* hv = (HV*)SvRV(sv_this); - svp = hv_fetch( hv, key, klen, 0); - } - if(svp) { - // Found "has been hidden", so don't do anything, just clean up - if( withObject ) { - // Restore sv_this - SvREFCNT_dec(sv_this); - sv_this = old_this; - } - XSRETURN_YES; - } - -#ifdef PERLQTDEBUG - // The following perl call seems to stomp on the package name, let's copy it - char* packagecpy = new char[strlen(package)+1]; - strcpy( packagecpy, package ); -#endif - - // Call the ON_DESTROY method, that stores a reference (increasing the - // refcnt) if necessary - if( !stash ) - stash = gv_stashpv(package, TRUE); - gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); - int retval = 0; - if( gv ) { - PUSHMARK(SP); - int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); - SPAGAIN; - if (count != 1) { - if( withObject ) { - // Restore sv_this - SvREFCNT_dec(sv_this); - sv_this = old_this; - } - croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); - } - retval = POPi; - PUTBACK; - } - -#ifdef PERLQTDEBUG - if( do_debug && retval && (do_debug & qtdb_gc) ) - fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); - delete[] packagecpy; -#endif - - // Now clean up - if( withObject ) { - SvREFCNT_dec(sv_this); - sv_this = old_this; - } - } else { // We're calling a c++ method // Get the classId (eventually converting SUPER to the right Qt4 class) + if (super && strcmp( super, "SUPER" ) == 0) + package[strlen(package)-7] = 0; SV* moduleIdRef = package_classId( package ); Smoke::ModuleIndex mi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/src/util.h new/perlqt-4.11.90/qtcore/src/util.h --- old/perlqt-4.11.2/qtcore/src/util.h 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/src/util.h 2013-11-02 19:10:01.000000000 +0100 @@ -98,6 +98,7 @@ XS(XS_qvariant_value); XS(XS_qvariant_from_value); +XS(XS_DESTROY); XS(XS_AUTOLOAD); XS(XS_qt_metacall); XS(XS_signal); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/t/d_sigslot.t new/perlqt-4.11.90/qtcore/t/d_sigslot.t --- old/perlqt-4.11.2/qtcore/t/d_sigslot.t 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/t/d_sigslot.t 2013-11-02 19:10:01.000000000 +0100 @@ -30,7 +30,6 @@ emit signal( 5, 4 ); # 3) Emit a signal, but missing an argument. Should fail. - $DB::single=1; eval{ emit signalWithBadArg() }; like( $@, qr/Wrong number of arguments in signal call/, 'Missing arguments in signal' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtcore/t/qabstractitemmodel.t new/perlqt-4.11.90/qtcore/t/qabstractitemmodel.t --- old/perlqt-4.11.2/qtcore/t/qabstractitemmodel.t 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtcore/t/qabstractitemmodel.t 2013-11-02 19:10:01.000000000 +0100 @@ -4,7 +4,6 @@ use strict; use warnings; -use blib; use QtCore4; use QtCore4::isa qw( Qt::AbstractItemModel ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtdbus/src/CMakeLists.txt new/perlqt-4.11.90/qtdbus/src/CMakeLists.txt --- old/perlqt-4.11.2/qtdbus/src/CMakeLists.txt 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtdbus/src/CMakeLists.txt 2013-11-02 19:10:01.000000000 +0100 @@ -26,7 +26,8 @@ target_link_libraries(perl_qtdbus4 ${SMOKE_QTDBUS_LIBRARY} - perlqtcore4) + perlqtcore4 + ${QT_QTDBUS_LIBRARY}) set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4") set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtgui/examples/tools/customcompleter/TextEdit.pm new/perlqt-4.11.90/qtgui/examples/tools/customcompleter/TextEdit.pm --- old/perlqt-4.11.2/qtgui/examples/tools/customcompleter/TextEdit.pm 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtgui/examples/tools/customcompleter/TextEdit.pm 2013-11-02 19:10:01.000000000 +0100 @@ -61,7 +61,6 @@ return; } my $tc = textCursor(); - $DB::single=1; my $extra = length($completion) - length(c->completionPrefix()); $tc->movePosition(Qt::TextCursor::Left()); $tc->movePosition(Qt::TextCursor::EndOfWord()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtgui/examples/tools/settingseditor/VariantDelegate.pm new/perlqt-4.11.90/qtgui/examples/tools/settingseditor/VariantDelegate.pm --- old/perlqt-4.11.2/qtgui/examples/tools/settingseditor/VariantDelegate.pm 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtgui/examples/tools/settingseditor/VariantDelegate.pm 2013-11-02 19:10:01.000000000 +0100 @@ -197,7 +197,6 @@ } my $text = $lineEdit->text(); - $DB::single=1; my $validator = $lineEdit->validator(); if ($validator) { my $pos; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perlqt-4.11.2/qtgui/t/itemviewspuzzle.t new/perlqt-4.11.90/qtgui/t/itemviewspuzzle.t --- old/perlqt-4.11.2/qtgui/t/itemviewspuzzle.t 2013-06-28 19:16:25.000000000 +0200 +++ new/perlqt-4.11.90/qtgui/t/itemviewspuzzle.t 2013-11-02 19:10:01.000000000 +0100 @@ -85,8 +85,6 @@ Qt::Test::qWaitForWindowShown( $window ); this->{window} = $window; pass( 'Window shown' ); - $DB::single=1; - 1; } package main; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org