diff options
Diffstat (limited to 'devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro')
| -rw-r--r-- | devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro b/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro index df93b1d2a583..a816c772302e 100644 --- a/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro +++ b/devel/qt5-linguisttools/files/patch-src_linguist_linguist.pro @@ -11,9 +11,17 @@ We chose the third option. To patch qmake's internal cmake generation function to fix up the paths so that cmake files still land in the the "correct" location in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. ---- src/linguist/linguist.pro.orig 2016-06-03 17:47:52 UTC +--- src/linguist/linguist.pro.orig 2019-02-06 13:19:48 UTC +++ src/linguist/linguist.pro -@@ -17,7 +17,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPa +@@ -9,7 +9,6 @@ SUBDIRS = \ + !no-png:qtHaveModule(widgets) { + QT_FOR_CONFIG += widgets + qtConfig(process):qtConfig(pushbutton):qtConfig(toolbutton) { +- SUBDIRS += linguist + } + } + +@@ -25,7 +24,7 @@ CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTA contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) @@ -22,7 +30,7 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) # We need to go up another two levels because the CMake files are # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -@@ -27,7 +27,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[Q +@@ -35,7 +34,7 @@ CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS } CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -31,11 +39,11 @@ in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ CMAKE_BIN_DIR_IS_ABSOLUTE = True } -@@ -45,6 +45,6 @@ cmake_linguist_macros_file.CONFIG = verb +@@ -53,6 +52,6 @@ cmake_linguist_macros_file.CONFIG = verbatim QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_config_version_file.output $$cmake_linguist_macros_file.output -cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools +cmake_linguist_tools_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5LinguistTools - cmake_linguist_tools_files.CONFIG = no_check_exists + cmake_linguist_tools_files.CONFIG = no_check_exist INSTALLS += cmake_linguist_tools_files |