[scim-bridge] fixes compile

Peng Wu pwu at fedoraproject.org
Fri Mar 2 05:40:40 UTC 2012


commit 72ce2e86587ca088feeeb4d2346c9ce59c176b2e
Author: Peng Wu <alexepico at gmail.com>
Date:   Fri Mar 2 13:37:13 2012 +0800

    fixes compile

 scim-bridge-0.4.16-fixes-unistd-compile.patch |   25 +++++++++++++++++++++++++
 scim-bridge.spec                              |   12 +++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/scim-bridge-0.4.16-fixes-unistd-compile.patch b/scim-bridge-0.4.16-fixes-unistd-compile.patch
new file mode 100644
index 0000000..8650fad
--- /dev/null
+++ b/scim-bridge-0.4.16-fixes-unistd-compile.patch
@@ -0,0 +1,25 @@
+Index: scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp
+===================================================================
+--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-signal-listener.cpp
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include <sys/socket.h>
+ #include <sys/types.h>
+Index: scim-bridge-0.4.16/agent/utils/scim-bridge-agent-panel-client.cpp
+===================================================================
+--- scim-bridge-0.4.16.orig/agent/utils/scim-bridge-agent-panel-client.cpp
++++ scim-bridge-0.4.16/agent/utils/scim-bridge-agent-panel-client.cpp
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
++#include <unistd.h>
++
+ #define Uses_SCIM_CONFIG_PATH
+ 
+ #include <scim.h>
diff --git a/scim-bridge.spec b/scim-bridge.spec
index bbb2dbe..0e24ab8 100644
--- a/scim-bridge.spec
+++ b/scim-bridge.spec
@@ -6,7 +6,7 @@
 Name:           scim-bridge
 
 Version:        0.4.16
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -29,6 +29,7 @@ Patch2:         scim-bridge-0.4.15-bz461373.patch
 Patch3:         scim-bridge-0.4.15-EOF.patch
 Patch4:         scim-bridge-0.4.16-fix-gtk-key-snooper.patch
 Patch5:         scim-bridge-0.4.16-fixes-null-imengine.patch
+Patch6:         scim-bridge-0.4.16-fixes-unistd-compile.patch
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
@@ -85,9 +86,10 @@ This package provides the SCIM Bridge Qt3 input method module.
 %patch2 -p1 -b .2-bz461373
 %patch3 -p1 -b .3-EOF
 pushd client-gtk
-%patch4 -p0
+%patch4 -p0 -b .snooper
 popd
-%patch5 -p1
+%patch5 -p1 -b .null
+%patch6 -p1 -b .unistd
 
 %if %{snapshot}
 mkdir m4
@@ -158,6 +160,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 02 2012  Peng Wu <pwu at redhat.com> - 0.4.16-10
+- Add patch scim-bridge-0.4.16-fixes-unistd-compile.patch,
+  to fix Fedora 17 compile
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.16-9
 - Rebuilt for c++ ABI breakage
 


More information about the scm-commits mailing list