diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:30:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:31:02 +0200 |
| commit | 9010047840d810d9ccba3d00b7943a842e125291 (patch) | |
| tree | 7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff | |
| parent | b4f5663d87c16e08aaef66346f4b22eba2de80bd (diff) | |
| download | tde-packaging-r14.0.5.tar.gz tde-packaging-r14.0.5.zip | |
FreeBSD: Update for final release R14.0.5r14.0.5
Additional patches due to stricter C++11 in Clang
A new mkspec for Clang is used to build TQt
Akode is now part of the TDE repository
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff')
| -rw-r--r-- | freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff new file mode 100644 index 000000000..5764d9f98 --- /dev/null +++ b/freebsd/dependencies/tqt3/files/patch-bp000-fix-ftbfs-on-c++11.diff @@ -0,0 +1,38 @@ +diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h +index f4fb7d78..135e6b81 100644 +--- a/src/kernel/ntqgplugin.h ++++ b/src/kernel/ntqgplugin.h +@@ -81,10 +81,10 @@ + #ifndef Q_PLUGIN_VERIFICATION_DATA + # define Q_PLUGIN_VERIFICATION_DATA \ + static const char *qt_ucm_verification_data = \ +- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ +- "version="TQT_VERSION_STR"\n" \ +- "flags="Q_PLUGIN_FLAGS_STRING"\n" \ +- "buildkey="TQT_BUILD_KEY"\0"; ++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ ++ "version=" TQT_VERSION_STR "\n" \ ++ "flags=" Q_PLUGIN_FLAGS_STRING "\n" \ ++ "buildkey=" TQT_BUILD_KEY "\0"; + #endif // Q_PLUGIN_VERIFICATION_DATA + + #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ +diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h +index d59017ca..f3338ca0 100644 +--- a/src/tools/qcom_p.h ++++ b/src/tools/qcom_p.h +@@ -296,10 +296,10 @@ public: \ + #ifndef Q_UCM_VERIFICATION_DATA + # define Q_UCM_VERIFICATION_DATA \ + static const char *qt_ucm_verification_data = \ +- "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ +- "version="TQT_VERSION_STR"\n" \ +- "flags="Q_UCM_FLAGS_STRING"\n" \ +- "buildkey="TQT_BUILD_KEY"\0"; ++ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ ++ "version=" TQT_VERSION_STR "\n" \ ++ "flags=" Q_UCM_FLAGS_STRING "\n" \ ++ "buildkey=" TQT_BUILD_KEY "\0"; + #endif // Q_UCM_VERIFICATION_DATA + + // This macro expands to the default implementation of ucm_instantiate. |