Attachment #114117 for bug #155749

View | Details | Raw Unified | Return to bug 155749
Collapse All | Expand All




#

PORTNAME=	xfce4-xkb-plugin
PORTVERSION=	0.5.3.3
PORTREVISION=	13
CATEGORIES=	deskutils xfce
MASTER_SITES=	CRITICAL/.
MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
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 librsvg2
USE_XFCE=	configenv panel

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e	1	SHA256 (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 157284a5c7f261fcac47b1d352f0c45b8f480c660d28cba225cb4b0e3b9f7b5f
2	SIZE (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843	2	SIZE (xfce4/xfce4-xkb-plugin-0.5.3.3.tar.bz2) = 700250

Lines 1-92 Link Here

(-)pkg-plist (-79 / +105 lines)
1	libexec/xfce4/panel-plugins/xfce4-xkb-plugin	1	libexec/xfce4/panel-plugins/xfce4-xkb-plugin
		2	share/locale/ar/LC_MESSAGES/xfce4-xkb-plugin.mo
		3	share/locale/be/LC_MESSAGES/xfce4-xkb-plugin.mo
2	share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo	4	share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
3	share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
4	share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
5	share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
6	share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
7	share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
8	share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo	5	share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
9	share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo	6	share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
		7	share/locale/da/LC_MESSAGES/xfce4-xkb-plugin.mo
		8	share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
10	share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo	9	share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
		10	share/locale/en_GB/LC_MESSAGES/xfce4-xkb-plugin.mo
		11	share/locale/es/LC_MESSAGES/xfce4-xkb-plugin.mo
		12	share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
		13	share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
11	share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo	14	share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
		15	share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
		16	share/locale/id/LC_MESSAGES/xfce4-xkb-plugin.mo
		17	share/locale/it/LC_MESSAGES/xfce4-xkb-plugin.mo
12	share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo	18	share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
		19	share/locale/lv/LC_MESSAGES/xfce4-xkb-plugin.mo
13	share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo	20	share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
		21	share/locale/pt/LC_MESSAGES/xfce4-xkb-plugin.mo
		22	share/locale/pt_BR/LC_MESSAGES/xfce4-xkb-plugin.mo
		23	share/locale/ro/LC_MESSAGES/xfce4-xkb-plugin.mo
		24	share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
		25	share/locale/sv/LC_MESSAGES/xfce4-xkb-plugin.mo
		26	share/locale/tr/LC_MESSAGES/xfce4-xkb-plugin.mo
		27	share/locale/uk/LC_MESSAGES/xfce4-xkb-plugin.mo
		28	share/locale/ur/LC_MESSAGES/xfce4-xkb-plugin.mo
		29	share/locale/zh_CN/LC_MESSAGES/xfce4-xkb-plugin.mo
14	share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo	30	share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
15	share/xfce4/panel-plugins/xkb-plugin.desktop	31	share/xfce4/panel-plugins/xkb-plugin.desktop
16	share/xfce4/xkb/flags/ae.png	32	share/xfce4/xkb/flags/ae.svg
17	share/xfce4/xkb/flags/am.png	33	share/xfce4/xkb/flags/al.svg
18	share/xfce4/xkb/flags/ar.png	34	share/xfce4/xkb/flags/am.svg
19	share/xfce4/xkb/flags/at.png	35	share/xfce4/xkb/flags/ar.svg
20	share/xfce4/xkb/flags/az.png	36	share/xfce4/xkb/flags/at.svg
21	share/xfce4/xkb/flags/be.png	37	share/xfce4/xkb/flags/az.svg
22	share/xfce4/xkb/flags/bg.png	38	share/xfce4/xkb/flags/be.svg
23	share/xfce4/xkb/flags/bh.png	39	share/xfce4/xkb/flags/ben.svg
24	share/xfce4/xkb/flags/br.png	40	share/xfce4/xkb/flags/bg.svg
25	share/xfce4/xkb/flags/by.png	41	share/xfce4/xkb/flags/bh.svg
26	share/xfce4/xkb/flags/ca.png	42	share/xfce4/xkb/flags/br.svg
27	share/xfce4/xkb/flags/ch.png	43	share/xfce4/xkb/flags/bs.svg
28	share/xfce4/xkb/flags/cu.png	44	share/xfce4/xkb/flags/by.svg
29	share/xfce4/xkb/flags/cz.png	45	share/xfce4/xkb/flags/ca.svg
30	share/xfce4/xkb/flags/de.png	46	share/xfce4/xkb/flags/ch.svg
31	share/xfce4/xkb/flags/dj.png	47	share/xfce4/xkb/flags/cu.svg
32	share/xfce4/xkb/flags/dk.png	48	share/xfce4/xkb/flags/cz.svg
33	share/xfce4/xkb/flags/dz.png	49	share/xfce4/xkb/flags/de.svg
34	share/xfce4/xkb/flags/ee.png	50	share/xfce4/xkb/flags/dev.svg
35	share/xfce4/xkb/flags/eg.png	51	share/xfce4/xkb/flags/dj.svg
36	share/xfce4/xkb/flags/es.png	52	share/xfce4/xkb/flags/dk.svg
37	share/xfce4/xkb/flags/eu.png	53	share/xfce4/xkb/flags/dvorak.svg
38	share/xfce4/xkb/flags/fi.png	54	share/xfce4/xkb/flags/dz.svg
39	share/xfce4/xkb/flags/fr.png	55	share/xfce4/xkb/flags/ee.svg
40	share/xfce4/xkb/flags/ge.png	56	share/xfce4/xkb/flags/eg.svg
41	share/xfce4/xkb/flags/gr.png	57	share/xfce4/xkb/flags/epo.svg
42	share/xfce4/xkb/flags/hr.png	58	share/xfce4/xkb/flags/es.svg
43	share/xfce4/xkb/flags/hu.png	59	share/xfce4/xkb/flags/fi.svg
44	share/xfce4/xkb/flags/il.png	60	share/xfce4/xkb/flags/fo.svg
45	share/xfce4/xkb/flags/iq.png	61	share/xfce4/xkb/flags/fr.svg
46	share/xfce4/xkb/flags/is.png	62	share/xfce4/xkb/flags/gb.svg
47	share/xfce4/xkb/flags/it.png	63	share/xfce4/xkb/flags/ge.svg
48	share/xfce4/xkb/flags/jo.png	64	share/xfce4/xkb/flags/gr.svg
49	share/xfce4/xkb/flags/jp.png	65	share/xfce4/xkb/flags/hr.svg
50	share/xfce4/xkb/flags/km.png	66	share/xfce4/xkb/flags/hu.svg
51	share/xfce4/xkb/flags/kr.png	67	share/xfce4/xkb/flags/ie.svg
52	share/xfce4/xkb/flags/kw.png	68	share/xfce4/xkb/flags/il.svg
53	share/xfce4/xkb/flags/la.png	69	share/xfce4/xkb/flags/iq.svg
54	share/xfce4/xkb/flags/lb.png	70	share/xfce4/xkb/flags/ir.svg
55	share/xfce4/xkb/flags/lt.png	71	share/xfce4/xkb/flags/is.svg
56	share/xfce4/xkb/flags/ly.png	72	share/xfce4/xkb/flags/it.svg
57	share/xfce4/xkb/flags/ma.png	73	share/xfce4/xkb/flags/jo.svg
58	share/xfce4/xkb/flags/mk.png	74	share/xfce4/xkb/flags/jp.svg
59	share/xfce4/xkb/flags/mn.png	75	share/xfce4/xkb/flags/km.svg
60	share/xfce4/xkb/flags/mx.png	76	share/xfce4/xkb/flags/kp.svg
61	share/xfce4/xkb/flags/nl.png	77	share/xfce4/xkb/flags/kr.svg
62	share/xfce4/xkb/flags/no.png	78	share/xfce4/xkb/flags/kw.svg
63	share/xfce4/xkb/flags/om.png	79	share/xfce4/xkb/flags/la.svg
64	share/xfce4/xkb/flags/pl.png	80	share/xfce4/xkb/flags/lb.svg
65	share/xfce4/xkb/flags/ps.png	81	share/xfce4/xkb/flags/lt.svg
66	share/xfce4/xkb/flags/pt.png	82	share/xfce4/xkb/flags/lv.svg
67	share/xfce4/xkb/flags/qa.png	83	share/xfce4/xkb/flags/ly.svg
68	share/xfce4/xkb/flags/qc.png	84	share/xfce4/xkb/flags/ma.svg
69	share/xfce4/xkb/flags/ro.png	85	share/xfce4/xkb/flags/mk.svg
70	share/xfce4/xkb/flags/ru.png	86	share/xfce4/xkb/flags/mm.svg
71	share/xfce4/xkb/flags/sa.png	87	share/xfce4/xkb/flags/mn.svg
72	share/xfce4/xkb/flags/sd.png	88	share/xfce4/xkb/flags/mt.svg
73	share/xfce4/xkb/flags/se.png	89	share/xfce4/xkb/flags/mx.svg
74	share/xfce4/xkb/flags/si.png	90	share/xfce4/xkb/flags/nl.svg
75	share/xfce4/xkb/flags/sk.png	91	share/xfce4/xkb/flags/no.svg
76	share/xfce4/xkb/flags/so.png	92	share/xfce4/xkb/flags/om.svg
77	share/xfce4/xkb/flags/sr.png	93	share/xfce4/xkb/flags/pl.svg
78	share/xfce4/xkb/flags/sy.png	94	share/xfce4/xkb/flags/pt.svg
79	share/xfce4/xkb/flags/th.png	95	share/xfce4/xkb/flags/qa.svg
80	share/xfce4/xkb/flags/tn.png	96	share/xfce4/xkb/flags/ro.svg
81	share/xfce4/xkb/flags/tr.png	97	share/xfce4/xkb/flags/ru.svg
82	share/xfce4/xkb/flags/ua.png	98	share/xfce4/xkb/flags/sa.svg
83	share/xfce4/xkb/flags/uk.png	99	share/xfce4/xkb/flags/sd.svg
84	share/xfce4/xkb/flags/un.png	100	share/xfce4/xkb/flags/se.svg
85	share/xfce4/xkb/flags/us.png	101	share/xfce4/xkb/flags/si.svg
86	share/xfce4/xkb/flags/uy.png	102	share/xfce4/xkb/flags/sk.svg
87	share/xfce4/xkb/flags/vn.png	103	share/xfce4/xkb/flags/so.svg
88	share/xfce4/xkb/flags/ye.png	104	share/xfce4/xkb/flags/sr.svg
89	share/xfce4/xkb/flags/yu.png	105	share/xfce4/xkb/flags/sy.svg
		106	share/xfce4/xkb/flags/th.svg
		107	share/xfce4/xkb/flags/tn.svg
		108	share/xfce4/xkb/flags/tr.svg
		109	share/xfce4/xkb/flags/ua.svg
		110	share/xfce4/xkb/flags/us.svg
		111	share/xfce4/xkb/flags/uy.svg
		112	share/xfce4/xkb/flags/uz.svg
		113	share/xfce4/xkb/flags/vn.svg
		114	share/xfce4/xkb/flags/ye.svg
		115	share/xfce4/xkb/flags/yu.svg
90	@dirrmtry libexec/xfce4/panel-plugins	116	@dirrmtry libexec/xfce4/panel-plugins
91	@dirrmtry libexec/xfce4	117	@dirrmtry libexec/xfce4
92	@dirrmtry share/xfce4/panel-plugins	118	@dirrmtry share/xfce4/panel-plugins




--- ./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;
 }

Return to bug 155749

Lines 6-26 Link Here

(-)Makefile (-5 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= xfce4-xkb-plugin	8	PORTNAME= xfce4-xkb-plugin
9	PORTVERSION= 0.4.3	9	PORTVERSION= 0.5.3.3
10	PORTREVISION= 13
11	CATEGORIES= deskutils xfce	10	CATEGORIES= deskutils xfce
12	MASTER_SITES= ${MASTER_SITE_XFCE}	11	MASTER_SITES= CRITICAL/.
13	MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
14	DIST_SUBDIR= xfce4	12	DIST_SUBDIR= xfce4
15		13
16	MAINTAINER= des@FreeBSD.org	14	MAINTAINER= des@FreeBSD.org
17	COMMENT= Keyboard layout switching plugin for XFce4	15	COMMENT= Keyboard layout switching plugin for XFce4
18		16
		17	LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier
		18
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	USE_BZIP2= yes	20	USE_BZIP2= yes
21	USE_GETTEXT= yes	21	USE_GETTEXT= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig	23	USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig librsvg2
24	USE_XFCE= configenv panel	24	USE_XFCE= configenv panel
25		25
26	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Added Link Here

(-)files/patch-panel-plugin__xkb-config.c (+30 lines)
1	--- ./panel-plugin/xkb-config.c.orig 2011-03-21 11:32:35.000000000 +0100
2	+++ ./panel-plugin/xkb-config.c 2011-03-21 11:34:21.000000000 +0100
3	@@ -150,7 +150,7 @@
4	config->application_map = g_hash_table_new (g_direct_hash, NULL);
5
6	registry = xkl_config_registry_get_instance (config->engine);
7	- xkl_config_registry_load (registry);
8	+ xkl_config_registry_load (registry, FALSE);
9
10	config_item = xkl_config_item_new ();
11
12	@@ -214,7 +214,8 @@
13
14	gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
15
16	- xkl_engine_stop_listen (config->engine);
17	+ xkl_engine_stop_listen (config->engine,
18	+ XKLL_MANAGE_LAYOUTS \| XKLL_MANAGE_WINDOW_STATES);
19	}
20
21	gint
22	@@ -547,7 +548,7 @@
23	if (!config) return NULL;
24
25	registry = xkl_config_registry_get_instance (config->engine);
26	- xkl_config_registry_load (registry);
27	+ xkl_config_registry_load (registry, FALSE);
28
29	return registry;
30	}