Author: baggins Date: Mon Sep 28 15:01:37 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - fix building with xklavier 4.0 (patch from fedora)
---- Files affected: packages/xfce4-xkb-plugin: xfce4-xkb-plugin.spec (1.12 -> 1.13) , xfce4-xkb-plugin-xklavier-api.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec diff -u packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.12 packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.13 --- packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.12 Mon Sep 28 12:00:13 2009 +++ packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec Mon Sep 28 17:01:32 2009 @@ -3,17 +3,18 @@ Summary(pl.UTF-8): Wyświetlanie i przełączanie bieżącego układu klawiatury Name: xfce4-xkb-plugin Version: 0.5.3.3 -Release: 2 +Release: 3 License: BSD-like Group: X11/Applications Source0: http://goodies.xfce.org/releases/xfce4-xkb-plugin/%{name}-%{version}.tar.gz # Source0-md5: b233cc9de1cbace075eaf6e2c9a8e685 +Patch0: %{name}-xklavier-api.patch URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 BuildRequires: intltool BuildRequires: libtool -BuildRequires: libxklavier-devel >= 3.2 +BuildRequires: libxklavier-devel >= 4.0 BuildRequires: librsvg-devel >= 2.18.0 BuildRequires: libwnck-devel >= 2.12.0 BuildRequires: pkgconfig @@ -34,6 +35,7 @@ %prep %setup -q +%patch0 -p1 %build %{__intltoolize} @@ -73,6 +75,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2009/09/28 15:01:32 baggins +- rel 3 +- fix building with xklavier 4.0 (patch from fedora) + Revision 1.12 2009/09/28 10:00:13 baggins - rel 2 ================================================================ Index: packages/xfce4-xkb-plugin/xfce4-xkb-plugin-xklavier-api.patch diff -u /dev/null packages/xfce4-xkb-plugin/xfce4-xkb-plugin-xklavier-api.patch:1.1 --- /dev/null Mon Sep 28 17:01:38 2009 +++ packages/xfce4-xkb-plugin/xfce4-xkb-plugin-xklavier-api.patch Mon Sep 28 17:01:32 2009 @@ -0,0 +1,21 @@ +diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c +--- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx 2008-11-10 04:06:31.000000000 -0500 ++++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c 2009-07-07 15:42:40.000000000 -0400 +@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb + config->application_map = g_hash_table_new (g_direct_hash, NULL); + + registry = xkl_config_registry_get_instance (config->engine); +- xkl_config_registry_load (registry); ++ xkl_config_registry_load (registry, FALSE); + + config_item = xkl_config_item_new (); + +@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry () + if (!config) return NULL; + + registry = xkl_config_registry_get_instance (config->engine); +- xkl_config_registry_load (registry); ++ xkl_config_registry_load (registry, FALSE); + + return registry; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
