rpms/scim-bridge/devel scim-bridge-0.4.13-fix-undefined-symbol.patch, NONE, 1.1 scim-bridge.spec, 1.52, 1.53

Huang Peng (phuang) fedora-extras-commits at redhat.com
Thu Dec 6 05:40:32 UTC 2007


Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16642

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-0.4.13-fix-undefined-symbol.patch 
Log Message:
Backport upstream's patch to fix bug 412591.


scim-bridge-0.4.13-fix-undefined-symbol.patch:

--- NEW FILE scim-bridge-0.4.13-fix-undefined-symbol.patch ---
diff -up scim-bridge-0.4.13/client-qt/qt3/scim-bridge-client-imcontext-qt.cpp.fix-undefined-symbol scim-bridge-0.4.13/client-qt/qt3/scim-bridge-client-imcontext-qt.cpp
--- scim-bridge-0.4.13/client-qt/qt3/scim-bridge-client-imcontext-qt.cpp.fix-undefined-symbol	2007-12-06 13:25:57.000000000 +0800
+++ scim-bridge-0.4.13/client-qt/qt3/scim-bridge-client-imcontext-qt.cpp	2007-12-06 13:26:21.000000000 +0800
@@ -694,11 +694,6 @@ void scim_bridge_client_imcontext_set_id
     imcontext_impl->set_id (new_id);
 }
 
-void scim_bridge_client_imcontext_imengine_status_changed (ScimBridgeClientIMContext *imcontext, boolean enabled)
-{
-    // Do nothing.
-}
-
 void scim_bridge_client_imcontext_beep (ScimBridgeClientIMContext *imcontext)
 {
     QApplication::beep ();
@@ -810,3 +805,10 @@ boolean scim_bridge_client_imcontext_rep
     return FALSE;
 #endif
 }
+
+
+void scim_bridge_client_imcontext_imengine_status_changed (ScimBridgeClientIMContext *imcontext, boolean enabled)
+{
+    // Do nothing.
+}
+
diff -up scim-bridge-0.4.13/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.fix-undefined-symbol scim-bridge-0.4.13/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
--- scim-bridge-0.4.13/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.fix-undefined-symbol	2007-12-06 13:27:53.000000000 +0800
+++ scim-bridge-0.4.13/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp	2007-12-06 13:28:09.000000000 +0800
@@ -694,11 +694,6 @@ void scim_bridge_client_imcontext_set_id
     imcontext_impl->set_id (new_id);
 }
 
-void scim_bridge_client_imcontext_imengine_status_changed (ScimBridgeClientIMContext *imcontext, boolean enabled)
-{
-    // Do nothing.
-}
-
 void scim_bridge_client_imcontext_beep (ScimBridgeClientIMContext *imcontext)
 {
     QApplication::beep ();
@@ -810,3 +805,10 @@ boolean scim_bridge_client_imcontext_rep
     return FALSE;
 #endif
 }
+
+
+void scim_bridge_client_imcontext_imengine_status_changed (ScimBridgeClientIMContext *imcontext, boolean enabled)
+{
+    // Do nothing.
+}
+


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- scim-bridge.spec	27 Aug 2007 08:18:06 -0000	1.52
+++ scim-bridge.spec	6 Dec 2007 05:40:00 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name:           scim-bridge
 Version:        0.4.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -24,6 +24,7 @@
 Requires:       scim >= 1.4.6
 
 Patch1:		scim-bridge-setlocale.patch
+Patch2:		scim-bridge-0.4.13-fix-undefined-symbol.patch
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
@@ -70,6 +71,7 @@
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
 %patch1 -p1
+%patch2 -p1
 
 %if %{snapshot}
 mkdir m4
@@ -139,6 +141,9 @@
 
 
 %changelog
+* Thu Dec 06 2007 Huang Peng <phuang at redhat.com> - 0.4.13-5
+- Backport upstream's patch to fix bug 412591
+
 * Mon Aug 27 2007 Jens Petersen <petersen at redhat.com> - 0.4.13-4
 - license is dual GPL and LGPL
 - gtk-2.0/immodules is now owned by gtk2




More information about the fedora-extras-commits mailing list