- Move libgnomekbd to libgnomekbd2 for older Gnome2 packages

- Import libgnomekbd 3.6.0 for Cinnamon and Gnome3.

13 files changed, 43 insertions, 43 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 34492da0b20..65ec41e0f91 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -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
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index f92e2f31bda..46b55489a06 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -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+=	gnome-panel>=2.31.2
 .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"
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 6227dd9a013..d082f9d47f3 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -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"
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 7401a6420dc..7ecdb3aa283 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -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.11.5
 .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"
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 4ecea905edf..26add258461 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -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"
diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST
index 72e5071f81a..e12c78326ce 100644
--- a/x11/libgnomekbd/PLIST
+++ b/x11/libgnomekbd/PLIST
@@ -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.mo
 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.mo
 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
diff --git a/x11/libgnomekbd/buildlink3.mk b/x11/libgnomekbd/buildlink3.mk
index 89fc536f804..219b39be16a 100644
--- a/x11/libgnomekbd/buildlink3.mk
+++ b/x11/libgnomekbd/buildlink3.mk
@@ -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"
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index fd39b0ae57a..56e88bfec13 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -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
diff --git a/x11/libgnomekbd/patches/patch-aa b/x11/libgnomekbd2/patches/patch-aa
index 6c300c168d0..482e3959127 100644
--- a/x11/libgnomekbd/patches/patch-aa
+++ b/x11/libgnomekbd2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2008/06/02 16:42:21 drochner Exp $
+$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
diff --git a/x11/libgnomekbd/patches/patch-ab b/x11/libgnomekbd2/patches/patch-ab
index cf90acf1d92..9c1372cd970 100644
--- a/x11/libgnomekbd/patches/patch-ab
+++ b/x11/libgnomekbd2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2008/06/02 16:42:21 drochner Exp $
+$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
diff --git a/x11/libgnomekbd/patches/patch-ad b/x11/libgnomekbd2/patches/patch-ad
index bf4f7fffb42..b63a60f66e7 100644
--- a/x11/libgnomekbd/patches/patch-ad
+++ b/x11/libgnomekbd2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2008/06/02 16:42:21 drochner Exp $
+$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
diff --git a/x11/libgnomekbd/patches/patch-ae b/x11/libgnomekbd2/patches/patch-ae
index 5a9da9e84e8..973a5e3aa81 100644
--- a/x11/libgnomekbd/patches/patch-ae
+++ b/x11/libgnomekbd2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2009/10/22 17:09:35 drochner Exp $
+$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
diff --git a/x11/libgnomekbd/patches/patch-af b/x11/libgnomekbd2/patches/patch-af
index 683052d62db..381fdcbbc00 100644
--- a/x11/libgnomekbd/patches/patch-af
+++ b/x11/libgnomekbd2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2009/10/22 17:09:35 drochner Exp $
+$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