Attachment 114117 Details for Bug 155749 – xfce4-xkb-plugin.patch

[patch] xfce4-xkb-plugin.patch

xfce4-xkb-plugin.patch (text/plain), 9.59 KB, created by Emanuel Haupt on 2011-03-21 13:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuel Haupt

Created: 2011-03-21 13:20:03 UTC

Size: 9.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/xfce4-xkb-plugin/Makefile,v
>retrieving revision 1.28
>diff -u -r1.28 Makefile
>--- Makefile	3 Mar 2011 10:12:21 -0000	1.28
>+++ Makefile	21 Mar 2011 13:14:33 -0000
>@@ -6,21 +6,21 @@
> #
> 
> PORTNAME=	xfce4-xkb-plugin
>-PORTVERSION=	0.4.3
>-PORTREVISION=	13
>+PORTVERSION=	0.5.3.3
> CATEGORIES=	deskutils xfce
>-MASTER_SITES=	${MASTER_SITE_XFCE}
>-MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
>+MASTER_SITES=	CRITICAL/.
> DIST_SUBDIR=	xfce4
> 
> MAINTAINER=	des@FreeBSD.org
> COMMENT=	Keyboard layout switching plugin for XFce4
> 
>+LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
>+
> GNU_CONFIGURE=	yes
> USE_BZIP2=	yes
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>-USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig
>+USE_GNOME=	gnometarget gtk20 intltool intlhack pkgconfig librsvg2
> USE_XFCE=	configenv panel
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/xfce4-xkb-plugin/distinfo,v
>retrieving revision 1.6
>diff -u -r1.6 distinfo
>--- distinfo	20 Mar 2011 12:48:45 -0000	1.6
>+++ distinfo	21 Mar 2011 13:14:33 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e
>-SIZE (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843
>+SHA256 (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 157284a5c7f261fcac47b1d352f0c45b8f480c660d28cba225cb4b0e3b9f7b5f
>+SIZE (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 700250
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/xfce4-xkb-plugin/pkg-plist,v
>retrieving revision 1.6
>diff -u -r1.6 pkg-plist
>--- pkg-plist	22 Jan 2007 16:45:06 -0000	1.6
>+++ pkg-plist	21 Mar 2011 13:14:33 -0000
>@@ -1,92 +1,118 @@
> libexec/xfce4/panel-plugins/xfce4-xkb-plugin
>+share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
>-share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
>-share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
>-share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
>-share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
>-share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
>+share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
> share/xfce4/panel-plugins/xkb-plugin.desktop
>-share/xfce4/xkb/flags/ae.png
>-share/xfce4/xkb/flags/am.png
>-share/xfce4/xkb/flags/ar.png
>-share/xfce4/xkb/flags/at.png
>-share/xfce4/xkb/flags/az.png
>-share/xfce4/xkb/flags/be.png
>-share/xfce4/xkb/flags/bg.png
>-share/xfce4/xkb/flags/bh.png
>-share/xfce4/xkb/flags/br.png
>-share/xfce4/xkb/flags/by.png
>-share/xfce4/xkb/flags/ca.png
>-share/xfce4/xkb/flags/ch.png
>-share/xfce4/xkb/flags/cu.png
>-share/xfce4/xkb/flags/cz.png
>-share/xfce4/xkb/flags/de.png
>-share/xfce4/xkb/flags/dj.png
>-share/xfce4/xkb/flags/dk.png
>-share/xfce4/xkb/flags/dz.png
>-share/xfce4/xkb/flags/ee.png
>-share/xfce4/xkb/flags/eg.png
>-share/xfce4/xkb/flags/es.png
>-share/xfce4/xkb/flags/eu.png
>-share/xfce4/xkb/flags/fi.png
>-share/xfce4/xkb/flags/fr.png
>-share/xfce4/xkb/flags/ge.png
>-share/xfce4/xkb/flags/gr.png
>-share/xfce4/xkb/flags/hr.png
>-share/xfce4/xkb/flags/hu.png
>-share/xfce4/xkb/flags/il.png
>-share/xfce4/xkb/flags/iq.png
>-share/xfce4/xkb/flags/is.png
>-share/xfce4/xkb/flags/it.png
>-share/xfce4/xkb/flags/jo.png
>-share/xfce4/xkb/flags/jp.png
>-share/xfce4/xkb/flags/km.png
>-share/xfce4/xkb/flags/kr.png
>-share/xfce4/xkb/flags/kw.png
>-share/xfce4/xkb/flags/la.png
>-share/xfce4/xkb/flags/lb.png
>-share/xfce4/xkb/flags/lt.png
>-share/xfce4/xkb/flags/ly.png
>-share/xfce4/xkb/flags/ma.png
>-share/xfce4/xkb/flags/mk.png
>-share/xfce4/xkb/flags/mn.png
>-share/xfce4/xkb/flags/mx.png
>-share/xfce4/xkb/flags/nl.png
>-share/xfce4/xkb/flags/no.png
>-share/xfce4/xkb/flags/om.png
>-share/xfce4/xkb/flags/pl.png
>-share/xfce4/xkb/flags/ps.png
>-share/xfce4/xkb/flags/pt.png
>-share/xfce4/xkb/flags/qa.png
>-share/xfce4/xkb/flags/qc.png
>-share/xfce4/xkb/flags/ro.png
>-share/xfce4/xkb/flags/ru.png
>-share/xfce4/xkb/flags/sa.png
>-share/xfce4/xkb/flags/sd.png
>-share/xfce4/xkb/flags/se.png
>-share/xfce4/xkb/flags/si.png
>-share/xfce4/xkb/flags/sk.png
>-share/xfce4/xkb/flags/so.png
>-share/xfce4/xkb/flags/sr.png
>-share/xfce4/xkb/flags/sy.png
>-share/xfce4/xkb/flags/th.png
>-share/xfce4/xkb/flags/tn.png
>-share/xfce4/xkb/flags/tr.png
>-share/xfce4/xkb/flags/ua.png
>-share/xfce4/xkb/flags/uk.png
>-share/xfce4/xkb/flags/un.png
>-share/xfce4/xkb/flags/us.png
>-share/xfce4/xkb/flags/uy.png
>-share/xfce4/xkb/flags/vn.png
>-share/xfce4/xkb/flags/ye.png
>-share/xfce4/xkb/flags/yu.png
>+share/xfce4/xkb/flags/ae.svg
>+share/xfce4/xkb/flags/al.svg
>+share/xfce4/xkb/flags/am.svg
>+share/xfce4/xkb/flags/ar.svg
>+share/xfce4/xkb/flags/at.svg
>+share/xfce4/xkb/flags/az.svg
>+share/xfce4/xkb/flags/be.svg
>+share/xfce4/xkb/flags/ben.svg
>+share/xfce4/xkb/flags/bg.svg
>+share/xfce4/xkb/flags/bh.svg
>+share/xfce4/xkb/flags/br.svg
>+share/xfce4/xkb/flags/bs.svg
>+share/xfce4/xkb/flags/by.svg
>+share/xfce4/xkb/flags/ca.svg
>+share/xfce4/xkb/flags/ch.svg
>+share/xfce4/xkb/flags/cu.svg
>+share/xfce4/xkb/flags/cz.svg
>+share/xfce4/xkb/flags/de.svg
>+share/xfce4/xkb/flags/dev.svg
>+share/xfce4/xkb/flags/dj.svg
>+share/xfce4/xkb/flags/dk.svg
>+share/xfce4/xkb/flags/dvorak.svg
>+share/xfce4/xkb/flags/dz.svg
>+share/xfce4/xkb/flags/ee.svg
>+share/xfce4/xkb/flags/eg.svg
>+share/xfce4/xkb/flags/epo.svg
>+share/xfce4/xkb/flags/es.svg
>+share/xfce4/xkb/flags/fi.svg
>+share/xfce4/xkb/flags/fo.svg
>+share/xfce4/xkb/flags/fr.svg
>+share/xfce4/xkb/flags/gb.svg
>+share/xfce4/xkb/flags/ge.svg
>+share/xfce4/xkb/flags/gr.svg
>+share/xfce4/xkb/flags/hr.svg
>+share/xfce4/xkb/flags/hu.svg
>+share/xfce4/xkb/flags/ie.svg
>+share/xfce4/xkb/flags/il.svg
>+share/xfce4/xkb/flags/iq.svg
>+share/xfce4/xkb/flags/ir.svg
>+share/xfce4/xkb/flags/is.svg
>+share/xfce4/xkb/flags/it.svg
>+share/xfce4/xkb/flags/jo.svg
>+share/xfce4/xkb/flags/jp.svg
>+share/xfce4/xkb/flags/km.svg
>+share/xfce4/xkb/flags/kp.svg
>+share/xfce4/xkb/flags/kr.svg
>+share/xfce4/xkb/flags/kw.svg
>+share/xfce4/xkb/flags/la.svg
>+share/xfce4/xkb/flags/lb.svg
>+share/xfce4/xkb/flags/lt.svg
>+share/xfce4/xkb/flags/lv.svg
>+share/xfce4/xkb/flags/ly.svg
>+share/xfce4/xkb/flags/ma.svg
>+share/xfce4/xkb/flags/mk.svg
>+share/xfce4/xkb/flags/mm.svg
>+share/xfce4/xkb/flags/mn.svg
>+share/xfce4/xkb/flags/mt.svg
>+share/xfce4/xkb/flags/mx.svg
>+share/xfce4/xkb/flags/nl.svg
>+share/xfce4/xkb/flags/no.svg
>+share/xfce4/xkb/flags/om.svg
>+share/xfce4/xkb/flags/pl.svg
>+share/xfce4/xkb/flags/pt.svg
>+share/xfce4/xkb/flags/qa.svg
>+share/xfce4/xkb/flags/ro.svg
>+share/xfce4/xkb/flags/ru.svg
>+share/xfce4/xkb/flags/sa.svg
>+share/xfce4/xkb/flags/sd.svg
>+share/xfce4/xkb/flags/se.svg
>+share/xfce4/xkb/flags/si.svg
>+share/xfce4/xkb/flags/sk.svg
>+share/xfce4/xkb/flags/so.svg
>+share/xfce4/xkb/flags/sr.svg
>+share/xfce4/xkb/flags/sy.svg
>+share/xfce4/xkb/flags/th.svg
>+share/xfce4/xkb/flags/tn.svg
>+share/xfce4/xkb/flags/tr.svg
>+share/xfce4/xkb/flags/ua.svg
>+share/xfce4/xkb/flags/us.svg
>+share/xfce4/xkb/flags/uy.svg
>+share/xfce4/xkb/flags/uz.svg
>+share/xfce4/xkb/flags/vn.svg
>+share/xfce4/xkb/flags/ye.svg
>+share/xfce4/xkb/flags/yu.svg
> @dirrmtry libexec/xfce4/panel-plugins
> @dirrmtry libexec/xfce4
> @dirrmtry share/xfce4/panel-plugins
>Index: files/patch-panel-plugin__xkb-config.c
>===================================================================
>RCS file: files/patch-panel-plugin__xkb-config.c
>diff -N files/patch-panel-plugin__xkb-config.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-panel-plugin__xkb-config.c	21 Mar 2011 13:14:33 -0000
>@@ -0,0 +1,30 @@
>+--- ./panel-plugin/xkb-config.c.orig	2011-03-21 11:32:35.000000000 +0100
>++++ ./panel-plugin/xkb-config.c	2011-03-21 11:34:21.000000000 +0100
>+@@ -150,7 +150,7 @@
>+     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 ();
>+ 
>+@@ -214,7 +214,8 @@
>+ 
>+     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
>+ 
>+-    xkl_engine_stop_listen (config->engine);
>++    xkl_engine_stop_listen (config->engine,
>++	XKLL_MANAGE_LAYOUTS | XKLL_MANAGE_WINDOW_STATES);
>+ }
>+ 
>+ gint
>+@@ -547,7 +548,7 @@
>+     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;
>+ }

Actions: View | Diff

Attachments on bug 155749: 114117