← Back to branch summary

~ubuntu-branches/ubuntu/trusty/fluxbox/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/20_FTBFS_with_gcc4.3

  • Committer: Bazaar Package Importer
  • Author(s): Dmitry E. Oboukhov
  • Date: 2008-07-01 10:38:14 UTC
  • mfrom: (2.1.12 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080701103814-khx2b6il152x9p93
Tags: 1.0.0+deb1-8
* x-dev has been removed from build-depends (out-of-date package).
* Standards-Version bumped to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20_FTBFS_with_gcc4.3
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 20_FTBFS_with_gcc4.3.dpatch by  <dimka@avanto.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Fix: FTBFS with GCC 4.3: missing #includes
 
6
 
 
7
@DPATCH@
 
8
 
 
9
--- fluxbox-1.0.0/build-tree/fluxbox-1.0.0/src/main.cc  2007-12-14 10:18:54.000000000 +0300
 
10
+++ fluxbox-1.0.0/build-tree/fluxbox-1.0.0/src/main.cc  2007-08-11 22:22:20.000000000 +0400
 
11
@@ -45,6 +45,12 @@
 
12
   #include <stdlib.h>
 
13
 #endif
 
14
 
 
15
+#ifdef HAVE_CSTRING
 
16
+  #include <cstring>
 
17
+#else
 
18
+  #include <string.h>
 
19
+#endif
 
20
+
 
21
 #include <iostream>
 
22
 #include <fstream>
 
23
 #include <stdexcept>