mirror of
https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares
synced 2025-04-02 13:51:18 +00:00
0002-Add-patch-to-compile-with-pythonQt.patch is no longer needed in favor of a better upstream solution.
This commit is contained in:
parent
bb374c8578
commit
0302600c8e
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -3,6 +3,8 @@ calamares (3.2.2-0ubuntu1) UNRELEASED; urgency=medium
|
||||
* New upstream release.
|
||||
* Remove the reverse-applicable fix-defaultde-variable.patch.
|
||||
* Bump Standards-version to 4.2.1, no changes needed.
|
||||
* 0002-Add-patch-to-compile-with-pythonQt.patch is no longer needed in
|
||||
favor of a better upstream solution.
|
||||
|
||||
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 04 Sep 2018 16:38:57 -0500
|
||||
|
||||
|
@ -1,30 +0,0 @@
|
||||
From: Raul Rodrigo Segura <raurodse@gmail.com>
|
||||
Date: Thu, 14 Jun 2018 23:21:30 +0200
|
||||
Subject: Add patch to compile with pythonQt
|
||||
|
||||
---
|
||||
CMakeModules/FindPythonQt.cmake | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeModules/FindPythonQt.cmake b/CMakeModules/FindPythonQt.cmake
|
||||
index f0f4b8a..23e61d3 100644
|
||||
--- a/CMakeModules/FindPythonQt.cmake
|
||||
+++ b/CMakeModules/FindPythonQt.cmake
|
||||
@@ -24,7 +24,7 @@ string(REGEX REPLACE
|
||||
)
|
||||
|
||||
if(NOT EXISTS "${PYTHONQT_INSTALL_DIR}")
|
||||
- find_path(PYTHONQT_INSTALL_DIR include/PythonQt/PythonQt.h DOC "Directory where PythonQt was installed.")
|
||||
+ find_path(PYTHONQT_INSTALL_DIR include/PythonQt5/PythonQt.h DOC "Directory where PythonQt was installed.")
|
||||
endif()
|
||||
# XXX Since PythonQt 3.0 is not yet cmakeified, depending
|
||||
# on how PythonQt is built, headers will not always be
|
||||
@@ -32,7 +32,7 @@ endif()
|
||||
# is added as an option. See [1] for more details.
|
||||
# [1] https://github.com/commontk/CTK/pull/538#issuecomment-86106367
|
||||
find_path(PYTHONQT_INCLUDE_DIR PythonQt.h
|
||||
- PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt"
|
||||
+ PATHS "${PYTHONQT_INSTALL_DIR}/include/PythonQt5"
|
||||
"${PYTHONQT_INSTALL_DIR}/src"
|
||||
DOC "Path to the PythonQt include directory")
|
||||
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,4 +1,3 @@
|
||||
0001-replace-pkexec-by-sudo.patch
|
||||
0002-Add-patch-to-compile-with-pythonQt.patch
|
||||
0003-remove-wrong-path.patch
|
||||
apport-package-hook.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user