x11: remove libgnomekbd2 - no longer used gnome 2 component

11 files changed, 1 insertions, 271 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 7330d231dc2..6fdfbe0a5b0 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.898 2020/05/15 11:54:25 nia Exp $
+# $NetBSD: Makefile,v 1.899 2020/05/28 12:22:08 nia Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -230,7 +230,6 @@ SUBDIR+=	libdrm
 SUBDIR+=	libfakekey
 SUBDIR+=	libfm-qt
 SUBDIR+=	libgnomekbd
-SUBDIR+=	libgnomekbd2
 SUBDIR+=	libkactivities4
 SUBDIR+=	libkscreen
 SUBDIR+=	liblxqt
diff --git a/x11/libgnomekbd2/DESCR b/x11/libgnomekbd2/DESCR
deleted file mode 100644
index bc33ae4c24b..00000000000
--- a/x11/libgnomekbd2/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Gnome keyboard configuration library
diff --git a/x11/libgnomekbd2/Makefile b/x11/libgnomekbd2/Makefile
deleted file mode 100644
index a02c3261284..00000000000
--- a/x11/libgnomekbd2/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2020/03/10 22:11:15 wiz Exp $
-#
-
-DISTNAME=	libgnomekbd-2.32.0
-PKGNAME=	libgnomekbd2-2.32.0
-PKGREVISION=	29
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.32/}
-EXTRACT_SUFX=	.tar.bz2
-
-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
-
-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"
-BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=4.0
-.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libgnomekbd2/PLIST b/x11/libgnomekbd2/PLIST
deleted file mode 100644
index d4a19f3ef73..00000000000
--- a/x11/libgnomekbd2/PLIST
+++ /dev/null
@@ -1,87 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2018/06/01 17:10:50 youri Exp $
-bin/gkbd-indicator-plugins-capplet
-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
-include/libgnomekbd/gkbd-status.h
-include/libgnomekbd/gkbd-util.h
-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/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@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
-share/locale/dz/LC_MESSAGES/libgnomekbd.mo
-share/locale/el/LC_MESSAGES/libgnomekbd.mo
-share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo
-share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
-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/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
-share/locale/hi/LC_MESSAGES/libgnomekbd.mo
-share/locale/hu/LC_MESSAGES/libgnomekbd.mo
-share/locale/id/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
-share/locale/ms/LC_MESSAGES/libgnomekbd.mo
-share/locale/nb/LC_MESSAGES/libgnomekbd.mo
-share/locale/nl/LC_MESSAGES/libgnomekbd.mo
-share/locale/nn/LC_MESSAGES/libgnomekbd.mo
-share/locale/oc/LC_MESSAGES/libgnomekbd.mo
-share/locale/or/LC_MESSAGES/libgnomekbd.mo
-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/sk/LC_MESSAGES/libgnomekbd.mo
-share/locale/sl/LC_MESSAGES/libgnomekbd.mo
-share/locale/sq/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo
-share/locale/sv/LC_MESSAGES/libgnomekbd.mo
-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/uk/LC_MESSAGES/libgnomekbd.mo
-share/locale/vi/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/libgnomekbd2/buildlink3.mk b/x11/libgnomekbd2/buildlink3.mk
deleted file mode 100644
index ce9373fc6b7..00000000000
--- a/x11/libgnomekbd2/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/06/01 17:10:50 youri Exp $
-
-BUILDLINK_TREE+=	libgnomekbd2
-
-.if !defined(LIBGNOMEKBD2_BUILDLINK3_MK)
-LIBGNOMEKBD2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libgnomekbd2+=	libgnomekbd2>=2.18.0
-BUILDLINK_ABI_DEPENDS.libgnomekbd2+=	libgnomekbd2>=2.32.0nb19
-BUILDLINK_PKGSRCDIR.libgnomekbd2?=	../../x11/libgnomekbd2
-
-.include "../../x11/libxklavier/buildlink3.mk"
-.endif # LIBGNOMEKBD2_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libgnomekbd2
diff --git a/x11/libgnomekbd2/distinfo b/x11/libgnomekbd2/distinfo
deleted file mode 100644
index 5cc9647dff3..00000000000
--- a/x11/libgnomekbd2/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1 2018/06/01 17:10:50 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
diff --git a/x11/libgnomekbd2/patches/patch-aa b/x11/libgnomekbd2/patches/patch-aa
deleted file mode 100644
index 482e3959127..00000000000
--- a/x11/libgnomekbd2/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$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
diff --git a/x11/libgnomekbd2/patches/patch-ab b/x11/libgnomekbd2/patches/patch-ab
deleted file mode 100644
index 9c1372cd970..00000000000
--- a/x11/libgnomekbd2/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$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);
- }
- 
diff --git a/x11/libgnomekbd2/patches/patch-ad b/x11/libgnomekbd2/patches/patch-ad
deleted file mode 100644
index b63a60f66e7..00000000000
--- a/x11/libgnomekbd2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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) {
diff --git a/x11/libgnomekbd2/patches/patch-ae b/x11/libgnomekbd2/patches/patch-ae
deleted file mode 100644
index 973a5e3aa81..00000000000
--- a/x11/libgnomekbd2/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$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 ("<small><i>",
- 					 _("No description."),
--					 "</i></small>", NULL));
-+					 "</i></small>", VPNULL));
- 	gtk_label_set_use_markup (GTK_LABEL (lblDescription), TRUE);
- 
- 	if (gtk_tree_selection_get_selected
-@@ -145,7 +145,7 @@ CappletActivePluginsSelectionChanged (Gt
- 							 plugin->
- 							 description,
- 							 "</i></small>",
--							 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 ();
- 
diff --git a/x11/libgnomekbd2/patches/patch-af b/x11/libgnomekbd2/patches/patch-af
deleted file mode 100644
index 381fdcbbc00..00000000000
--- a/x11/libgnomekbd2/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$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 ("<small><i>",
- 				   _("No description."),
--				   "</i></small>", NULL));
-+				   "</i></small>", 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 ("<small><i>",
- 					 plugin->
--					 description, "</i></small>", NULL));
-+					 description, "</i></small>", 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;
-