← Back to branch summary

~ubuntu-branches/ubuntu/vivid/scim-bridge/vivid

« back to all changes in this revision

Viewing changes to debian/patches/50_fix_FTBFS_with_gcc44.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-25 22:02:52 UTC
  • mfrom: (1.1.9 upstream) (6.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090625220252-2qn0jwi9re34zcth
Tags: 0.4.16-2ubuntu1
* Resynchronise with Debian. Remaining changes:
  - 50_check_scim_binary.dpatch: Fix 10-20s delay in launching apps when
    scim is not running.
  - 50_fix_qt4_focus.dpatch: Fix focus loss under KDE 4.
  - 51_quiet.dpatch: Turn some error messages into debug lines.
  - Just have scim-bridge-agent depend on scim, not scim | skim.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/50_fix_FTBFS_with_gcc44.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 50_fix_FTBFS_with_gcc44.dpatch by  <zhengpeng.hou@gmail.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP:
 
6
 
 
7
@DPATCH@
 
8
diff -ruNad scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp
 
9
--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-application.cpp     2009-04-28 04:55:13.000000000 +0000
 
10
+++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp  2009-05-03 14:40:50.000000000 +0000
 
11
@@ -22,7 +22,7 @@
 
12
 #include <stdlib.h>
 
13
 #include <string.h>
 
14
 #include <unistd.h>
 
15
-
 
16
+#include <cstdio>
 
17
 #include <iostream>
 
18
 
 
19
 #include "scim-bridge-agent.h"