gnome-shell: Install config files to examples.

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 13:00:56 2020 +0100
Changeset:	e4b7f1440ae3a5bddcbbd9f317a1e7f672e3a3c2

Modified Files:
	gnome-shell/Makefile
	gnome-shell/PLIST
	gnome-shell/distinfo
	gnome-shell/patches/patch-src_shell-util.c
Added Files:
	gnome-shell/patches/patch-meson.build

Log Message:
gnome-shell: Install config files to examples.

Only disable uselocale usage on NetBSD.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4b7f1440ae3a5bddcbbd9f317a1e7f672e3a3c2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-shell/Makefile                       |  5 ++++-
 gnome-shell/PLIST                          |  2 +-
 gnome-shell/distinfo                       |  3 ++-
 gnome-shell/patches/patch-meson.build      | 15 +++++++++++++++
 gnome-shell/patches/patch-src_shell-util.c | 20 ++++++++++++++------
 5 files changed, 36 insertions(+), 9 deletions(-)

diffs:
diff --git a/gnome-shell/Makefile b/gnome-shell/Makefile
index 9e5f0bd62f..a418b2b39c 100644
--- a/gnome-shell/Makefile
+++ b/gnome-shell/Makefile
@@ -25,6 +25,9 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/subprojects/gvc
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-shell
 
+CONF_FILES+=	${PREFIX}/share/examples/xdg/autostart/gnome-shell-overrides-migration.desktop \
+		${PKG_SYSCONFDIR}/xdg/autostart/gnome-shell-overrides-migration.desktop
+
 .include "../../mk/bsd.prefs.mk"
 
 # msgfmt: unknown option -- desktop
@@ -47,7 +50,7 @@ post-extract:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
-.include "../../wip/gjs/buildlink3.mk"
+.include "../../lang/gjs/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
diff --git a/gnome-shell/PLIST b/gnome-shell/PLIST
index ab0f8640f5..055e955279 100644
--- a/gnome-shell/PLIST
+++ b/gnome-shell/PLIST
@@ -2,7 +2,6 @@
 bin/gnome-shell
 bin/gnome-shell-extension-prefs
 bin/gnome-shell-perf-tool
-etc/xdg/autostart/gnome-shell-overrides-migration.desktop
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
@@ -32,6 +31,7 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 share/dbus-1/services/org.gnome.Shell.Extensions.service
 share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 share/dbus-1/services/org.gnome.Shell.Notifications.service
+share/examples/xdg/autostart/gnome-shell-overrides-migration.desktop
 share/glib-2.0/schemas/00_org.gnome.shell.gschema.override
 share/glib-2.0/schemas/org.gnome.shell.gschema.xml
 share/gnome-control-center/keybindings/50-gnome-shell-system.xml
diff --git a/gnome-shell/distinfo b/gnome-shell/distinfo
index 6c7cf04376..805032bdb3 100644
--- a/gnome-shell/distinfo
+++ b/gnome-shell/distinfo
@@ -7,4 +7,5 @@ Size (gnome-shell-3.38.1.tar.xz) = 1812860 bytes
 SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7
 SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c
 SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c
-SHA1 (patch-src_shell-util.c) = 830dd5dec94775b64aeaed1738da2384f19c6ec7
+SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7
+SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6
diff --git a/gnome-shell/patches/patch-meson.build b/gnome-shell/patches/patch-meson.build
new file mode 100644
index 0000000000..3ad9e51503
--- /dev/null
+++ b/gnome-shell/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Install config files to examples.
+
+--- meson.build.orig	2020-10-05 18:36:07.906838400 +0000
++++ meson.build
+@@ -52,7 +52,7 @@ sysconfdir = join_paths(prefix, get_opti
+ pkgdatadir = join_paths(datadir, meson.project_name())
+ pkglibdir = join_paths(libdir, meson.project_name())
+ 
+-autostartdir = join_paths(sysconfdir, 'xdg', 'autostart')
++autostartdir = join_paths(datadir, 'examples', 'xdg', 'autostart')
+ convertdir = join_paths(datadir, 'GConf', 'gsettings')
+ desktopdir = join_paths(datadir, 'applications')
+ icondir = join_paths(datadir, 'icons')
diff --git a/gnome-shell/patches/patch-src_shell-util.c b/gnome-shell/patches/patch-src_shell-util.c
index 659df9b6da..63f9b871e9 100644
--- a/gnome-shell/patches/patch-src_shell-util.c
+++ b/gnome-shell/patches/patch-src_shell-util.c
@@ -2,20 +2,28 @@ $NetBSD$
 
 Quick ugly fix, breaks time string translation/format
 
---- src/shell-util.c.orig	2020-06-02 23:41:06.254288000 +0000
+--- src/shell-util.c.orig	2020-10-05 18:36:07.971836800 +0000
 +++ src/shell-util.c
-@@ -212,12 +212,12 @@ shell_util_translate_time_string (const 
+@@ -154,18 +154,22 @@ shell_util_translate_time_string (const 
+   locale_t old_loc;
+   locale_t loc = (locale_t) 0;
+ 
++#ifndef __NetBSD__
    if (locale)
      loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
  
--  old_loc = uselocale (loc);
-+  //old_loc = uselocale (loc);
+   old_loc = uselocale (loc);
++#endif
  
    sep = strchr (str, '\004');
    res = g_dpgettext (NULL, str, sep ? sep - str + 1 : 0);
  
--  uselocale (old_loc);
-+  //uselocale (old_loc);
++#ifndef __NetBSD__
+   uselocale (old_loc);
  
    if (loc != (locale_t) 0)
      freelocale (loc);
++#endif
+ 
+   return res;
+ }