Received: by mail.netbsd.org (Postfix, from userid 605) id B6CAE84D33; Fri, 1 Jun 2018 17:04:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BC06284D32 for ; Fri, 1 Jun 2018 17:04:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id MQ95Vp9ugHIR for ; Fri, 1 Jun 2018 17:04:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D299084CFB for ; Fri, 1 Jun 2018 17:04:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CBB25FBEC; Fri, 1 Jun 2018 17:04:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152787265821500" MIME-Version: 1.0 Date: Fri, 1 Jun 2018 17:04:18 +0000 From: "Youri Mouton" Subject: CVS commit: pkgsrc/x11 To: pkgsrc-changes@NetBSD.org Reply-To: youri@netbsd.org X-Mailer: log_accum Message-Id: <20180601170418.CBB25FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_152787265821500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: youri Date: Fri Jun 1 17:04:18 UTC 2018 Modified Files: pkgsrc/x11: Makefile pkgsrc/x11/gnome-applets: Makefile pkgsrc/x11/gnome-control-center: Makefile pkgsrc/x11/gnome-screensaver: Makefile pkgsrc/x11/libgnomekbd: Makefile PLIST buildlink3.mk distinfo Added Files: pkgsrc/x11/libgnomekbd2/patches: patch-aa patch-ab patch-ad patch-ae patch-af Removed Files: pkgsrc/x11/libgnomekbd/patches: patch-aa patch-ab patch-ad patch-ae patch-af Log Message: - Move libgnomekbd to libgnomekbd2 for older Gnome2 packages - Import libgnomekbd 3.6.0 for Cinnamon and Gnome3. To generate a diff of this commit: cvs rdiff -u -r1.820 -r1.821 pkgsrc/x11/Makefile cvs rdiff -u -r1.153 -r1.154 pkgsrc/x11/gnome-applets/Makefile cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/gnome-control-center/Makefile cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/gnome-screensaver/Makefile cvs rdiff -u -r1.56 -r1.57 pkgsrc/x11/libgnomekbd/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libgnomekbd/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/libgnomekbd/buildlink3.mk cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libgnomekbd/distinfo cvs rdiff -u -r1.4 -r0 pkgsrc/x11/libgnomekbd/patches/patch-aa cvs rdiff -u -r1.1 -r0 pkgsrc/x11/libgnomekbd/patches/patch-ab \ pkgsrc/x11/libgnomekbd/patches/patch-ad cvs rdiff -u -r1.2 -r0 pkgsrc/x11/libgnomekbd/patches/patch-ae \ pkgsrc/x11/libgnomekbd/patches/patch-af cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libgnomekbd2/patches/patch-aa \ pkgsrc/x11/libgnomekbd2/patches/patch-ab \ pkgsrc/x11/libgnomekbd2/patches/patch-ad \ pkgsrc/x11/libgnomekbd2/patches/patch-ae \ pkgsrc/x11/libgnomekbd2/patches/patch-af Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152787265821500 Content-Disposition: inline Content-Length: 15163 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/Makefile diff -u pkgsrc/x11/Makefile:1.820 pkgsrc/x11/Makefile:1.821 --- pkgsrc/x11/Makefile:1.820 Fri May 18 14:51:55 2018 +++ pkgsrc/x11/Makefile Fri Jun 1 17:04:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.820 2018/05/18 14:51:55 youri Exp $ +# $NetBSD: Makefile,v 1.821 2018/06/01 17:04:18 youri Exp $ # COMMENT= Packages to support the X window system @@ -251,6 +251,7 @@ SUBDIR+= libdesktop-agnostic SUBDIR+= libdrm SUBDIR+= libfakekey SUBDIR+= libgnomekbd +SUBDIR+= libgnomekbd2 SUBDIR+= libkactivities4 SUBDIR+= liblbxutil SUBDIR+= libmatekbd Index: pkgsrc/x11/gnome-applets/Makefile diff -u pkgsrc/x11/gnome-applets/Makefile:1.153 pkgsrc/x11/gnome-applets/Makefile:1.154 --- pkgsrc/x11/gnome-applets/Makefile:1.153 Mon Apr 16 14:35:21 2018 +++ pkgsrc/x11/gnome-applets/Makefile Fri Jun 1 17:04:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2018/04/16 14:35:21 wiz Exp $ +# $NetBSD: Makefile,v 1.154 2018/06/01 17:04:18 youri Exp $ DISTNAME= gnome-applets-2.32.1.1 PKGREVISION= 58 @@ -88,7 +88,7 @@ BUILDLINK_API_DEPENDS.gnome-panel+= gnom .include "../../x11/gnome-panel/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.13.0 .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libgnomekbd/buildlink3.mk" +.include "../../x11/libgnomekbd2/buildlink3.mk" .include "../../x11/libxklavier/buildlink3.mk" .include "../../x11/py-gnome2-desktop/buildlink3.mk" .include "../../x11/py-gnome2/buildlink3.mk" Index: pkgsrc/x11/gnome-control-center/Makefile diff -u pkgsrc/x11/gnome-control-center/Makefile:1.96 pkgsrc/x11/gnome-control-center/Makefile:1.97 --- pkgsrc/x11/gnome-control-center/Makefile:1.96 Mon Apr 16 14:33:58 2018 +++ pkgsrc/x11/gnome-control-center/Makefile Fri Jun 1 17:04:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2018/04/16 14:33:58 wiz Exp $ +# $NetBSD: Makefile,v 1.97 2018/06/01 17:04:18 youri Exp $ # DISTNAME= gnome-control-center-2.32.1 @@ -73,8 +73,8 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../x11/libXxf86misc/buildlink3.mk" BUILDLINK_API_DEPENDS.libxklavier= libxklavier>=4.0 .include "../../x11/libxklavier/buildlink3.mk" -BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.31.1 -.include "../../x11/libgnomekbd/buildlink3.mk" +BUILDLINK_API_DEPENDS.libgnomekbd2+= libgnomekbd2>=2.31.1 +.include "../../x11/libgnomekbd2/buildlink3.mk" .include "../../x11/libunique/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" .include "../../sysutils/gnome-settings-daemon/buildlink3.mk" Index: pkgsrc/x11/gnome-screensaver/Makefile diff -u pkgsrc/x11/gnome-screensaver/Makefile:1.76 pkgsrc/x11/gnome-screensaver/Makefile:1.77 --- pkgsrc/x11/gnome-screensaver/Makefile:1.76 Mon Apr 16 14:35:21 2018 +++ pkgsrc/x11/gnome-screensaver/Makefile Fri Jun 1 17:04:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2018/04/16 14:35:21 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2018/06/01 17:04:18 youri Exp $ # DISTNAME= gnome-screensaver-2.30.2 @@ -74,5 +74,5 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.1 .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXxf86misc/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" -.include "../../x11/libgnomekbd/buildlink3.mk" +.include "../../x11/libgnomekbd2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/libgnomekbd/Makefile diff -u pkgsrc/x11/libgnomekbd/Makefile:1.56 pkgsrc/x11/libgnomekbd/Makefile:1.57 --- pkgsrc/x11/libgnomekbd/Makefile:1.56 Mon Apr 16 14:35:22 2018 +++ pkgsrc/x11/libgnomekbd/Makefile Fri Jun 1 17:04:18 2018 @@ -1,30 +1,27 @@ -# $NetBSD: Makefile,v 1.56 2018/04/16 14:35:22 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2018/06/01 17:04:18 youri Exp $ # -DISTNAME= libgnomekbd-2.32.0 -PKGREVISION= 24 +DISTNAME= libgnomekbd-3.6.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.32/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/3.6/} +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.gnome.org/ COMMENT= Gnome keyboard configuration library - -# used a library before it was created -MAKE_JOBS_SAFE= no +LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake msgfmt -GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas PKGCONFIG_OVERRIDE+= libgnomekbd.pc.in PKGCONFIG_OVERRIDE+= libgnomekbdui.pc.in .include "../../devel/GConf/schemas.mk" -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=4.0 .include "../../x11/libxklavier/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/libgnomekbd/PLIST diff -u pkgsrc/x11/libgnomekbd/PLIST:1.12 pkgsrc/x11/libgnomekbd/PLIST:1.13 --- pkgsrc/x11/libgnomekbd/PLIST:1.12 Wed Nov 24 20:37:33 2010 +++ pkgsrc/x11/libgnomekbd/PLIST Fri Jun 1 17:04:18 2018 @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.12 2010/11/24 20:37:33 drochner Exp $ -bin/gkbd-indicator-plugins-capplet +@comment $NetBSD: PLIST,v 1.13 2018/06/01 17:04:18 youri Exp $ +bin/gkbd-keyboard-display +include/libgnomekbd/gkbd-configuration.h include/libgnomekbd/gkbd-desktop-config.h include/libgnomekbd/gkbd-indicator-config.h -include/libgnomekbd/gkbd-indicator-plugin.h include/libgnomekbd/gkbd-indicator.h include/libgnomekbd/gkbd-keyboard-config.h include/libgnomekbd/gkbd-keyboard-drawing.h @@ -12,14 +12,19 @@ lib/libgnomekbd.la lib/libgnomekbdui.la 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/ui/gkbd-indicator-plugins.ui -share/libgnomekbd/ui/gkbd-indicator-plugins_add.ui +share/GConf/gsettings/libgnomekbd.convert +share/applications/gkbd-keyboard-display.desktop +share/glib-2.0/schemas/org.gnome.libgnomekbd.desktop.gschema.xml +share/glib-2.0/schemas/org.gnome.libgnomekbd.gschema.xml +share/glib-2.0/schemas/org.gnome.libgnomekbd.keyboard.gschema.xml +share/libgnomekbd/icons/kbdled-caps-lock.svg +share/libgnomekbd/icons/kbdled-num-lock.svg +share/libgnomekbd/icons/kbdled-scroll-lock.svg share/libgnomekbd/ui/show-layout.ui share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/as/LC_MESSAGES/libgnomekbd.mo share/locale/ast/LC_MESSAGES/libgnomekbd.mo +share/locale/be/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 @@ -37,6 +42,7 @@ share/locale/eo/LC_MESSAGES/libgnomekbd. share/locale/es/LC_MESSAGES/libgnomekbd.mo share/locale/et/LC_MESSAGES/libgnomekbd.mo share/locale/eu/LC_MESSAGES/libgnomekbd.mo +share/locale/fa/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 @@ -80,6 +86,7 @@ share/locale/ta/LC_MESSAGES/libgnomekbd. share/locale/te/LC_MESSAGES/libgnomekbd.mo share/locale/th/LC_MESSAGES/libgnomekbd.mo share/locale/tr/LC_MESSAGES/libgnomekbd.mo +share/locale/ug/LC_MESSAGES/libgnomekbd.mo share/locale/uk/LC_MESSAGES/libgnomekbd.mo share/locale/vi/LC_MESSAGES/libgnomekbd.mo share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo Index: pkgsrc/x11/libgnomekbd/buildlink3.mk diff -u pkgsrc/x11/libgnomekbd/buildlink3.mk:1.10 pkgsrc/x11/libgnomekbd/buildlink3.mk:1.11 --- pkgsrc/x11/libgnomekbd/buildlink3.mk:1.10 Sat Mar 12 11:28:37 2016 +++ pkgsrc/x11/libgnomekbd/buildlink3.mk Fri Jun 1 17:04:18 2018 @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/03/12 11:28:37 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/06/01 17:04:18 youri Exp $ BUILDLINK_TREE+= libgnomekbd .if !defined(LIBGNOMEKBD_BUILDLINK3_MK) LIBGNOMEKBD_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=2.18.0 -BUILDLINK_ABI_DEPENDS.libgnomekbd+= libgnomekbd>=2.32.0nb19 +BUILDLINK_API_DEPENDS.libgnomekbd+= libgnomekbd>=3.6.0 +BUILDLINK_ABI_DEPENDS.libgnomekbd+= libgnomekbd>=3.6.0 BUILDLINK_PKGSRCDIR.libgnomekbd?= ../../x11/libgnomekbd .include "../../x11/libxklavier/buildlink3.mk" Index: pkgsrc/x11/libgnomekbd/distinfo diff -u pkgsrc/x11/libgnomekbd/distinfo:1.14 pkgsrc/x11/libgnomekbd/distinfo:1.15 --- pkgsrc/x11/libgnomekbd/distinfo:1.14 Wed Nov 4 03:28:47 2015 +++ pkgsrc/x11/libgnomekbd/distinfo Fri Jun 1 17:04:18 2018 @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.14 2015/11/04 03:28:47 agc Exp $ +$NetBSD: distinfo,v 1.15 2018/06/01 17:04:18 youri Exp $ -SHA1 (libgnomekbd-2.32.0.tar.bz2) = 8401db5d7888185fb3a5855f316771aa09865403 -RMD160 (libgnomekbd-2.32.0.tar.bz2) = 5ecca30979373f746224693c6b9ff8b6fe2a8e18 -SHA512 (libgnomekbd-2.32.0.tar.bz2) = 7e60a613d28735b478a7480b4a90505bfdfd6d98398860b9d1ad5074ad4fad7e39c9d5865add1d3efc324d0c4c2501531ddd1a281055e797a543b05fe815d3f4 -Size (libgnomekbd-2.32.0.tar.bz2) = 410928 bytes -SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde -SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98 -SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126 -SHA1 (patch-ae) = d1934ff031e0594f99fa855a58c85b81a1344998 -SHA1 (patch-af) = ad483eec16da6bb9bb6b733e30cd6784899f95ca +SHA1 (libgnomekbd-3.6.0.tar.xz) = 4375d2cb8cbdbad7a4f59a8b99edd58cfa328597 +RMD160 (libgnomekbd-3.6.0.tar.xz) = 59ecbefb14f92e7c896ca4416d5f09e45a2b30a9 +SHA512 (libgnomekbd-3.6.0.tar.xz) = 27d0711eeebba91ca0dbed079c17acfec97116153a01f4f6e78cb30044afc534c438f655c6836b74b377acb8116d3b70e1f09578f182bb4fc51d8d05e89c6f17 +Size (libgnomekbd-3.6.0.tar.xz) = 373588 bytes Added files: Index: pkgsrc/x11/libgnomekbd2/patches/patch-aa diff -u /dev/null pkgsrc/x11/libgnomekbd2/patches/patch-aa:1.1 --- /dev/null Fri Jun 1 17:04:18 2018 +++ pkgsrc/x11/libgnomekbd2/patches/patch-aa Fri Jun 1 17:04:18 2018 @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1 2018/06/01 17:04:18 youri Exp $ + +--- config.h.in.orig 2008-05-31 14:33:00.000000000 +0200 ++++ config.h.in +@@ -80,3 +80,15 @@ + + /* Define to 1 if the X Window System is missing or not being used. */ + #undef X_DISPLAY_MISSING ++ ++/* ++ * If NULL is just "0", and is used to terminate the argument list ++ * of functions with the gcc "sentinel" attribute, gcc4 emits ++ * a warning. Temporarily work around the issue until all supported ++ * platforms have the correct definition. ++ */ ++#ifdef __DragonFly__ /* releases prior to 2.0 */ ++#define VPNULL (void *)NULL ++#else ++#define VPNULL NULL ++#endif Index: pkgsrc/x11/libgnomekbd2/patches/patch-ab diff -u /dev/null pkgsrc/x11/libgnomekbd2/patches/patch-ab:1.1 --- /dev/null Fri Jun 1 17:04:18 2018 +++ pkgsrc/x11/libgnomekbd2/patches/patch-ab Fri Jun 1 17:04:18 2018 @@ -0,0 +1,29 @@ +$NetBSD: patch-ab,v 1.1 2018/06/01 17:04:18 youri Exp $ + +--- libgnomekbd/gkbd-indicator-config.c.orig 2008-05-31 14:43:07.000000000 +0200 ++++ libgnomekbd/gkbd-indicator-config.c +@@ -213,21 +213,21 @@ gkbd_indicator_config_init (GkbdIndicato + g_build_filename (g_get_home_dir + (), + ".icons/flags", +- NULL)); ++ VPNULL)); + g_free (sp); + + gtk_icon_theme_append_search_path (ind_config->icon_theme, + sp = + g_build_filename (DATADIR, + "pixmaps/flags", +- NULL)); ++ VPNULL)); + g_free (sp); + + gtk_icon_theme_append_search_path (ind_config->icon_theme, + sp = + g_build_filename (DATADIR, + "icons/flags", +- NULL)); ++ VPNULL)); + g_free (sp); + } + Index: pkgsrc/x11/libgnomekbd2/patches/patch-ad diff -u /dev/null pkgsrc/x11/libgnomekbd2/patches/patch-ad:1.1 --- /dev/null Fri Jun 1 17:04:18 2018 +++ pkgsrc/x11/libgnomekbd2/patches/patch-ad Fri Jun 1 17:04:18 2018 @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2018/06/01 17:04:18 youri Exp $ + +--- libgnomekbd/gkbd-indicator-plugin-manager.c.orig 2008-05-31 14:45:15.000000000 +0200 ++++ libgnomekbd/gkbd-indicator-plugin-manager.c +@@ -53,7 +53,7 @@ gkbd_indicator_plugin_manager_add_plugin + xkl_debug (100, "Scanning [%s]...\n", dirname); + while ((filename = g_dir_read_name (dir)) != NULL) { + gchar *full_path = +- g_build_filename (dirname, filename, NULL); ++ g_build_filename (dirname, filename, VPNULL); + xkl_debug (100, "Loading plugin module [%s]...\n", + full_path); + if (full_path != NULL) { Index: pkgsrc/x11/libgnomekbd2/patches/patch-ae diff -u /dev/null pkgsrc/x11/libgnomekbd2/patches/patch-ae:1.1 --- /dev/null Fri Jun 1 17:04:18 2018 +++ pkgsrc/x11/libgnomekbd2/patches/patch-ae Fri Jun 1 17:04:18 2018 @@ -0,0 +1,31 @@ +$NetBSD: patch-ae,v 1.1 2018/06/01 17:04:18 youri Exp $ + +--- capplet/gkbd-indicator-plugins-capplet.c.orig 2009-09-14 20:53:43.000000000 +0200 ++++ capplet/gkbd-indicator-plugins-capplet.c +@@ -116,7 +116,7 @@ CappletActivePluginsSelectionChanged (Gt + gtk_label_set_text (GTK_LABEL (lblDescription), + g_strconcat ("", + _("No description."), +- "", NULL)); ++ "", VPNULL)); + gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); + + if (gtk_tree_selection_get_selected +@@ -145,7 +145,7 @@ CappletActivePluginsSelectionChanged (Gt + plugin-> + description, + "", +- NULL)); ++ VPNULL)); + gtk_label_set_use_markup (GTK_LABEL + (lblDescription), TRUE); + } +@@ -284,7 +284,7 @@ CappletSetup (GkbdIndicatorPluginsCapple + GtkTreeViewColumn *column = + gtk_tree_view_column_new_with_attributes (NULL, renderer, + "text", 0, +- NULL); ++ VPNULL); + GtkTreeSelection *selection; + builder = gtk_builder_new (); + Index: pkgsrc/x11/libgnomekbd2/patches/patch-af diff -u /dev/null pkgsrc/x11/libgnomekbd2/patches/patch-af:1.1 --- /dev/null Fri Jun 1 17:04:18 2018 +++ pkgsrc/x11/libgnomekbd2/patches/patch-af Fri Jun 1 17:04:18 2018 @@ -0,0 +1,31 @@ +$NetBSD: patch-af,v 1.1 2018/06/01 17:04:18 youri Exp $ + +--- 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), + g_strconcat ("", + _("No description."), +- "", NULL)); ++ "", VPNULL)); + gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); + + if (fullPath != NULL) +@@ -116,7 +116,7 @@ CappletAvailablePluginsSelectionChanged + gtk_label_set_text (GTK_LABEL (lblDescription), + g_strconcat ("", + plugin-> +- description, "", NULL)); ++ description, "", VPNULL)); + gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE); + } + gtk_widget_set_sensitive (GTK_WIDGET +@@ -141,7 +141,7 @@ CappletEnablePlugin (GtkWidget * btnAdd, + renderer, + "text", + 0, +- NULL); ++ VPNULL); + GtkTreeSelection *selection; + gint response; + --_----------=_152787265821500--