Drop multiarch_findgtk2_fix.diff, was already fixed upstream in 2.8.11.

ci/unstable
Felix Geyer 11 years ago
parent 8bbb2337e9
commit 1769e4ab61

1
debian/changelog vendored

@ -12,6 +12,7 @@ cmake (2.8.12.2-1) UNRELEASED; urgency=medium
These are just binary test files used by the test suite to verify that
changing the RPATH works fine.
* Drop some redundant build options from debian/rules.
* Drop multiarch_findgtk2_fix.diff, was already fixed upstream in 2.8.11.
-- Felix Geyer <fgeyer@debian.org> Sun, 03 Aug 2014 10:02:57 +0200

@ -1,22 +0,0 @@
From: Modestas Vainius <modax@debian.org>
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_basic_support.diff patch.
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -204,6 +204,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
${_gtk2_arch_dir}
/usr/local/lib64
/usr/local/lib
+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/lib64
/usr/lib
/opt/gnome/include

@ -1,5 +1,4 @@
FindBoost_add_-lpthread_#563479.diff
multiarch_findgtk2_fix.diff
install_to_multiarch_libdir_on_kfreebsd_hurd.diff
qt_import_dir_variable.diff
FindPHP4_fix_typo.diff

Loading…
Cancel
Save