Drop qt_import_dir_variable.diff, not needed anymore.

ci/unstable
Felix Geyer 6 years ago
parent 12de5624a1
commit 33ec571d43

1
debian/changelog vendored

@ -2,6 +2,7 @@ cmake (3.12.1-1) UNRELEASED; urgency=medium
* New upstream release.
- Fixes FTBFS with recent version of libuv1. (Closes: #905140)
* Drop qt_import_dir_variable.diff, not needed anymore.
-- Felix Geyer <fgeyer@debian.org> Thu, 09 Aug 2018 18:07:18 +0200

@ -1,25 +0,0 @@
From: Jonathan Riddell <jriddell@ubuntu.com>
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: http://public.kitware.com/Bug/view.php?id=14155
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/894805
Forwarded: yes
Origin: vendor
This happens when there are no plugins currently installed.
---
Modules/FindQt4.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -736,7 +736,7 @@ if (QT_QMAKE_EXECUTABLE AND
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()

@ -1,3 +1,2 @@
FindBoost_add_-lpthread_#563479.diff
qt_import_dir_variable.diff
fix-ftbfs-on-kfreebsd.patch

Loading…
Cancel
Save