← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aptitude/vivid

« back to all changes in this revision

Viewing changes to debian/patches/0001-Don-t-try-to-test-the-search-input-controller-if-the.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-06-22 12:32:56 UTC
  • mfrom: (1.8.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110622123256-8aox9w9ch3x72dci
Tags: 0.6.4-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/05aptitude: never autoremove kernels
  - drop aptitude-doc to Suggests
  - 03_branding.dpatch: ubuntu branding
  - 04_changelog.dpatch: take changelogs from changelogs.ubuntu.com
  - 09_ubuntu_fortify_source.dpatch: Suppress a number of warnings (turned
    into errors by -Werror) triggered by Ubuntu's default of
    -D_FORTIFY_SOURCE=2.
  - 11_ubuntu_uses_sudo.dpatch: fix status line of 'Become root' menu entry
    to not refer to su.
  - 12_point_manpage_to_doc_package.dpatch: point Finnish manpage to the
    correct place for further info
  - 14_html2text_preferred.dpatch: switch back to html2text in favor of
    elinks, since html2text is in main and elinks isn't.
* dropped 01_intltool_update.dpatch
* updated 15_ftbfs_new_apt

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Don-t-try-to-test-the-search-input-controller-if-the.patch
1
 
From: Daniel_Burrows@alumni.brown.edu <Daniel_Burrows@alumni.brown.edu>
2
 
Date: Sat, 19 Jun 2010 11:22:05 -0700
3
 
Subject: [PATCH] Don't try to test the search input controller if the GTK+ frontend wasn't built.
4
 
 If the GTK+ frontend isn't built, neither is the controller,
5
 
 so the test won't build.
6
 
 
7
 
---
8
 
 tests/test_search_input_controller.cc |    4 ++++
9
 
 1 files changed, 4 insertions(+), 0 deletions(-)
10
 
 
11
 
diff --git a/tests/test_search_input_controller.cc b/tests/test_search_input_controller.cc
12
 
index 8b01da0..7704828 100644
13
 
--- a/tests/test_search_input_controller.cc
14
 
+++ b/tests/test_search_input_controller.cc
15
 
@@ -17,6 +17,8 @@
16
 
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
17
 
 // Boston, MA 02111-1307, USA.
18
 
 
19
 
+#ifdef HAVE_GTK
20
 
+
21
 
 #include <generic/apt/matching/compare_patterns.h>
22
 
 #include <generic/apt/matching/pattern.h>
23
 
 #include <gtk/controllers/search_input.h>
24
 
@@ -146,3 +148,5 @@ BOOST_FIXTURE_TEST_CASE(testEnteringCorrectTextSearches, SearchInputTest)
25
 
 
26
 
   get_controller()->enter_text(p_text);
27
 
 }
28
 
+
29
 
+#endif // HAVE_GTK