Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Sep 2010 01:03:09 GMT
From:      Borodin Oleg <ziggi@inbox.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/150768: Update xfce4-xkb-plugin from 0.4.3 to 0.5.3.3
Message-ID:  <201009210103.o8L139Kb050123@www.freebsd.org>
Resent-Message-ID: <201009210110.o8L1A1DK085295@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         150768
>Category:       ports
>Synopsis:       Update xfce4-xkb-plugin from 0.4.3 to 0.5.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 21 01:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Borodin Oleg
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
>Description:
Draft port update xfce4-xkb-plugin. Works.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- ./Makefile.orig	2010-09-21 03:55:46.000000000 +0300
+++ ./Makefile	2010-09-21 03:55:18.000000000 +0300
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-xkb-plugin
-PORTVERSION=	0.4.3
-PORTREVISION=	12
+PORTVERSION=	0.5.3.3
+PORTREVISION=	0
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
@@ -21,7 +21,7 @@
 GNU_CONFIGURE=	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>
--- ./panel-plugin/xkb-config.c.orig	2009-03-06 15:16:03.000000000 +0200
+++ ./panel-plugin/xkb-config.c	2010-09-21 02:47:02.000000000 +0300
@@ -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, 0);
     
     config_item = xkl_config_item_new ();
 
@@ -214,7 +214,7 @@
 
     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
 
-    xkl_engine_stop_listen (config->engine);
+    xkl_engine_stop_listen (config->engine, 0);
 }
 
 gint
@@ -547,7 +547,7 @@
     if (!config) return NULL;
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, 0);
 
     return registry;
 }
--- ./panel-plugin/xkb-settings-dialog.c.orig	2009-03-06 15:16:03.000000000 +0200
+++ ./panel-plugin/xkb-settings-dialog.c	2010-09-21 02:51:54.000000000 +0300
@@ -31,6 +31,9 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#undef XFCE_DISABLE_DEPRECATED
+#include <libxfcegui4/xfce_framebox.h>
+
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <libxfcegui4/libxfcegui4.h>
 


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009210103.o8L139Kb050123>