Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2012-12-03 09:32:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake", Maintainer is "vci...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2012-11-10 16:55:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2012-12-03 09:32:04.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 28 00:29:29 UTC 2012 - cgiboude...@gmx.com + +- Update to 2.8.10.2 + * Fix kitware#0013691: [Modules] FindGettext.cmake does not set GETTEXT_FOUND on success + * Fix kitware#0013702: [CMake] CMake crashes when reconfiguring build + * Fix kitware#0013667: [CMake] Automoc fails to handle Q_INTERFACES +- Drop obsolete patches + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2012-11-14 16:36:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2012-12-03 09:32:04.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 28 00:29:29 UTC 2012 - cgiboude...@gmx.com + +- Update to 2.8.10.2 + * Fix kitware#0013691: [Modules] FindGettext.cmake does not set GETTEXT_FOUND on success + * Fix kitware#0013702: [CMake] CMake crashes when reconfiguring build + * Fix kitware#0013667: [CMake] Automoc fails to handle Q_INTERFACES +- Drop obsolete patches + +------------------------------------------------------------------- +Mon Nov 26 19:56:15 UTC 2012 - tittiatc...@gmail.com + +- Add cmake-fix-qt-includes.diff to fix the missing qt_include_dir. + This was reported as cmake regression from 2.8.9 (kitware#0013667). + +------------------------------------------------------------------- Old: ---- cmake-2.8.10.1.tar.gz cmake-gettext.patch New: ---- cmake-2.8.10.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.Mu8Y1r/_old 2012-12-03 09:32:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Mu8Y1r/_new 2012-12-03 09:32:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: cmake-gui -Version: 2.8.10.1 +Version: 2.8.10.2 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.Mu8Y1r/_old 2012-12-03 09:32:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Mu8Y1r/_new 2012-12-03 09:32:05.000000000 +0100 @@ -17,13 +17,12 @@ Name: cmake -Version: 2.8.10.1 +Version: 2.8.10.2 Release: 0 Url: http://www.cmake.org/ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz Patch1: cmake-disable-builtin-chrpath.diff Patch2: cmake-fix-ruby-test.patch -Patch3: cmake-gettext.patch Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building @@ -52,7 +51,6 @@ %setup -q %patch1 %patch2 -%patch3 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" ++++++ cmake-2.8.10.1.tar.gz -> cmake-2.8.10.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/ChangeLog.manual new/cmake-2.8.10.2/ChangeLog.manual --- old/cmake-2.8.10.1/ChangeLog.manual 2012-11-06 20:41:35.000000000 +0100 +++ new/cmake-2.8.10.2/ChangeLog.manual 2012-11-27 14:26:32.000000000 +0100 @@ -1,3 +1,17 @@ +Changes in CMake 2.8.10.2 (since 2.8.10.1) +---------------------------------------------- +Alex Neundorf (1): + Automoc: fix regression #13667, broken build in phonon + +Brad King (1): + Initialize IMPORTED GLOBAL targets on reconfigure (#13702) + +David Cole (1): + CMake: Fix infinite loop untarring corrupt tar file + +Rolf Eike Beer (1): + FindGettext: fix overwriting result with empty variable (#13691) + Changes in CMake 2.8.10.1 (since 2.8.10) ---------------------------------------------- Brad King (5): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/Modules/FindGettext.cmake new/cmake-2.8.10.2/Modules/FindGettext.cmake --- old/cmake-2.8.10.1/Modules/FindGettext.cmake 2012-11-06 20:41:36.000000000 +0100 +++ new/cmake-2.8.10.2/Modules/FindGettext.cmake 2012-11-27 14:26:32.000000000 +0100 @@ -209,5 +209,3 @@ add_dependencies(pofiles ${uniqueTargetName}) endfunction() - -set(GETTEXT_FOUND ${Gettext_FOUND}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/Source/CMakeVersion.cmake new/cmake-2.8.10.2/Source/CMakeVersion.cmake --- old/cmake-2.8.10.1/Source/CMakeVersion.cmake 2012-11-06 20:41:36.000000000 +0100 +++ new/cmake-2.8.10.2/Source/CMakeVersion.cmake 2012-11-27 14:26:32.000000000 +0100 @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 10) -set(CMake_VERSION_TWEAK 1) +set(CMake_VERSION_TWEAK 2) #set(CMake_VERSION_RC 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/Source/cmGlobalGenerator.cxx new/cmake-2.8.10.2/Source/cmGlobalGenerator.cxx --- old/cmake-2.8.10.1/Source/cmGlobalGenerator.cxx 2012-11-06 20:41:36.000000000 +0100 +++ new/cmake-2.8.10.2/Source/cmGlobalGenerator.cxx 2012-11-27 14:26:33.000000000 +0100 @@ -828,6 +828,7 @@ this->LocalGenerators.clear(); this->TargetDependencies.clear(); this->TotalTargets.clear(); + this->ImportedTargets.clear(); this->LocalGeneratorToTargetMap.clear(); this->ProjectMap.clear(); this->RuleHashes.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/Source/cmQtAutomoc.cxx new/cmake-2.8.10.2/Source/cmQtAutomoc.cxx --- old/cmake-2.8.10.1/Source/cmQtAutomoc.cxx 2012-11-06 20:41:36.000000000 +0100 +++ new/cmake-2.8.10.2/Source/cmQtAutomoc.cxx 2012-11-27 14:26:33.000000000 +0100 @@ -195,6 +195,34 @@ } } + + const char* qtIncDir = 0; + const char* qtCoreIncDir = 0; + + // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs, + // see http://public.kitware.com/Bug/view.php?id=13667 + bool qtIncludeDirMayHaveBeenRemoved = false; + if (makefile->IsSet("QT_INCLUDE_DIR")) + { + qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR"); + std::string s = + makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES"); + std::vector<std::string> implIncDirs; + cmSystemTools::ExpandListArgument(s, implIncDirs); + if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir)) + != implIncDirs.end()) + { + qtIncludeDirMayHaveBeenRemoved = true; + if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR")) + { + qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR"); + } + } + } + + bool haveQtCoreIncDir = false; + bool haveQtIncDir = false; + std::vector<std::string> includeDirs; cmGeneratorTarget gtgt(target); localGen->GetIncludeDirectories(includeDirs, >gt, "CXX"); @@ -207,6 +235,37 @@ _moc_incs += sep; sep = ";"; _moc_incs += *incDirIt; + + if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667 + { + if (*incDirIt == qtIncDir) + { + haveQtIncDir = true; + qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed + } + if (*incDirIt == qtCoreIncDir) + { + haveQtCoreIncDir = true; + } + } + } + + // Some projects (kdelibs, phonon) query the compiler for its default + // include search dirs, and add those to + // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES. + // These may include e.g./usr/lib/qt/include . This is typically also part + // of ${QT_INCLUDES}. If this directory is then contained in the implicit + // include dirs, it is removed from the include dirs returned from the + // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected + // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't + // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think. + // See #13646 and #13667. + if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir + && (haveQtCoreIncDir == true) && (haveQtIncDir == false)) + { + _moc_incs += sep; + sep = ";"; + _moc_incs += qtIncDir; } const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cmake-2.8.10.1/Source/cmSystemTools.cxx new/cmake-2.8.10.2/Source/cmSystemTools.cxx --- old/cmake-2.8.10.1/Source/cmSystemTools.cxx 2012-11-06 20:41:36.000000000 +0100 +++ new/cmake-2.8.10.2/Source/cmSystemTools.cxx 2012-11-27 14:26:33.000000000 +0100 @@ -1932,6 +1932,7 @@ { cmSystemTools::Error("Problem with archive_read_next_header(): ", archive_error_string(a)); + break; } if (verbose && extract) { @@ -1954,6 +1955,7 @@ cmSystemTools::Error( "Problem with archive_write_disk_set_options(): ", archive_error_string(ext)); + break; } r = archive_write_header(ext, entry); @@ -1963,6 +1965,7 @@ archive_error_string(ext)); cmSystemTools::Error("Current file:", archive_entry_pathname(entry)); + break; } else { @@ -1972,6 +1975,7 @@ { cmSystemTools::Error("Problem with archive_write_finish_entry(): ", archive_error_string(ext)); + break; } } } @@ -1982,8 +1986,7 @@ } archive_read_close(a); archive_read_finish(a); - return true; - + return r == ARCHIVE_EOF || r == ARCHIVE_OK; } } #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
