Hello community, here is the log from the commit of package kdebindings4 for openSUSE:Factory checked in at Mon Oct 11 15:36:30 CEST 2010. -------- --- KDE/kdebindings4/kdebindings4.changes 2010-10-01 00:08:53.000000000 +0200 +++ kdebindings4/kdebindings4.changes 2010-10-11 09:34:54.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Oct 9 20:56:24 UTC 2010 - speilicke@novell.com + +- fix ruby-qt4-devel requirement on ruby-qt4 + +------------------------------------------------------------------- +Fri Oct 8 11:28:50 UTC 2010 - coolo@novell.com + +- add patch from fedora to fix crash in smokegen + +------------------------------------------------------------------- mono-kde4.changes: same change perl-kde4.changes: same change python-kde4.changes: same change ruby-kde4.changes: same change smoke-generator.changes: same change calling whatdependson for head-i586 New: ---- kdebindings-4.5.2-generator-invalid-reads.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings4.spec ++++++ --- /var/tmp/diff_new_pack.nfX0ks/_old 2010-10-11 15:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.nfX0ks/_new 2010-10-11 15:33:51.000000000 +0200 @@ -40,10 +40,11 @@ Summary: Smoke stand-alone generator for bindings for KDE 4.x libraries %endif Version: 4.5.2 -Release: 1 +Release: 2 Source0: kdebindings-%version.tar.bz2 Patch0: 4_5_BRANCH.diff Patch1: build-with-new-python-qt4.diff +Patch2: http://rdieter.fedorapeople.org/kdebindings/kdebindings-4.5.2-generator-inva... BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %is_base %define debug_package_requires libsmoke2 = %{version}-%{release} @@ -98,6 +99,7 @@ License: LGPLv2.1+ Group: Development/Libraries/KDE Summary: Development files for Qt4 libraries Ruby bindings +Requires: ruby-qt4 = %version %description -n ruby-qt4-devel @@ -150,6 +152,7 @@ %setup -q -n kdebindings-%version %patch0 -p0 %patch1 +%patch2 -p1 %build rm -rf xparts php mono-kde4.spec: same change perl-kde4.spec: same change python-kde4.spec: same change ruby-kde4.spec: same change smoke-generator.spec: same change ++++++ kdebindings-4.5.2-generator-invalid-reads.patch ++++++ diff -ur kdebindings-4.5.2/generator/parser/rpp/pp-macro-expander.cpp kdebindings-4.5.2-generator-invalid-reads/generator/parser/rpp/pp-macro-expander.cpp --- kdebindings-4.5.2/generator/parser/rpp/pp-macro-expander.cpp 2009-12-31 14:35:20.000000000 +0100 +++ kdebindings-4.5.2-generator-invalid-reads/generator/parser/rpp/pp-macro-expander.cpp 2010-10-07 17:10:57.000000000 +0200 @@ -268,10 +268,10 @@ output << '\"'; while (!is.atEnd()) { - if (input == '"') { + if (is == '"') { output << '\\' << is; - } else if (input == '\n') { + } else if (is == '\n') { output << '"' << is << '"'; } else { @@ -338,7 +338,7 @@ skip_blanks(input, devnull()); //Omit paste tokens behind empty used actuals, else we will merge with the previous text - if(input == '#' && (++input) == '#') { + if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') { ++input; //We have skipped a paste token }else{ diff -ur kdebindings-4.5.2/generator/type_compiler.cpp kdebindings-4.5.2-generator-invalid-reads/generator/type_compiler.cpp --- kdebindings-4.5.2/generator/type_compiler.cpp 2010-04-28 10:00:56.000000000 +0200 +++ kdebindings-4.5.2-generator-invalid-reads/generator/type_compiler.cpp 2010-10-07 17:11:33.000000000 +0200 @@ -182,7 +182,7 @@ TypeCompiler tc(m_session, m_visitor); tc.run(node->type_specifier, node->declarator); NameCompiler name_cc(m_session, m_visitor); - if (tc.type().isFunctionPointer()) + if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator) name_cc.run(node->declarator->sub_declarator->id); else if (node->declarator) name_cc.run(node->declarator->id); ++++++ kdebindings4.spec.in ++++++ --- /var/tmp/diff_new_pack.nfX0ks/_old 2010-10-11 15:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.nfX0ks/_new 2010-10-11 15:33:52.000000000 +0200 @@ -44,6 +44,7 @@ Source0: kdebindings-%version.tar.bz2 Patch0: 4_5_BRANCH.diff Patch1: build-with-new-python-qt4.diff +Patch2: http://rdieter.fedorapeople.org/kdebindings/kdebindings-4.5.2-generator-inva... BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %is_base %define debug_package_requires libsmoke2 = %{version}-%{release} @@ -94,6 +95,7 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Development files for Qt4 libraries Ruby bindings +Requires: ruby-qt4 = %version %description -n ruby-qt4-devel %endif @@ -143,6 +145,7 @@ %setup -q -n kdebindings-%version %patch0 -p0 %patch1 +%patch2 -p1 %build rm -rf xparts php ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org