CVS commit: pkgsrc/devel/dconf-editor

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Wed Mar  2 13:20:16 UTC 2022

Modified Files:
        pkgsrc/devel/dconf-editor: Makefile distinfo
Added Files:
        pkgsrc/devel/dconf-editor/patches: patch-editor_meson.build

Log Message:
dconf-editor: Fix build with meson >= 0.61


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/dconf-editor/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/dconf-editor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/dconf-editor/patches/patch-editor_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/dconf-editor/Makefile
diff -u pkgsrc/devel/dconf-editor/Makefile:1.62 pkgsrc/devel/dconf-editor/Makefile:1.63
--- pkgsrc/devel/dconf-editor/Makefile:1.62     Wed Dec  8 16:03:55 2021
+++ pkgsrc/devel/dconf-editor/Makefile  Wed Mar  2 13:20:15 2022
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.62 2021/12/08 16:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.63 2022/03/02 13:20:15 prlw1 Exp $
 
 DISTNAME=      dconf-editor-3.38.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/dconf-editor/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://wiki.gnome.org/Projects/dconf
-COMMENT=       gsettings editor
+COMMENT=       GSettings editor
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES= c99

Index: pkgsrc/devel/dconf-editor/distinfo
diff -u pkgsrc/devel/dconf-editor/distinfo:1.6 pkgsrc/devel/dconf-editor/distinfo:1.7
--- pkgsrc/devel/dconf-editor/distinfo:1.6      Tue Oct 26 10:14:31 2021
+++ pkgsrc/devel/dconf-editor/distinfo  Wed Mar  2 13:20:15 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:14:31 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/03/02 13:20:15 prlw1 Exp $
 
 BLAKE2s (dconf-editor-3.38.3.tar.xz) = 6f0e7bbb48832ac7221dffc951abcdb1a87c7fb86081d55c00d0094e719c11b1
 SHA512 (dconf-editor-3.38.3.tar.xz) = cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1
 Size (dconf-editor-3.38.3.tar.xz) = 594544 bytes
+SHA1 (patch-editor_meson.build) = 0bdabcf1c7fbb7220bb1c27036207ee0746b9604

Added files:

Index: pkgsrc/devel/dconf-editor/patches/patch-editor_meson.build
diff -u /dev/null pkgsrc/devel/dconf-editor/patches/patch-editor_meson.build:1.1
--- /dev/null   Wed Mar  2 13:20:16 2022
+++ pkgsrc/devel/dconf-editor/patches/patch-editor_meson.build  Wed Mar  2 13:20:15 2022
@@ -0,0 +1,23 @@
+$NetBSD: patch-editor_meson.build,v 1.1 2022/03/02 13:20:15 prlw1 Exp $
+
+Fix build with meson >= 0.61
+https://gitlab.gnome.org/GNOME/dconf-editor/-/issues/52
+
+--- editor/meson.build.orig    2021-03-23 15:37:37.571719400 +0000
++++ editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,