CVS commit: pkgsrc/devel/devhelp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 29 18:04:44 UTC 2022

Modified Files:
        pkgsrc/devel/devhelp: distinfo
Added Files:
        pkgsrc/devel/devhelp/patches: patch-data_meson.build
            patch-plugins_gedit-plugin_meson.build

Log Message:
devhelp: fix build with latest meson


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/devhelp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/devhelp/patches/patch-data_meson.build \
    pkgsrc/devel/devhelp/patches/patch-plugins_gedit-plugin_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/devel/devhelp/distinfo
diff -u pkgsrc/devel/devhelp/distinfo:1.22 pkgsrc/devel/devhelp/distinfo:1.23
--- pkgsrc/devel/devhelp/distinfo:1.22  Tue Oct 26 10:14:32 2021
+++ pkgsrc/devel/devhelp/distinfo       Tue Mar 29 18:04:44 2022
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 10:14:32 nia Exp $
+$NetBSD: distinfo,v 1.23 2022/03/29 18:04:44 wiz Exp $
 
 BLAKE2s (devhelp-3.34.0.tar.xz) = 6e20f84df0db6203d88f7a790be4f390a5af11226c2bc36306a7fc434e8a8200
 SHA512 (devhelp-3.34.0.tar.xz) = 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 Size (devhelp-3.34.0.tar.xz) = 288352 bytes
+SHA1 (patch-data_meson.build) = b53b3c7f8f6393231f913a4f32d4ee40672a84f3
+SHA1 (patch-plugins_gedit-plugin_meson.build) = a15764de80fe1bc57c0640491465df1e2893599e

Added files:

Index: pkgsrc/devel/devhelp/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/devel/devhelp/patches/patch-data_meson.build:1.1
--- /dev/null   Tue Mar 29 18:04:44 2022
+++ pkgsrc/devel/devhelp/patches/patch-data_meson.build Tue Mar 29 18:04:44 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/03/29 18:04:44 wiz Exp $
+
+meson compatibility.
+
+--- data/meson.build.orig      2019-09-09 14:01:26.000000000 +0000
++++ data/meson.build
+@@ -17,7 +17,6 @@ configure_file(
+ 
+ appdata = 'org.gnome.Devhelp.appdata.xml'
+ I18N.merge_file(
+-        appdata,
+         input : appdata + '.in',
+         output : appdata,
+         po_dir : '../po/',
+@@ -27,7 +26,6 @@ I18N.merge_file(
+ 
+ desktop_file = 'org.gnome.Devhelp.desktop'
+ I18N.merge_file(
+-        desktop_file,
+         type : 'desktop',
+         input : desktop_file + '.in',
+         output : desktop_file,
Index: pkgsrc/devel/devhelp/patches/patch-plugins_gedit-plugin_meson.build
diff -u /dev/null pkgsrc/devel/devhelp/patches/patch-plugins_gedit-plugin_meson.build:1.1
--- /dev/null   Tue Mar 29 18:04:44 2022
+++ pkgsrc/devel/devhelp/patches/patch-plugins_gedit-plugin_meson.build Tue Mar 29 18:04:44 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_gedit-plugin_meson.build,v 1.1 2022/03/29 18:04:44 wiz Exp $
+
+meson compatibility.
+
+--- plugins/gedit-plugin/meson.build.orig      2019-09-09 14:01:26.000000000 +0000
++++ plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-        plugin_info_file,
+         type : 'desktop',
+         input : plugin_info_file + '.desktop.in',
+         output : plugin_info_file,