Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2015-02-16 15:24:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2015-02-11
16:31:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2015-02-16
17:23:13.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 13 06:56:18 UTC 2015 - f...@grueninger.de
+
+- Update to 3.1.3
+ Do not call setlocale() globally in CMake applications (#15377)
+ Add setlocale() calls around use of libarchive APIs (#14934, #15377)
+ Makefile: Fix regression in target-bound custom command COMMENT output
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2015-02-11
16:31:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2015-02-16
17:23:13.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 13 06:55:20 UTC 2015 - f...@grueninger.de
+
+- Update to 3.1.3
+ Do not call setlocale() globally in CMake applications (#15377)
+ Add setlocale() calls around use of libarchive APIs (#14934, #15377)
+ Makefile: Fix regression in target-bound custom command COMMENT output
+
+-------------------------------------------------------------------
Old:
----
cmake-3.1.2.tar.gz
New:
----
cmake-3.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake-gui.spec ++++++
--- /var/tmp/diff_new_pack.KtgGg0/_old 2015-02-16 17:23:14.000000000 +0100
+++ /var/tmp/diff_new_pack.KtgGg0/_new 2015-02-16 17:23:14.000000000 +0100
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 3.1.2
+Version: 3.1.3
Release: 0
%define rversion %{version}
Summary: CMake graphical user interface
cmake.spec: same change
++++++ cmake-3.1.2.tar.gz -> cmake-3.1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/CMakeLists.txt
new/cmake-3.1.3/Source/CMakeLists.txt
--- old/cmake-3.1.2/Source/CMakeLists.txt 2015-02-04 21:36:43.000000000
+0100
+++ new/cmake-3.1.3/Source/CMakeLists.txt 2015-02-11 17:17:39.000000000
+0100
@@ -261,6 +261,7 @@
cmLocalGenerator.cxx
cmLocalGenerator.h
cmLocalUnixMakefileGenerator3.cxx
+ cmLocale.h
cmMakeDepend.cxx
cmMakeDepend.h
cmMakefile.cxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/CMakeVersion.cmake
new/cmake-3.1.3/Source/CMakeVersion.cmake
--- old/cmake-3.1.2/Source/CMakeVersion.cmake 2015-02-04 21:36:43.000000000
+0100
+++ new/cmake-3.1.3/Source/CMakeVersion.cmake 2015-02-11 17:17:39.000000000
+0100
@@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 2)
+set(CMake_VERSION_PATCH 3)
#set(CMake_VERSION_RC 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/CPack/cpack.cxx
new/cmake-3.1.3/Source/CPack/cpack.cxx
--- old/cmake-3.1.2/Source/CPack/cpack.cxx 2015-02-04 21:36:43.000000000
+0100
+++ new/cmake-3.1.3/Source/CPack/cpack.cxx 2015-02-11 17:17:39.000000000
+0100
@@ -26,7 +26,6 @@
#include <cmsys/CommandLineArguments.hxx>
#include <cmsys/SystemTools.hxx>
#include <cmsys/Encoding.hxx>
-#include <locale.h>
//----------------------------------------------------------------------------
static const char * cmDocumentationName[][2] =
@@ -101,7 +100,6 @@
// this is CPack.
int main (int argc, char const* const* argv)
{
- setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = args.argc();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/CursesDialog/ccmake.cxx
new/cmake-3.1.3/Source/CursesDialog/ccmake.cxx
--- old/cmake-3.1.2/Source/CursesDialog/ccmake.cxx 2015-02-04
21:36:43.000000000 +0100
+++ new/cmake-3.1.3/Source/CursesDialog/ccmake.cxx 2015-02-11
17:17:39.000000000 +0100
@@ -16,7 +16,6 @@
#include <signal.h>
#include <sys/ioctl.h>
-#include <locale.h>
#include "cmCursesMainForm.h"
#include "cmCursesStandardIncludes.h"
@@ -95,8 +94,6 @@
int main(int argc, char const* const* argv)
{
- setlocale(LC_CTYPE, "");
-
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/cmArchiveWrite.cxx
new/cmake-3.1.3/Source/cmArchiveWrite.cxx
--- old/cmake-3.1.2/Source/cmArchiveWrite.cxx 2015-02-04 21:36:43.000000000
+0100
+++ new/cmake-3.1.3/Source/cmArchiveWrite.cxx 2015-02-11 17:17:39.000000000
+0100
@@ -12,6 +12,7 @@
#include "cmArchiveWrite.h"
#include "cmSystemTools.h"
+#include "cmLocale.h"
#include <cmsys/ios/iostream>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
@@ -259,6 +260,9 @@
}
const char* out = file + skip;
+ cmLocaleRAII localeRAII;
+ static_cast<void>(localeRAII);
+
// Meta-data.
std::string dest = prefix? prefix : "";
dest += out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/cmLocalUnixMakefileGenerator3.cxx
new/cmake-3.1.3/Source/cmLocalUnixMakefileGenerator3.cxx
--- old/cmake-3.1.2/Source/cmLocalUnixMakefileGenerator3.cxx 2015-02-04
21:36:43.000000000 +0100
+++ new/cmake-3.1.3/Source/cmLocalUnixMakefileGenerator3.cxx 2015-02-11
17:17:39.000000000 +0100
@@ -1076,7 +1076,7 @@
if(echo_comment)
{
const char* comment = ccg.GetComment();
- if(comment && !*comment)
+ if(comment && *comment)
{
this->AppendEcho(commands, comment,
cmLocalUnixMakefileGenerator3::EchoGenerate);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/cmLocale.h
new/cmake-3.1.3/Source/cmLocale.h
--- old/cmake-3.1.2/Source/cmLocale.h 1970-01-01 01:00:00.000000000 +0100
+++ new/cmake-3.1.3/Source/cmLocale.h 2015-02-11 17:17:39.000000000 +0100
@@ -0,0 +1,31 @@
+/*============================================================================
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2015 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+============================================================================*/
+#ifndef cmLocale_h
+#define cmLocale_h
+
+#include <locale.h>
+
+class cmLocaleRAII
+{
+ const char* OldLocale;
+public:
+ cmLocaleRAII(): OldLocale(setlocale(LC_CTYPE, 0))
+ {
+ setlocale(LC_CTYPE, "");
+ }
+ ~cmLocaleRAII()
+ {
+ setlocale(LC_CTYPE, this->OldLocale);
+ }
+};
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/cmSystemTools.cxx
new/cmake-3.1.3/Source/cmSystemTools.cxx
--- old/cmake-3.1.2/Source/cmSystemTools.cxx 2015-02-04 21:36:43.000000000
+0100
+++ new/cmake-3.1.3/Source/cmSystemTools.cxx 2015-02-11 17:17:39.000000000
+0100
@@ -28,6 +28,7 @@
#include <cmsys/Encoding.hxx>
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmArchiveWrite.h"
+# include "cmLocale.h"
# include <cm_libarchive.h>
# include <cmsys/Terminal.h>
#endif
@@ -1691,6 +1692,8 @@
bool extract_tar(const char* outFileName, bool verbose,
bool extract)
{
+ cmLocaleRAII localeRAII;
+ static_cast<void>(localeRAII);
struct archive* a = archive_read_new();
struct archive *ext = archive_write_disk_new();
archive_read_support_compression_all(a);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/cmakemain.cxx
new/cmake-3.1.3/Source/cmakemain.cxx
--- old/cmake-3.1.2/Source/cmakemain.cxx 2015-02-04 21:36:44.000000000
+0100
+++ new/cmake-3.1.3/Source/cmakemain.cxx 2015-02-11 17:17:39.000000000
+0100
@@ -25,7 +25,6 @@
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include <cmsys/Encoding.hxx>
-#include <locale.h>
#ifdef CMAKE_BUILD_WITH_CMAKE
//----------------------------------------------------------------------------
@@ -175,7 +174,6 @@
int main(int ac, char const* const* av)
{
- setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
ac = args.argc();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Source/ctest.cxx
new/cmake-3.1.3/Source/ctest.cxx
--- old/cmake-3.1.2/Source/ctest.cxx 2015-02-04 21:36:44.000000000 +0100
+++ new/cmake-3.1.3/Source/ctest.cxx 2015-02-11 17:17:39.000000000 +0100
@@ -19,7 +19,6 @@
#include "CTest/cmCTestScriptHandler.h"
#include "CTest/cmCTestLaunch.h"
#include "cmsys/Encoding.hxx"
-#include <locale.h>
//----------------------------------------------------------------------------
static const char * cmDocumentationName[][2] =
@@ -117,8 +116,6 @@
// this is a test driver program for cmCTest.
int main (int argc, char const* const* argv)
{
- setlocale(LC_CTYPE, "");
-
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
argc = encoding_args.argc();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cmake-3.1.2/Tests/CTestTestMemcheck/memtester.cxx.in
new/cmake-3.1.3/Tests/CTestTestMemcheck/memtester.cxx.in
--- old/cmake-3.1.2/Tests/CTestTestMemcheck/memtester.cxx.in 2015-02-04
21:36:44.000000000 +0100
+++ new/cmake-3.1.3/Tests/CTestTestMemcheck/memtester.cxx.in 2015-02-11
17:17:39.000000000 +0100
@@ -1,14 +1,12 @@
#include <cmSystemTools.h>
#include <cmsys/Encoding.hxx>
#include <string>
-#include <locale.h>
#define RETVAL @_retval@
int
main(int ac, char **av)
{
- setlocale(LC_CTYPE, "");
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(ac, av);
int argc = args.argc();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
