Add patch to fix autogen with empty files (bug #1551147)
This commit is contained in:
parent
b6221b537f
commit
1769f1e84e
14
cmake-automoc.patch
Normal file
14
cmake-automoc.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -up cmake-3.10.2/Source/cmQtAutoGenerators.cxx.automoc cmake-3.10.2/Source/cmQtAutoGenerators.cxx
|
||||
--- cmake-3.10.2/Source/cmQtAutoGenerators.cxx.automoc 2018-01-18 07:48:42.000000000 -0700
|
||||
+++ cmake-3.10.2/Source/cmQtAutoGenerators.cxx 2018-03-08 21:09:50.451726324 -0700
|
||||
@@ -80,8 +80,8 @@ static bool ReadFile(std::string& conten
|
||||
std::size_t const length = cmSystemTools::FileLength(filename);
|
||||
cmsys::ifstream ifs(filename.c_str(), (std::ios::in | std::ios::binary));
|
||||
if (ifs) {
|
||||
- content.resize(length);
|
||||
- ifs.read(&content.front(), content.size());
|
||||
+ content.reserve(length);
|
||||
+ content.assign(std::istreambuf_iterator<char>{ifs}, {});
|
||||
if (ifs) {
|
||||
success = true;
|
||||
} else {
|
@ -96,6 +96,9 @@ Patch102: https://gitlab.kitware.com/cmake/cmake/merge_requests/1785.patc
|
||||
# Add dl to CMAKE_DL_LIBS on MINGW
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/17600
|
||||
Patch103: cmake-mingw-dl.patch
|
||||
# Fix autogen crash with empty files
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1551147
|
||||
Patch104: cmake-automoc.patch
|
||||
|
||||
# Patch for renaming on EPEL
|
||||
%if 0%{?name_suffix:1}
|
||||
@ -501,6 +504,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 8 2018 Orion Poplawski <orion@nwra.com> - 3.10.2-4
|
||||
- Add patch to fix autogen with empty files (bug #1551147)
|
||||
|
||||
* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 3.10.2-3
|
||||
- better Qt dependencies
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user