CVS commit: pkgsrc/x11/gnome-shell

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 11 07:37:41 UTC 2022

Modified Files:
        pkgsrc/x11/gnome-shell: distinfo
Added Files:
        pkgsrc/x11/gnome-shell/patches: patch-data_meson.build
            patch-src_calendar-server_meson.build

Log Message:
gnome-shell: fix build with latest meson


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/gnome-shell/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-shell/patches/patch-data_meson.build \
    pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build

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

Modified files:

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

Added files:

Index: pkgsrc/x11/gnome-shell/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-data_meson.build:1.1
--- /dev/null   Fri Mar 11 07:37:41 2022
+++ pkgsrc/x11/gnome-shell/patches/patch-data_meson.build       Fri Mar 11 07:37:41 2022
@@ -0,0 +1,16 @@
+$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',
Index: pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build:1.1
--- /dev/null   Fri Mar 11 07:37:41 2022
+++ pkgsrc/x11/gnome-shell/patches/patch-src_calendar-server_meson.build        Fri Mar 11 07:37:41 2022
@@ -0,0 +1,16 @@
+$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,