From 7bd05267e290c90d5fb400ffc4c81df57cb50398 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Thu, 9 Jun 2011 01:16:10 +0300 Subject: [PATCH] Adapt multiarch_findgtk2_fix.diff for new multiarch impl. --- debian/changelog | 2 ++ debian/patches/multiarch_findgtk2_fix.diff | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d7f510dcc..3ca05a9a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ cmake (2.8.4+dfsg.1-4) UNRELEASED; urgency=low implementation does not need dpkg-dev 1.16, it is entirely backwards compatible with previous releases and in addition, it implements multiarch support for find_package(). + * Adapt multiarch_findgtk2_fix.diff patch to work with + multiarch_basic_support.diff. -- Modestas Vainius Thu, 09 Jun 2011 00:37:03 +0300 diff --git a/debian/patches/multiarch_findgtk2_fix.diff b/debian/patches/multiarch_findgtk2_fix.diff index 3ff302643..4a66e2f42 100644 --- a/debian/patches/multiarch_findgtk2_fix.diff +++ b/debian/patches/multiarch_findgtk2_fix.diff @@ -8,15 +8,15 @@ 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. +patch depends on multiarch_basic_support.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} +@@ -187,6 +187,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd PATHS -+ /usr/lib/${CMAKE_ARCH_TRIPLET} /usr/local/lib64 /usr/local/lib ++ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} /usr/lib64 + /usr/lib + /opt/gnome/include