[SCM] qtbase packaging branch, master, updated. debian/5.1.1+dfsg-1-5-gb7584ca
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Fri Aug 30 15:13:54 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b7584ca
The following commit has been merged in the master branch:
commit b7584cade31bb1ff7c85e2d40b1bf0e23991d085
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Aug 30 12:13:25 2013 -0300
Add an upstream patch to solve wrong paths using CMake.
---
debian/changelog | 6 ++-
..._workaround_in_the_presence_of_multi-arch.patch | 50 ++++++++++++++++++++
debian/patches/series | 3 +-
.../workaround_other_distros_workaround.patch | 25 ----------
4 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3f38834..7c69e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
qtbase-opensource-src (5.1.1+dfsg-2) UNRELEASED; urgency=low
[ Lisandro Damián Nicanor Pérez Meyer ]
- * Add workaround_other_distros_workaround.patch as a Debian-specific patch to
- workaround a workaround for other distros (Closes: #721176).
+ * Add upstream patch
+ fix_usr-move_workaround_in_the_presence_of_multi-arch.patch to solve
+ a CMake paths issue that involved a workaround for other distros
+ (Closes: #721176).
* Update symbols files with symbols from other archs.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 28 Aug 2013 16:12:34 -0300
diff --git a/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch b/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
new file mode 100644
index 0000000..4e186db
--- /dev/null
+++ b/debian/patches/fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
@@ -0,0 +1,50 @@
+From 9910e152f3ba683986af8f063b9f6874c728e1e0 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <stephen.kelly at kdab.com>
+Date: Fri, 30 Aug 2013 16:09:06 +0200
+Subject: [PATCH] Fix usr-move workaround in the presence of multi-arch.
+
+The cmake directory may not be $PREFIX/lib/cmake, but
+instead $PREFIX/lib/<arch>/cmake. Getting the PATH of such a
+directory will not lead us to $PREFIX/, but to $PREFIX/lib.
+
+Use a relative calculation instead.
+
+Change-Id: Ice4e0f859ab1df238bad4eb942f073e84dd86cc3
+---
+ mkspecs/features/create_cmake.prf | 4 ++--
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
+index d8bef46..c52d804 100644
+--- a/mkspecs/features/create_cmake.prf
++++ b/mkspecs/features/create_cmake.prf
+@@ -37,10 +37,10 @@ contains(CMAKE_LIB_DIR,"^\.\./.*") {
+ CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
+ CMAKE_LIB_DIR_IS_ABSOLUTE = True
+ } else {
+- CMAKE_RELATIVE_INSTALL_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
++ 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}
+- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_DIR}../../"
++ CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
+ }
+
+ CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 2ffb980..5ae3f74 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -13,7 +13,7 @@ get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
+ get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
+ get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
+ if(_realCurr STREQUAL _realOrig)
+- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR\" PATH)
++ get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
+ else()
+ get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
+ endif()
+--
+1.8.4.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
index 3d12213..5a46304 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
sha3_64bit_BE.diff
linux_no_perf.diff
+fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
# Debian specific.
-workaround_other_distros_workaround.patch
-
diff --git a/debian/patches/workaround_other_distros_workaround.patch b/debian/patches/workaround_other_distros_workaround.patch
deleted file mode 100644
index 0dc92ad..0000000
--- a/debian/patches/workaround_other_distros_workaround.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: worksaround a workaround done for other distros
- Upstream ships a workaround for other distros's paths that Debian
- doesn't have. This turned out to break CMake support in multiarch systems.
- This patch simply comments out the line that tries to detect the need of
- the workaround.
- .
- This patch should be considered Debian-only and a hack. A proper fix like
- detecting multi archs paths with ${CMAKE_LIBRARY_ARCHITECTURE} should be
- used instead.
-Bug: https://bugreports.qt-project.org/browse/QTBUG-33223
-Forwarded: not-needed
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -28,7 +28,8 @@ CMAKE_PARTIAL_MODULE_DEPS = $$replace(CM
- # that to an absolute path. This is only done for installations to
- # the /usr or / prefix.
- CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS])
--contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
-+# Workaround Qt BUG https://bugreports.qt-project.org/browse/QTBUG-33223
-+#contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
-
- CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
- contains(CMAKE_INCLUDE_DIR, "^\.\./.*") {
--
qtbase packaging
More information about the pkg-kde-commits
mailing list