rpms/kdebase-workspace/devel kdebase-workspace-4.2.95-libxklavier_40.patch, NONE, 1.1 kdebase-workspace.spec, 1.243, 1.244

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18064

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.95-libxklavier_40.patch 
Log Message:
libxklavier-4.0 api change


kdebase-workspace-4.2.95-libxklavier_40.patch:

--- NEW FILE kdebase-workspace-4.2.95-libxklavier_40.patch ---
diff -up kdebase-workspace-4.2.95/kcontrol/kxkb/xklavier_adaptor.cpp.libxklavier_40 kdebase-workspace-4.2.95/kcontrol/kxkb/xklavier_adaptor.cpp
--- kdebase-workspace-4.2.95/kcontrol/kxkb/xklavier_adaptor.cpp.libxklavier_40	2008-05-15 13:37:15.000000000 -0500
+++ kdebase-workspace-4.2.95/kcontrol/kxkb/xklavier_adaptor.cpp	2009-07-01 09:25:25.478896239 -0500
@@ -222,7 +222,7 @@ void XKlavierAdaptor::loadXkbConfig(bool
     kDebug() << "Xklavier initialized";
     priv->config = xkl_config_registry_get_instance(priv->engine);
 
-    xkl_config_registry_load(priv->config);
+    xkl_config_registry_load(priv->config,FALSE);
 	
     void *userData = priv;
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- kdebase-workspace.spec	1 Jul 2009 13:02:01 -0000	1.243
+++ kdebase-workspace.spec	1 Jul 2009 14:42:42 -0000	1.244
@@ -27,6 +27,8 @@ Patch12: kdebase-workspace-4.2.0-default
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+# TODO: make upstreamable version
+Patch16: kdebase-workspace-4.2.95-libxklavier_40.patch
 
 # upstream patches:
 # 4.3 branch
@@ -224,6 +226,9 @@ Requires: PyKDE4 >= %{version}
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%if 0%{?fedora} > 11
+%patch16 -p1 -b .libxklavier_40
+%endif
 
 # upstream patches
 %patch100 -p0 -b .fix-version