Mercurial > vanilla

annotate qt/qtbase/patch-fhs.patch @ 969:436c5bafd54c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kde/kiconthemes: initial import, closes #1821
author David Demelier <markand@malikania.fr>
date Tue, 27 Aug 2019 21:40:00 +0200
parents e91fbcb3d1ef
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
766
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in.orig 2019-08-09 09:56:10.122995996 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ ./mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-08-09 09:56:42.942997004 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -3,30 +3,6 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 endif()
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
6
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 -!!ELSE
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 -get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 -# Use original install prefix when loaded through a
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 -# cross-prefix symbolic link such as /lib -> /usr/lib.
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 -get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 -get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 -if(_realCurr STREQUAL _realOrig)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 -else()
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 - get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 -endif()
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 -unset(_realOrig)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 -unset(_realCurr)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 -unset(_IMPORT_PREFIX)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 -!!ENDIF
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 -!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 -get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 -!!ELSE
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 -!!ENDIF
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 -
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 !!IF !equals(TEMPLATE, aux)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 --- qmake/generators/makefile.cpp.orig 2019-08-09 09:58:25.371000151 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 +++ qmake/generators/makefile.cpp 2019-08-09 10:00:19.407003654 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 @@ -3298,10 +3298,10 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 if(includeDir.isEmpty())
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 includeDir = prefix + "/include";
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
39
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 - t << "prefix=" << prefix << endl;
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 - t << "exec_prefix=${prefix}\n"
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 - << "libdir=" << pkgConfigFixPath(libDir) << "\n"
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 - << "includedir=" << pkgConfigFixPath(includeDir) << endl;
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 + t << "prefix=" << endl;
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 + t << "exec_prefix=\n"
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 + << "libdir=/lib\n"
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 + << "includedir=/include\n";
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 t << endl;
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
49
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 //extra PKGCONFIG variables