daaec2a925
* qt5-git: changed branch to "5.9". Very major changes to prepare and pkgver fuctions. Added prepare_build_folder and other helper functions. Copied code from qt5 and qt5-static packages. Renamed patch filenames to match qt5.8 or "-qt-5.6-" names. And, many formatting changes. * qt5-git: Added patch files. Added new patch files: 0001-qt-5.9.1-fix-sql-libraries-mingw.patch 0002-qt-5.8.1-configure-gcc-before-clang.patch 0007-qt-5.9.0-win32-g-Enable-static-builds.patch 0024-qt-5.9.2-icu-add-U_LIB_SUFFIX_C_NAME.patch 0051-qt-5.9.0-disable-qtlocation-mapboxgl-plugin.patch 0051-qt-5.9.1-disable-qtlocation-mapboxgl-plugin.patch And, from qt5 package added 0001-qt-5.8.0-fix-sql-libraries-mingw.patch 0002-qt-5.8.0-configure-gcc-before-clang.patch 0003-qt-5.8.0-autodetect-fontconfig.patch 0011-qt-5.8.0-mingw-dbus-and-pkg-config.patch 0016-qt-5.8.0-win32-g++-use-qpa-genericunixfontdatabase.patch 0020-qt-5.3.0-use-external-angle-library.patch 0023-qt-5.3.0-env-set-external-angle.patch 0025-qt-5.8.0-force-using-make-on-msys.patch 0028-qt-5.8.0-Revert-untangle-use-of-system-vs.-shell-path-list-se.patch 0029-qt-5.8.0-Revert-fix-quoting-and-path-separators-in-qtPrepareT.patch 0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch 0049-qt-5.8.0-win32-do-not-use-fontconfig.patch 0049-qt-5.9.0-win32-do-not-use-fontconfig.patch 0125-qt-5.8.0-windeployqt-fixes.patch 0125-qt-5.9.0-windeployqt-fixes.patch 0300-qt-5.8.0-cast-errors.patch * qt5-git: Rename patch files files. Renamed qt5-git 5.7 patch files to match the ones in the qt5 5.8 package; Or, renamed patch files with "-qt-5.6-" after seq. number. * qt5-git: Changed to pcre2 from pcre depends.
42 lines
2.3 KiB
Diff
42 lines
2.3 KiB
Diff
diff -urN --ignore-all-space a/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro b/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro
|
|
--- a/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro 2014-05-02 23:06:13.969569900 +0100
|
|
+++ b/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro 2014-05-02 23:06:33.470685300 +0100
|
|
@@ -41,14 +41,14 @@
|
|
$$ANGLE_DIR/src/compiler/preprocessor/Token.cpp
|
|
|
|
# NOTE: 'flex' and 'bison' can be found in qt5/gnuwin32/bin
|
|
-flex.commands = $$addGnuPath(flex) --noline --nounistd --outfile=${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
|
+flex.commands = flex --noline --nounistd --outfile=${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
|
flex.output = $${BUILDSUBDIR}${QMAKE_FILE_BASE}.cpp
|
|
flex.input = FLEX_SOURCES
|
|
flex.dependency_type = TYPE_C
|
|
flex.variable_out = GENERATED_SOURCES
|
|
QMAKE_EXTRA_COMPILERS += flex
|
|
|
|
-bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --output=${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
|
+bison.commands = bison --no-lines --skeleton=yacc.c --output=${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
|
bison.output = $${BUILDSUBDIR}${QMAKE_FILE_BASE}.cpp
|
|
bison.input = BISON_SOURCES
|
|
bison.dependency_type = TYPE_C
|
|
diff -urN --ignore-all-space a/qtbase/src/angle/src/compiler/translator.pro b/qtbase/src/angle/src/compiler/translator.pro
|
|
--- a/qtbase/src/angle/src/compiler/translator.pro 2014-05-02 23:06:13.969569900 +0100
|
|
+++ b/qtbase/src/angle/src/compiler/translator.pro 2014-05-02 23:06:33.467685100 +0100
|
|
@@ -163,15 +163,15 @@
|
|
|
|
|
|
# NOTE: 'flex' and 'bison' can be found in qt5/gnuwin32/bin
|
|
-flex.commands = $$addGnuPath(flex) --noline --nounistd --outfile=${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
|
|
+flex.commands = flex --noline --nounistd --outfile=${QMAKE_FILE_OUT}_lex.cpp ${QMAKE_FILE_NAME}
|
|
flex.output = $${BUILDSUBDIR}${QMAKE_FILE_BASE}_lex.cpp
|
|
flex.input = FLEX_SOURCES
|
|
flex.dependency_type = TYPE_C
|
|
flex.variable_out = GENERATED_SOURCES
|
|
QMAKE_EXTRA_COMPILERS += flex
|
|
|
|
defineReplace(myDirName) { return($$dirname(1)) }
|
|
-bison.commands = $$addGnuPath(bison) --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_OUT} \
|
|
+bison.commands = bison --no-lines --skeleton=yacc.c --defines=${QMAKE_FILE_OUT} \
|
|
--output=${QMAKE_FUNC_FILE_OUT_myDirName}$$QMAKE_DIR_SEP${QMAKE_FILE_OUT_BASE}.cpp \
|
|
${QMAKE_FILE_NAME}
|
|
bison.output = $${BUILDSUBDIR}${QMAKE_FILE_BASE}_tab.h
|
|
|