annotate src/qt-2-shared-tools-fixes.patch @ 6213:5f64fb928091 release

build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents 6303de54ff1b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3959
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
1 diff -ur qt-everywhere-opensource-src-4.8.7.orig/tools/linguist/shared/profileevaluator.cpp qt-everywhere-opensource-src-4.8.7/tools/linguist/shared/profileevaluator.cpp
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
2 --- qt-everywhere-opensource-src-4.8.7.orig/tools/linguist/shared/profileevaluator.cpp 2015-06-07 17:14:32.348070244 -0400
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
3 +++ qt-everywhere-opensource-src-4.8.7/tools/linguist/shared/profileevaluator.cpp 2015-06-07 17:16:43.792075123 -0400
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
4 @@ -65,7 +65,7 @@
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
5 #include <unistd.h>
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
6 #include <sys/utsname.h>
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
7 #else
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
8 -#include <Windows.h>
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
9 +#include <windows.h>
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
10 #endif
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
11 #include <stdio.h>
6303de54ff1b qt: add build of devel mingw tools moc, rcc, uic, lrelease for windows
John D
parents:
diff changeset
12 #include <stdlib.h>