diff options
author | jmcneill <jmcneill@pkgsrc.org> | 2009-03-15 14:49:01 +0000 |
---|---|---|
committer | jmcneill <jmcneill@pkgsrc.org> | 2009-03-15 14:49:01 +0000 |
commit | 17995e9c41fc983f0f8c3fdc5c372dcfdfb72fb1 (patch) | |
tree | 7a63dcdba56bf3a06eba8dcbcb00b28347de1f42 | |
parent | 84b7e4a16a0ba5f453ae3c01cdad1ae1322a3d1a (diff) | |
download | pkgsrc-17995e9c41fc983f0f8c3fdc5c372dcfdfb72fb1.tar.gz |
Update libgnomekbd to 2.26.0.
Changes:
2009-03-13 svu
* configure.in, NEWS: preparing 2.26.0
2009-02-25 svu
* libgnomekbd/gkbd-indicator.c: use updated tooltips API, closing
#550212
* capplet/gkbd-indicator-plugins-capplet.c: fixed signal API, closing
#572661
2009-02-19 svu
* configure.in, NEWS: preparing 2.25.91
2009-02-09 svu
* libgnomekbd/gkbd-indicator-config.c: deprecate gdk_pixbuf_unref,
closing #570951
2008-12-09 Pedro Fragoso <ember@ubuntu.com>
* capplet/gkbd-indicator-plugins-capplet.h:
* test/gkbd-indicator-test.c:
* test/gkbd-keyboard-drawing-test.c:
GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563629)
2008-11-09 svu
* libgnomekbd/gkbd-keyboard-config.c: fixed memleak,
http://bugzilla.gnome.org/show_bug.cgi?id=549874
2008-10-27 svu
* libgnomekbd/gkbd-indicator.c: fixing crash in broken X
configuration, http://bugzilla.gnome.org/show_bug.cgi?id=553915
2008-09-28 svu
* libgnomekbd/gkbd-keyboard-drawing.c: make default orientation (for
printing) landscape, http://bugzilla.gnome.org/show_bug.cgi?id=553491
-rw-r--r-- | x11/libgnomekbd/Makefile | 7 | ||||
-rw-r--r-- | x11/libgnomekbd/PLIST | 4 | ||||
-rw-r--r-- | x11/libgnomekbd/distinfo | 9 | ||||
-rw-r--r-- | x11/libgnomekbd/patches/patch-ac | 207 |
4 files changed, 10 insertions, 217 deletions
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 34b0f443603..41ef71affc6 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2008/12/21 00:29:02 jmcneill Exp $ +# $NetBSD: Makefile,v 1.14 2009/03/15 14:49:01 jmcneill Exp $ # -DISTNAME= libgnomekbd-2.24.0 -PKGREVISION= 1 +DISTNAME= libgnomekbd-2.26.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.24/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.26/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST index a30b812f454..ed57b650a4b 100644 --- a/x11/libgnomekbd/PLIST +++ b/x11/libgnomekbd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/10/16 18:20:25 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2009/03/15 14:49:01 jmcneill Exp $ bin/gkbd-indicator-plugins-capplet include/libgnomekbd/gkbd-desktop-config.h include/libgnomekbd/gkbd-indicator-config.h @@ -40,6 +40,7 @@ share/locale/ja/LC_MESSAGES/libgnomekbd.mo share/locale/ka/LC_MESSAGES/libgnomekbd.mo share/locale/ko/LC_MESSAGES/libgnomekbd.mo share/locale/lt/LC_MESSAGES/libgnomekbd.mo +share/locale/lv/LC_MESSAGES/libgnomekbd.mo share/locale/mk/LC_MESSAGES/libgnomekbd.mo share/locale/ml/LC_MESSAGES/libgnomekbd.mo share/locale/mr/LC_MESSAGES/libgnomekbd.mo @@ -52,6 +53,7 @@ share/locale/pa/LC_MESSAGES/libgnomekbd.mo share/locale/pl/LC_MESSAGES/libgnomekbd.mo share/locale/pt/LC_MESSAGES/libgnomekbd.mo share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo +share/locale/ro/LC_MESSAGES/libgnomekbd.mo share/locale/ru/LC_MESSAGES/libgnomekbd.mo share/locale/si/LC_MESSAGES/libgnomekbd.mo share/locale/sl/LC_MESSAGES/libgnomekbd.mo diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index acc2402b7ec..33f8c0b957f 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.7 2008/12/21 00:29:02 jmcneill Exp $ +$NetBSD: distinfo,v 1.8 2009/03/15 14:49:01 jmcneill Exp $ -SHA1 (libgnomekbd-2.24.0.tar.bz2) = 3e81ade6050930a9d1e3443b89981cf36821032a -RMD160 (libgnomekbd-2.24.0.tar.bz2) = 8ca98404615c405705fd82c917acb7b4b55b334e -Size (libgnomekbd-2.24.0.tar.bz2) = 411322 bytes +SHA1 (libgnomekbd-2.26.0.tar.bz2) = 0b7543df516271e16198135323471b2107dca0ec +RMD160 (libgnomekbd-2.26.0.tar.bz2) = 0a4b5d133efc8b08482d1dc27cdf2ca56655fd48 +Size (libgnomekbd-2.26.0.tar.bz2) = 413560 bytes SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98 -SHA1 (patch-ac) = 0470b92a31dc54fd14614447da891620af83c268 SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126 SHA1 (patch-ae) = da103d07fcd3053ad0993b98542a6815dbc5e42b SHA1 (patch-af) = 0c2569c177846e75e58922b38c9bb8f4fe762162 diff --git a/x11/libgnomekbd/patches/patch-ac b/x11/libgnomekbd/patches/patch-ac deleted file mode 100644 index 501f0db7b29..00000000000 --- a/x11/libgnomekbd/patches/patch-ac +++ /dev/null @@ -1,207 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2008/12/21 00:29:02 jmcneill Exp $ - ---- libgnomekbd/gkbd-indicator.c.orig 2008-12-20 19:23:49.000000000 -0500 -+++ libgnomekbd/gkbd-indicator.c 2008-12-20 19:23:55.000000000 -0500 -@@ -17,6 +17,8 @@ - * Boston, MA 02111-1307, USA. - */ - -+#include <config.h> -+ - #include <memory.h> - - #include <gdk/gdkkeysyms.h> -@@ -135,7 +137,12 @@ gkbd_indicator_fill (GkbdIndicator * gki - GtkNotebook *notebook = GTK_NOTEBOOK (gki); - - for (grp = 0; grp < total_groups; grp++) { -- GtkWidget *page, *decorated_page; -+ GtkWidget *page, *decorated_page = NULL; -+ gchar *full_group_name = -+ (grp < -+ g_strv_length (globals. -+ full_group_names)) ? -+ globals.full_group_names[grp] : "?"; - page = gkbd_indicator_prepare_drawing (gki, grp); - - if (page == NULL) -@@ -144,7 +151,7 @@ gkbd_indicator_fill (GkbdIndicator * gki - decorated_page = - gkbd_indicator_plugin_manager_decorate_widget - (&globals.plugin_manager, page, grp, -- globals.full_group_names[grp], &globals.kbd_cfg); -+ full_group_name, &globals.kbd_cfg); - - page = decorated_page == NULL ? page : decorated_page; - -@@ -257,39 +264,46 @@ gkbd_indicator_prepare_drawing (GkbdIndi - g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); - -- if (xkl_engine_get_features (globals.engine) & -- XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { -- char *full_layout_name = -- (char *) g_slist_nth_data (globals.kbd_cfg. -- layouts_variants, -- group); -- char *variant_name; -- if (!gkbd_keyboard_config_split_items -- (full_layout_name, &layout_name, -- &variant_name)) -- /* just in case */ -- layout_name = full_layout_name; -- -- /* make it freeable */ -- layout_name = g_strdup (layout_name); -- -- if (globals.short_group_names != NULL) { -- char *short_group_name = -- globals.short_group_names[group]; -- if (short_group_name != NULL -- && *short_group_name != '\0') { -- /* drop the long name */ -- g_free (layout_name); -- layout_name = -- g_strdup (short_group_name); -+ -+ if (group < g_strv_length (globals.short_group_names)) { -+ if (xkl_engine_get_features (globals.engine) & -+ XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { -+ char *full_layout_name = (char *) -+ g_slist_nth_data (globals.kbd_cfg. -+ layouts_variants, -+ group); -+ char *variant_name; -+ if (!gkbd_keyboard_config_split_items -+ (full_layout_name, &layout_name, -+ &variant_name)) -+ /* just in case */ -+ layout_name = full_layout_name; -+ -+ /* make it freeable */ -+ layout_name = g_strdup (layout_name); -+ -+ if (globals.short_group_names != NULL) { -+ char *short_group_name = -+ globals.short_group_names -+ [group]; -+ if (short_group_name != NULL -+ && *short_group_name != '\0') { -+ /* drop the long name */ -+ g_free (layout_name); -+ layout_name = -+ g_strdup -+ (short_group_name); -+ } - } -+ } else { -+ layout_name = -+ g_strdup (globals.full_group_names -+ [group]); - } -- } else -- layout_name = -- g_strdup (globals.full_group_names[group]); -+ } - - if (layout_name == NULL) -- layout_name = g_strdup ("?"); -+ layout_name = g_strdup ("??"); - - /* Process layouts with repeating description */ - ppln = &prev_layout_name; -@@ -306,7 +320,7 @@ gkbd_indicator_prepare_drawing (GkbdIndi - utf8length = g_unichar_to_utf8 (cidx, appendix); - appendix[utf8length] = '\0'; - lbl_title = -- g_strconcat (layout_name, appendix, NULL); -+ g_strconcat (layout_name, appendix, VPNULL); - } else { - /* "first" time this description */ - lbl_title = g_strdup (layout_name); -@@ -347,7 +361,8 @@ gkbd_indicator_update_tooltips (GkbdIndi - { - XklState *state = xkl_engine_get_current_state (globals.engine); - gchar *buf; -- if (state == NULL || state->group < 0) -+ if (state == NULL || state->group < 0 -+ || state->group >= g_strv_length (globals.full_group_names)) - return; - - buf = g_strdup_printf (globals.tooltips_format, -@@ -401,12 +416,9 @@ gkbd_indicator_ind_cfg_changed (GConfCli - &globals.kbd_cfg); - gkbd_indicator_config_activate (&globals.ind_cfg); - -- gkbd_indicator_plugin_manager_toggle_plugins (&globals. -- plugin_manager, -- &globals. -- plugin_container, -- globals.ind_cfg. -- enabled_plugins); -+ gkbd_indicator_plugin_manager_toggle_plugins -+ (&globals.plugin_manager, &globals.plugin_container, -+ globals.ind_cfg.enabled_plugins); - - ForAllIndicators () { - gkbd_indicator_reinit_ui (gki); -@@ -465,8 +477,8 @@ gkbd_indicator_kbd_cfg_callback (GkbdInd - } - - gkbd_indicator_load_group_names ((const gchar **) xklrec->layouts, -- (const gchar **) xklrec-> -- variants); -+ (const gchar **) -+ xklrec->variants); - - ForAllIndicators () { - gkbd_indicator_reinit_ui (gki); -@@ -664,8 +676,8 @@ gkbd_indicator_global_term (void) - gkbd_desktop_config_stop_listen (&globals.cfg); - gkbd_indicator_config_stop_listen (&globals.ind_cfg); - -- gkbd_indicator_plugin_manager_term_initialized_plugins (&globals. -- plugin_manager); -+ gkbd_indicator_plugin_manager_term_initialized_plugins -+ (&globals.plugin_manager); - gkbd_indicator_plugin_manager_term (&globals.plugin_manager); - - gkbd_indicator_config_term (&globals.ind_cfg); -@@ -756,18 +768,14 @@ gkbd_indicator_global_init (void) - gkbd_indicator_config_activate (&globals.ind_cfg); - - gkbd_indicator_load_group_names ((const gchar **) xklrec->layouts, -- (const gchar **) xklrec-> -- variants); -+ (const gchar **) -+ xklrec->variants); - g_object_unref (G_OBJECT (xklrec)); - - gkbd_indicator_plugin_manager_init (&globals.plugin_manager); -- gkbd_indicator_plugin_manager_init_enabled_plugins (&globals. -- plugin_manager, -- &globals. -- plugin_container, -- globals. -- ind_cfg. -- enabled_plugins); -+ gkbd_indicator_plugin_manager_init_enabled_plugins -+ (&globals.plugin_manager, &globals.plugin_container, -+ globals.ind_cfg.enabled_plugins); - gkbd_desktop_config_start_listen (&globals.cfg, - (GConfClientNotifyFunc) - gkbd_indicator_cfg_changed, -@@ -821,10 +829,9 @@ gkbd_indicator_get_image_filename (guint - { - if (!globals.ind_cfg.show_flags) - return NULL; -- return gkbd_indicator_config_get_images_file (&globals. -- ind_cfg, -- &globals. -- kbd_cfg, group); -+ return gkbd_indicator_config_get_images_file (&globals.ind_cfg, -+ &globals.kbd_cfg, -+ group); - } - - gdouble |