Hello community, here is the log from the commit of package kdebindings-smokegen for openSUSE:Factory checked in at 2012-01-27 15:18:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings-smokegen (Old) and /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebindings-smokegen", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings-smokegen/kdebindings-smokegen.changes 2011-12-08 11:51:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebindings-smokegen.new/kdebindings-smokegen.changes 2012-01-27 15:20:26.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 21:01:11 CET 2012 - dmuel...@suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:35:39 CET 2012 - dmuel...@suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- smokegen-4.7.4.tar.bz2 smokegen-segfault.patch New: ---- smokegen-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings-smokegen.spec ++++++ --- /var/tmp/diff_new_pack.qbVAhT/_old 2012-01-27 15:20:27.000000000 +0100 +++ /var/tmp/diff_new_pack.qbVAhT/_new 2012-01-27 15:20:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebindings-smokegen # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # Name: kdebindings-smokegen -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Smoke Generator for kdebindings License: GPL-2.0 @@ -24,7 +24,6 @@ Url: https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen Source0: smokegen-%{version}.tar.bz2 Patch0: correct_naming.patch -Patch1: smokegen-segfault.patch BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libQtWebKit-devel @@ -39,6 +38,7 @@ %package -n libsmokegen-devel Summary: Development files for kdebindings-smokegen +Group: Development/Libraries/KDE Obsoletes: libsmoke-devel < %{version} Provides: libsmoke-devel = %{version} Requires: %{name} = %{version} @@ -54,7 +54,6 @@ %prep %setup -q -n smokegen-%{version} %patch0 -p0 -%patch1 %build %cmake_kde4 -d build ++++++ smokegen-4.7.4.tar.bz2 -> smokegen-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/AUTHORS new/smokegen-4.8.0/AUTHORS --- old/smokegen-4.7.4/AUTHORS 2011-08-22 15:23:15.000000000 +0200 +++ new/smokegen-4.8.0/AUTHORS 2011-07-27 20:36:46.000000000 +0200 @@ -1,2 +0,0 @@ -Arno Rehn <arno at arnorehn.de> - author -Richard Dale <richard.j.dale at gmail.com> - maintainer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/CMakeLists.txt new/smokegen-4.8.0/CMakeLists.txt --- old/smokegen-4.7.4/CMakeLists.txt 2011-08-22 15:23:15.000000000 +0200 +++ new/smokegen-4.8.0/CMakeLists.txt 2011-12-20 20:10:56.000000000 +0100 @@ -42,7 +42,13 @@ target_link_libraries(smokegen ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} cppparser) set_target_properties(smokegen PROPERTIES COMPILE_DEFINITIONS __GENERATOR_BUILDING ENABLE_EXPORTS TRUE) -install(TARGETS smokegen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +install(TARGETS smokegen LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(smokegen PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) install(FILES generatorenvironment.h generator_export.h generatorpreprocessor.h generatorvisitor.h name_compiler.h options.h type_compiler.h type.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/smokegen) install( FILES smoke.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include ) install( FILES smokegen_string.h DESTINATION ${CMAKE_INSTALL_PREFIX}/share/smokegen RENAME string.h ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/cmake/CMakeLists.txt new/smokegen-4.8.0/cmake/CMakeLists.txt --- old/smokegen-4.7.4/cmake/CMakeLists.txt 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/cmake/CMakeLists.txt 2011-12-20 20:10:56.000000000 +0100 @@ -1,9 +1,9 @@ set(SMOKE_LIBRARY_PREFIX ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(SMOKE_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include ${CMAKE_INSTALL_PREFIX}/include/smoke) set(SMOKE_CMAKE_MODULE_DIR ${CMAKE_INSTALL_PREFIX}/share/smoke/cmake) -set(SMOKE_GEN_BIN ${CMAKE_INSTALL_PREFIX}/bin/smokegen) +set(SMOKE_GEN_BIN ${CMAKE_INSTALL_PREFIX}/bin/smokegen${CMAKE_EXECUTABLE_SUFFIX}) set(SMOKE_GEN_SHARED ${CMAKE_INSTALL_PREFIX}/share/smokegen) -set(SMOKE_API_BIN ${CMAKE_INSTALL_PREFIX}/bin/smokeapi) +set(SMOKE_API_BIN ${CMAKE_INSTALL_PREFIX}/bin/smokeapi${CMAKE_EXECUTABLE_SUFFIX}) set(SMOKE_GENERATOR_SMOKE_LIB ${LIB_INSTALL_DIR}/smokegen/generator_smoke) set(SMOKE_GENERATOR_DUMP_LIB ${LIB_INSTALL_DIR}/smokegen/generator_dump) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/cmake/COPYING-CMAKE-SCRIPTS new/smokegen-4.8.0/cmake/COPYING-CMAKE-SCRIPTS --- old/smokegen-4.7.4/cmake/COPYING-CMAKE-SCRIPTS 2011-07-19 23:34:06.000000000 +0200 +++ new/smokegen-4.8.0/cmake/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/cmake/SmokeConfig.cmake.in new/smokegen-4.8.0/cmake/SmokeConfig.cmake.in --- old/smokegen-4.7.4/cmake/SmokeConfig.cmake.in 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/cmake/SmokeConfig.cmake.in 2011-12-20 20:10:56.000000000 +0100 @@ -48,10 +48,18 @@ PATH ${SMOKE_INCLUDE_DIR} NO_DEFAULT_PATH ) - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} - PATHS @SMOKE_LIBRARY_PREFIX@ - NO_DEFAULT_PATH) + if(WIN32) + # DLLs are in the bin directory. + find_library(SMOKE_${uppercase}_LIBRARY + smoke${lowercase} + PATHS "@CMAKE_INSTALL_PREFIX@/bin" + NO_DEFAULT_PATH) + else(WIN32) + find_library(SMOKE_${uppercase}_LIBRARY + smoke${lowercase} + PATHS "@SMOKE_LIBRARY_PREFIX@" + NO_DEFAULT_PATH) + endif(WIN32) if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY) if (Smoke_FIND_REQUIRED) @@ -71,17 +79,17 @@ ################ # find smoke.h # ################ -set(SMOKE_INCLUDE_DIR @SMOKE_INCLUDE_DIR@) -set(SMOKE_CMAKE_MODULE_DIR @SMOKE_CMAKE_MODULE_DIR@) -set(SMOKE_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@) -set(SMOKE_GENERATOR_SMOKE_LIB @SMOKE_GENERATOR_SMOKE_LIB@) -set(SMOKE_GENERATOR_DUMP_LIB @SMOKE_GENERATOR_DUMP_LIB@) -set(SMOKE_GEN_BIN @SMOKE_GEN_BIN@) -set(SMOKE_GEN_SHARED @SMOKE_GEN_SHARED@) -set(SMOKE_API_BIN @SMOKE_API_BIN@) +set(SMOKE_INCLUDE_DIR "@SMOKE_INCLUDE_DIR@") +set(SMOKE_CMAKE_MODULE_DIR "@SMOKE_CMAKE_MODULE_DIR@") +set(SMOKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") +set(SMOKE_GENERATOR_SMOKE_LIB "@SMOKE_GENERATOR_SMOKE_LIB@") +set(SMOKE_GENERATOR_DUMP_LIB "@SMOKE_GENERATOR_DUMP_LIB@") +set(SMOKE_GEN_BIN "@SMOKE_GEN_BIN@") +set(SMOKE_GEN_SHARED "@SMOKE_GEN_SHARED@") +set(SMOKE_API_BIN "@SMOKE_API_BIN@") find_library(SMOKE_BASE_LIBRARY smokebase - PATHS @SMOKE_LIBRARY_PREFIX@ + PATHS "@SMOKE_LIBRARY_PREFIX@" NO_DEFAULT_PATH) if (NOT SMOKE_BASE_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/generators/smoke/globals.h new/smokegen-4.8.0/generators/smoke/globals.h --- old/smokegen-4.7.4/generators/smoke/globals.h 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/generators/smoke/globals.h 2011-08-22 15:30:09.000000000 +0200 @@ -127,7 +127,9 @@ static QChar munge(const Type *type); static QString mungedName(const Method&); - + + static Type* normalizeType(const Type* type); + static QString stackItemField(const Type* type); static QString assignmentString(const Type* type, const QString& var); static QList<const Method*> collectVirtualMethods(const Class* klass); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/generators/smoke/helpers.cpp new/smokegen-4.8.0/generators/smoke/helpers.cpp --- old/smokegen-4.7.4/generators/smoke/helpers.cpp 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/generators/smoke/helpers.cpp 2011-08-22 15:30:09.000000000 +0200 @@ -191,8 +191,13 @@ } addOverloads(m); (*usedTypes) << m.type(); - foreach (const Parameter& param, m.parameters()) + foreach (const Parameter& param, m.parameters()) { (*usedTypes) << param.type(); + + if (m.isSlot() || m.isSignal() || m.isQPropertyAccessor()) { + (*usedTypes) << Util::normalizeType(param.type()); + } + } } foreach (const Field& f, klass.fields()) { if (f.access() == Access_private) @@ -490,6 +495,20 @@ return ret; } +Type* Util::normalizeType(const Type* type) { + Type normalizedType = *type; + if (normalizedType.isConst() && normalizedType.isRef()) { + normalizedType.setIsConst(false); + normalizedType.setIsRef(false); + } + + if (normalizedType.pointerDepth() == 0) { + normalizedType.setIsConst(false); + } + + return Type::registerType(normalizedType); +} + QString Util::stackItemField(const Type* type) { if (type->getTypedef()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/generators/smoke/writeSmokeDataFile.cpp new/smokegen-4.8.0/generators/smoke/writeSmokeDataFile.cpp --- old/smokegen-4.7.4/generators/smoke/writeSmokeDataFile.cpp 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/generators/smoke/writeSmokeDataFile.cpp 2011-08-22 15:30:09.000000000 +0200 @@ -59,6 +59,9 @@ usedTypes << meth->type(); foreach (const Parameter& param, meth->parameters()) { usedTypes << param.type(); + if (meth->isSlot() || meth->isSignal() || meth->isQPropertyAccessor()) { + usedTypes << Util::normalizeType(param.type()); + } } declaredVirtualMethods[meth->getClass()] << meth; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/parser/CMakeLists.txt new/smokegen-4.8.0/parser/CMakeLists.txt --- old/smokegen-4.7.4/parser/CMakeLists.txt 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/parser/CMakeLists.txt 2011-12-20 20:10:56.000000000 +0100 @@ -38,4 +38,10 @@ add_library(cppparser SHARED ${cppparser_LIB_SRCS}) target_link_libraries(cppparser ${QT_QTCORE_LIBRARY}) -install(TARGETS cppparser LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS cppparser LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(cppparser PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/smokebase/CMakeLists.txt new/smokegen-4.8.0/smokebase/CMakeLists.txt --- old/smokegen-4.7.4/smokebase/CMakeLists.txt 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/smokebase/CMakeLists.txt 2011-12-20 20:10:56.000000000 +0100 @@ -18,5 +18,11 @@ ${SMOKE_VERSION_PATCH} ) -install(TARGETS smokebase DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) +install(TARGETS smokebase LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION bin) +if (WIN32) + # Get rid of the "lib" prefix on archives/DLLs in Windows. + set_target_properties(smokebase PROPERTIES PREFIX "" IMPORT_PREFIX "") +endif (WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SmokeVersionConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/smoke/cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smokegen-4.7.4/type_compiler.cpp new/smokegen-4.8.0/type_compiler.cpp --- old/smokegen-4.7.4/type_compiler.cpp 2011-05-20 22:33:31.000000000 +0200 +++ new/smokegen-4.8.0/type_compiler.cpp 2011-12-07 16:37:32.000000000 +0100 @@ -191,6 +191,8 @@ void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) { + if ( ! m_session->token_stream ) return; + if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { QPair<bool, bool> cv = m_visitor->parseCv(node->cv); pointerDepth.append(cv.first); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org