From e0cd8517f6ce1686b5f6689aed225d72468559e4 Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 22 Oct 2009 17:09:35 +0000 Subject: update to 2.28.0 This switches to the gnome-2.28 release branch. --- x11/libgnomekbd/Makefile | 9 ++++----- x11/libgnomekbd/PLIST | 11 +++++++++-- x11/libgnomekbd/distinfo | 13 ++++++------- x11/libgnomekbd/patches/patch-ac | 13 ------------- x11/libgnomekbd/patches/patch-ae | 12 ++++++------ x11/libgnomekbd/patches/patch-af | 8 ++++---- 6 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 x11/libgnomekbd/patches/patch-ac (limited to 'x11') diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 6461a700ac1..8c18ba0fa27 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2009/08/26 19:58:39 sno Exp $ +# $NetBSD: Makefile,v 1.18 2009/10/22 17:09:35 drochner Exp $ # -DISTNAME= libgnomekbd-2.26.0 -PKGREVISION= 2 +DISTNAME= libgnomekbd-2.28.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.26/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.28/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -30,7 +29,7 @@ PKGCONFIG_OVERRIDE+= libgnomekbdui.pc.in .include "../../x11/gtk2/buildlink3.mk" BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=4.0 .include "../../x11/libxklavier/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" +#.include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST index 84ac3af2fd6..022281175bc 100644 --- a/x11/libgnomekbd/PLIST +++ b/x11/libgnomekbd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:24:59 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/10/22 17:09:35 drochner Exp $ bin/gkbd-indicator-plugins-capplet include/libgnomekbd/gkbd-desktop-config.h include/libgnomekbd/gkbd-indicator-config.h @@ -13,12 +13,16 @@ lib/pkgconfig/libgnomekbd.pc lib/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas -share/libgnomekbd/glade/gkbd-indicator-plugins.glade +share/libgnomekbd/ui/gkbd-indicator-plugins.ui +share/libgnomekbd/ui/gkbd-indicator-plugins_add.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo +share/locale/as/LC_MESSAGES/libgnomekbd.mo share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo share/locale/bg/LC_MESSAGES/libgnomekbd.mo +share/locale/bn/LC_MESSAGES/libgnomekbd.mo share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo share/locale/ca/LC_MESSAGES/libgnomekbd.mo +share/locale/ca@valencia/LC_MESSAGES/libgnomekbd.mo share/locale/cs/LC_MESSAGES/libgnomekbd.mo share/locale/da/LC_MESSAGES/libgnomekbd.mo share/locale/de/LC_MESSAGES/libgnomekbd.mo @@ -30,6 +34,7 @@ share/locale/et/LC_MESSAGES/libgnomekbd.mo share/locale/eu/LC_MESSAGES/libgnomekbd.mo share/locale/fi/LC_MESSAGES/libgnomekbd.mo share/locale/fr/LC_MESSAGES/libgnomekbd.mo +share/locale/ga/LC_MESSAGES/libgnomekbd.mo share/locale/gl/LC_MESSAGES/libgnomekbd.mo share/locale/gu/LC_MESSAGES/libgnomekbd.mo share/locale/he/LC_MESSAGES/libgnomekbd.mo @@ -38,9 +43,11 @@ share/locale/hu/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo share/locale/ka/LC_MESSAGES/libgnomekbd.mo +share/locale/kn/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/mai/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 diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index d009beccef6..d7a7dfa5074 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.9 2009/08/14 15:47:31 wiz Exp $ +$NetBSD: distinfo,v 1.10 2009/10/22 17:09:35 drochner Exp $ -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 (libgnomekbd-2.28.0.tar.bz2) = 6d4474b13297885543a66422855f0df222dd35fd +RMD160 (libgnomekbd-2.28.0.tar.bz2) = 8b1767c6df29df3b0aff981d6754e408e3f93de1 +Size (libgnomekbd-2.28.0.tar.bz2) = 392332 bytes SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98 -SHA1 (patch-ac) = e492d0edf4a02d4fe5016f50f7f80aab40bffb93 SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126 -SHA1 (patch-ae) = da103d07fcd3053ad0993b98542a6815dbc5e42b -SHA1 (patch-af) = 0c2569c177846e75e58922b38c9bb8f4fe762162 +SHA1 (patch-ae) = d1934ff031e0594f99fa855a58c85b81a1344998 +SHA1 (patch-af) = ad483eec16da6bb9bb6b733e30cd6784899f95ca diff --git a/x11/libgnomekbd/patches/patch-ac b/x11/libgnomekbd/patches/patch-ac deleted file mode 100644 index 668be09e26d..00000000000 --- a/x11/libgnomekbd/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2009/08/14 15:47:31 wiz Exp $ - ---- libgnomekbd/gkbd-indicator.c.orig 2009-03-13 23:01:12.000000000 +0000 -+++ libgnomekbd/gkbd-indicator.c -@@ -717,7 +717,7 @@ gkbd_indicator_global_init (void) - globals.registry = - xkl_config_registry_get_instance (globals.engine); - -- xkl_config_registry_load (globals.registry); -+ xkl_config_registry_load (globals.registry, FALSE); - - gconf_client = gconf_client_get_default (); - diff --git a/x11/libgnomekbd/patches/patch-ae b/x11/libgnomekbd/patches/patch-ae index 041407af49f..5a9da9e84e8 100644 --- a/x11/libgnomekbd/patches/patch-ae +++ b/x11/libgnomekbd/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2008/06/02 16:42:21 drochner Exp $ +$NetBSD: patch-ae,v 1.2 2009/10/22 17:09:35 drochner Exp $ ---- capplet/gkbd-indicator-plugins-capplet.c.orig 2008-05-31 14:45:57.000000000 +0200 +--- capplet/gkbd-indicator-plugins-capplet.c.orig 2009-09-14 20:53:43.000000000 +0200 +++ capplet/gkbd-indicator-plugins-capplet.c -@@ -120,7 +120,7 @@ CappletActivePluginsSelectionChanged (Gt +@@ -116,7 +116,7 @@ CappletActivePluginsSelectionChanged (Gt gtk_label_set_text (GTK_LABEL (lblDescription), g_strconcat ("", _("No description."), @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2008/06/02 16:42:21 drochner Exp $ gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); if (gtk_tree_selection_get_selected -@@ -149,7 +149,7 @@ CappletActivePluginsSelectionChanged (Gt +@@ -145,7 +145,7 @@ CappletActivePluginsSelectionChanged (Gt plugin-> description, "", @@ -20,12 +20,12 @@ $NetBSD: patch-ae,v 1.1 2008/06/02 16:42:21 drochner Exp $ gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); } -@@ -265,7 +265,7 @@ CappletSetup (GkbdIndicatorPluginsCapple +@@ -284,7 +284,7 @@ CappletSetup (GkbdIndicatorPluginsCapple GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL, renderer, "text", 0, - NULL); + VPNULL); GtkTreeSelection *selection; - glade_gnome_init (); + builder = gtk_builder_new (); diff --git a/x11/libgnomekbd/patches/patch-af b/x11/libgnomekbd/patches/patch-af index ab3b05b9afb..683052d62db 100644 --- a/x11/libgnomekbd/patches/patch-af +++ b/x11/libgnomekbd/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1 2008/06/02 16:42:21 drochner Exp $ +$NetBSD: patch-af,v 1.2 2009/10/22 17:09:35 drochner Exp $ ---- capplet/gkbd-indicator-plugins-add.c.orig 2008-05-31 14:46:50.000000000 +0200 +--- capplet/gkbd-indicator-plugins-add.c.orig 2009-05-13 00:17:30.000000000 +0200 +++ capplet/gkbd-indicator-plugins-add.c @@ -104,7 +104,7 @@ CappletAvailablePluginsSelectionChanged gtk_label_set_text (GTK_LABEL (lblDescription), @@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1 2008/06/02 16:42:21 drochner Exp $ gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); } gtk_widget_set_sensitive (GTK_WIDGET -@@ -142,7 +142,7 @@ CappletEnablePlugin (GtkWidget * btnAdd, +@@ -141,7 +141,7 @@ CappletEnablePlugin (GtkWidget * btnAdd, renderer, "text", 0, @@ -28,4 +28,4 @@ $NetBSD: patch-af,v 1.1 2008/06/02 16:42:21 drochner Exp $ + VPNULL); GtkTreeSelection *selection; gint response; - availablePluginsList = glade_xml_get_widget (data, "allPlugins"); + -- cgit v1.2.3