diff --git a/debian/changelog b/debian/changelog index dd432b419..c499a23ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ cmake (2.8.11-1) UNRELEASED; urgency=low * New upstream release. * Add multiarch-python-include-dirs.diff to support multi-arch capable python. Stolen from Ubuntu. + * FindQt4: define QT_IMPORTS_DIR variable even if it is not present on + the system (i.e. there are no plugins currently installed). Stolen + from Ubuntu. Patch qt_import_dir_variable.diff. -- Modestas Vainius Sun, 19 May 2013 12:12:26 +0300 diff --git a/debian/patches/qt_import_dir_variable.diff b/debian/patches/qt_import_dir_variable.diff new file mode 100644 index 000000000..2a44eef63 --- /dev/null +++ b/debian/patches/qt_import_dir_variable.diff @@ -0,0 +1,19 @@ +From: Jonathan Riddell +Subject: FindQt4: define QT_IMPORTS_DIR variable even if it is not present on the system. +Date: 2012-01-18 16:00:49 UTC +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805 +Origin: vendor + +This happens when there are no plugins currently installed. + +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -758,7 +758,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) + if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) + _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) + if(qt_imports_dir) +- set(QT_IMPORTS_DIR NOTFOUND) ++ set(QT_IMPORTS_DIR "${qt_imports_dir}") + foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) + set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") + endforeach() diff --git a/debian/patches/series b/debian/patches/series index 03bdad9a9..859daf873 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ FindBoost_add_-lpthread_#563479.diff multiarch_findgtk2_fix.diff install_to_multiarch_libdir_on_kfreebsd_hurd.diff multiarch-python-include-dirs.diff +qt_import_dir_variable.diff