From d387f1b70e131b41ddfc6159f7a6e7ef457be525 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Wed, 8 Jun 2011 00:11:29 +0300 Subject: [PATCH] Make FindGTK2.cmake work with Debian multiarch. Implemented in the patch multiarch_findgtk2_fix.diff. (LP: #751940) --- debian/changelog | 2 ++ debian/patches/multiarch_findgtk2_fix.diff | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/multiarch_findgtk2_fix.diff diff --git a/debian/changelog b/debian/changelog index c12f93466..55cfb13d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ cmake (2.8.4+dfsg.1-3) UNRELEASED; urgency=low job in majority of cases. Also require dpkg-dev >= 1.16 at both build time (Build-Depends) and runtime (cmake Depends) because the patch needs dpkg-architecture -qDEB_HOST_MULTIARCH. (Closes: #618932) + * Make FindGTK2.cmake work with Debian multiarch + (patch multiarch_findgtk2_fix.diff). (LP: #751940) -- Modestas Vainius Fri, 04 Mar 2011 22:38:25 +0200 diff --git a/debian/patches/multiarch_findgtk2_fix.diff b/debian/patches/multiarch_findgtk2_fix.diff new file mode 100644 index 000000000..3ff302643 --- /dev/null +++ b/debian/patches/multiarch_findgtk2_fix.diff @@ -0,0 +1,22 @@ +From: Modestas Vainius +Subject: Make FindGTK2.cmake work with Debian multiarch +Bug: http://www.cmake.org/Bug/view.php?id=12049 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618932#24 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/751940 +Origin: vendor +Forwarded: no +Last-Update: 2011-06-07 + +Fix FindGTK2.cmake to work with Debian/Ubuntu multiarch library paths. The +patch depends on multiarch_library_directory_hack.diff patch. + +--- a/Modules/FindGTK2.cmake ++++ b/Modules/FindGTK2.cmake +@@ -185,6 +185,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd + + find_path(${_var} ${_hdr} + PATHS ++ /usr/lib/${CMAKE_ARCH_TRIPLET} + /usr/local/lib64 + /usr/local/lib + /usr/lib64 diff --git a/debian/patches/series b/debian/patches/series index 80c5a13ec..ff2d315cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ FindBoost_add_-lpthread_#563479.diff backport_test_order_fix.diff screen-256color-bce.diff multiarch_library_directory_hack.diff +multiarch_findgtk2_fix.diff