lrelease-qt4 tries to run qmake not qmake-qt4 (#820767)
This commit is contained in:
parent
cdf70082aa
commit
d8c792b4fc
24
qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
Normal file
24
qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp
|
||||||
|
--- qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp 2012-05-11 08:58:12.902149676 -0500
|
||||||
|
@@ -316,7 +316,7 @@ int main(int argc, char **argv)
|
||||||
|
#ifdef QT_BOOTSTRAPPED
|
||||||
|
option.initProperties(binDir + QLatin1String("/qmake"));
|
||||||
|
#else
|
||||||
|
- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
|
||||||
|
+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
|
||||||
|
#endif
|
||||||
|
ProFileParser parser(0, &parseHandler);
|
||||||
|
ProFileEvaluator visitor(&option, &parser, &evalHandler);
|
||||||
|
diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp
|
||||||
|
--- qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp 2012-05-11 09:02:47.393718054 -0500
|
||||||
|
@@ -765,7 +765,7 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
|
parseHandler.verbose = evalHandler.verbose = !!(options & Verbose);
|
||||||
|
ProFileOption option;
|
||||||
|
- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
|
||||||
|
+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
|
||||||
|
option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run"));
|
||||||
|
ProFileParser parser(0, &parseHandler);
|
||||||
|
|
9
qt.spec
9
qt.spec
@ -16,7 +16,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.1
|
Version: 4.8.1
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
@ -55,6 +55,9 @@ Patch24: qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch
|
|||||||
# (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
|
# (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
|
||||||
Patch25: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
|
Patch25: qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch
|
||||||
|
|
||||||
|
# lrelease-qt4 tries to run qmake not qmake-qt4 (http://bugzilla.redhat.com/820767)
|
||||||
|
Patch26: qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
|
||||||
|
|
||||||
## upstreamable bits
|
## upstreamable bits
|
||||||
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
||||||
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
||||||
@ -432,6 +435,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
|||||||
%patch23 -p1 -b .glib_eventloop_nullcheck
|
%patch23 -p1 -b .glib_eventloop_nullcheck
|
||||||
%patch24 -p1 -b .moc-boost148
|
%patch24 -p1 -b .moc-boost148
|
||||||
%patch25 -p1 -b .qdbusconnection_no_debug.patch
|
%patch25 -p1 -b .qdbusconnection_no_debug.patch
|
||||||
|
%patch26 -p1 -b .linguist_qtmake-qt4
|
||||||
## TODO: still worth carrying? if so, upstream it.
|
## TODO: still worth carrying? if so, upstream it.
|
||||||
%patch53 -p1 -b .qatomic-inline-asm
|
%patch53 -p1 -b .qatomic-inline-asm
|
||||||
## TODO: upstream me
|
## TODO: upstream me
|
||||||
@ -1092,6 +1096,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 11 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-11
|
||||||
|
- lrelease-qt4 tries to run qmake not qmake-qt4 (#820767)
|
||||||
|
|
||||||
* Thu May 10 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-10
|
* Thu May 10 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-10
|
||||||
- Requires: qt-settings (f17+)
|
- Requires: qt-settings (f17+)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user