Fri Mar 11 07:37:41 2022 UTC ()
gnome-shell: fix build with latest meson


(nia)
diff -r1.5 -r1.6 pkgsrc/x11/gnome-shell/distinfo
diff -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-data_meson.build
diff -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build
cvs diff -r1.5 -r1.6 pkgsrc/x11/gnome-shell/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-shell/distinfo 2021/10/26 11:33:49 1.5
+++ pkgsrc/x11/gnome-shell/distinfo 2022/03/11 07:37:41 1.6
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 11:33:49 nia Exp $ 1$NetBSD: distinfo,v 1.6 2022/03/11 07:37:41 nia Exp $
2 2
3BLAKE2s (gnome-shell-40.2.tar.xz) = 865b979ac26f1dcbe401dec8f0fba2ea00dc8d42ae594bb43cb797e7c304306d 3BLAKE2s (gnome-shell-40.2.tar.xz) = 865b979ac26f1dcbe401dec8f0fba2ea00dc8d42ae594bb43cb797e7c304306d
4SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87 4SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87
5Size (gnome-shell-40.2.tar.xz) = 1869600 bytes 5Size (gnome-shell-40.2.tar.xz) = 1869600 bytes
6SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7 6SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7
 7SHA1 (patch-data_meson.build) = 3b9949fbdc34c547b8778506b75ffca10f3834e1
7SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c 8SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c
8SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c 9SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c
9SHA1 (patch-js_ui_main.js) = ea2f5b715fac292019438fe9baec074cf90fe686 10SHA1 (patch-js_ui_main.js) = ea2f5b715fac292019438fe9baec074cf90fe686
10SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7 11SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7
 12SHA1 (patch-src_calendar-server_meson.build) = bd07b27f8e3f19816f255e82445d335db2e462cb
11SHA1 (patch-src_main.c) = d6d109ff7aee58a437aa9389403366e4be241d40 13SHA1 (patch-src_main.c) = d6d109ff7aee58a437aa9389403366e4be241d40
12SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6 14SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6
File Added: pkgsrc/x11/gnome-shell/patches/patch-data_meson.build
$NetBSD: patch-data_meson.build,v 1.1 2022/03/11 07:37:41 nia Exp $

Remove unused positional arguments. Previously they were
ignored, now they cause build failures.

--- data/meson.build.orig	2021-06-10 11:33:01.533931300 +0000
+++ data/meson.build
@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
 desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
 
 foreach desktop_file : desktop_files
-  i18n.merge_file('desktop',
+  i18n.merge_file(
     input: configure_file(
       input: desktop_file + '.in.in',
       output: desktop_file + '.in',
File Added: pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build
$NetBSD: patch-src_calendar-server_meson.build,v 1.1 2022/03/11 07:37:41 nia Exp $

Remove unused positional arguments. Previously they were
ignored, now they cause build failures.

--- src/calendar-server/meson.build.orig	2021-06-10 11:33:01.869923600 +0000
+++ src/calendar-server/meson.build
@@ -27,7 +27,7 @@ configure_file(
   install_dir: servicedir
 )
 
-i18n.merge_file('evolution-calendar.desktop',
+i18n.merge_file(
   input: 'evolution-calendar.desktop.in',
   output: 'evolution-calendar.desktop',
   po_dir: po_dir,