Received: by mail.netbsd.org (Postfix, from userid 605) id 8C7EB84E88; Mon, 21 Nov 2022 22:24:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BDBE584CD8 for ; Mon, 21 Nov 2022 22:24:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id HYSYI2Ioyeik for ; Mon, 21 Nov 2022 22:24:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 16EB484C13 for ; Mon, 21 Nov 2022 22:24:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0FBF1FA90; Mon, 21 Nov 2022 22:24:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669069449245450" MIME-Version: 1.0 Date: Mon, 21 Nov 2022 22:24:09 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/geeqie To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20221121222409.0FBF1FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669069449245450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Nov 21 22:24:08 UTC 2022 Modified Files: pkgsrc/graphics/geeqie: Makefile distinfo Added Files: pkgsrc/graphics/geeqie/patches: patch-doc_meson.build patch-meson__options.txt Log Message: geeqie: disable doxygen detection To avoid PLIST changes if doxygen is installed To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 pkgsrc/graphics/geeqie/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/geeqie/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/geeqie/patches/patch-doc_meson.build \ pkgsrc/graphics/geeqie/patches/patch-meson__options.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669069449245450 Content-Disposition: inline Content-Length: 3678 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/geeqie/Makefile diff -u pkgsrc/graphics/geeqie/Makefile:1.97 pkgsrc/graphics/geeqie/Makefile:1.98 --- pkgsrc/graphics/geeqie/Makefile:1.97 Mon Nov 21 11:58:47 2022 +++ pkgsrc/graphics/geeqie/Makefile Mon Nov 21 22:24:08 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2022/11/21 11:58:47 wiz Exp $ +# $NetBSD: Makefile,v 1.98 2022/11/21 22:24:08 wiz Exp $ DISTNAME= geeqie-2.0.1 CATEGORIES= graphics @@ -17,6 +17,8 @@ TOOL_DEPENDS+= vim-share-[0-9]*:../../ed LDFLAGS.SunOS+= -lm -lsocket -lnsl +MESON_ARGS+= -Ddoxygen=disabled + USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ USE_TOOLS= bash:run intltool msgfmt pkg-config Index: pkgsrc/graphics/geeqie/distinfo diff -u pkgsrc/graphics/geeqie/distinfo:1.26 pkgsrc/graphics/geeqie/distinfo:1.27 --- pkgsrc/graphics/geeqie/distinfo:1.26 Mon Nov 21 12:00:01 2022 +++ pkgsrc/graphics/geeqie/distinfo Mon Nov 21 22:24:08 2022 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.26 2022/11/21 12:00:01 wiz Exp $ +$NetBSD: distinfo,v 1.27 2022/11/21 22:24:08 wiz Exp $ BLAKE2s (geeqie-2.0.1.tar.xz) = 344660eddf23258c87afb4855c616ba24a6eb0562756c15c554bed30e241ae78 SHA512 (geeqie-2.0.1.tar.xz) = cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 Size (geeqie-2.0.1.tar.xz) = 1666600 bytes SHA1 (patch-ac) = 6cebab3e14ce51c59e70fc902a514d1bbafc3b33 SHA1 (patch-config.h.in) = 301b461a7c3ce8b699f4651363ddf18017eca0df +SHA1 (patch-doc_meson.build) = 74f284283050399a6bcc05219f8786ba0ff98220 +SHA1 (patch-meson__options.txt) = fc952d373c01fa54d358c1e15f91be76ed6941e2 Added files: Index: pkgsrc/graphics/geeqie/patches/patch-doc_meson.build diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-doc_meson.build:1.1 --- /dev/null Mon Nov 21 22:24:09 2022 +++ pkgsrc/graphics/geeqie/patches/patch-doc_meson.build Mon Nov 21 22:24:08 2022 @@ -0,0 +1,20 @@ +$NetBSD: patch-doc_meson.build,v 1.1 2022/11/21 22:24:08 wiz Exp $ + +Add option to allow disabling doxygen detection. + +--- doc/meson.build.orig 2022-08-12 09:32:25.000000000 +0000 ++++ doc/meson.build +@@ -27,6 +27,8 @@ endif + + install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex') + ++option = get_option('doxygen') ++if not option.disabled() + doxygen = find_program('doxygen', required : false) + if doxygen.found() + srcdir = join_paths(meson.source_root()) +@@ -38,3 +40,4 @@ if doxygen.found() + else + summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) + endif ++endif Index: pkgsrc/graphics/geeqie/patches/patch-meson__options.txt diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-meson__options.txt:1.1 --- /dev/null Mon Nov 21 22:24:09 2022 +++ pkgsrc/graphics/geeqie/patches/patch-meson__options.txt Mon Nov 21 22:24:08 2022 @@ -0,0 +1,14 @@ +$NetBSD: patch-meson__options.txt,v 1.1 2022/11/21 22:24:08 wiz Exp $ + +Allow disabling doxygen detection. + +--- meson_options.txt.orig 2022-08-12 09:32:25.000000000 +0000 ++++ meson_options.txt +@@ -25,6 +25,7 @@ option('gq_localedir', type : 'string', + + option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz') + option('cms', type : 'feature', value : 'auto', description : 'color management system') ++option('doxygen', type : 'feature', value : 'auto', description : 'doxygen') + option('djvu', type : 'feature', value : 'auto', description : 'djvu') + option('exiv2', type : 'feature', value : 'auto', description : 'exiv2') + option('videothumbnailer', type : 'feature', value : 'auto', description : 'video thumbnailer') --_----------=_1669069449245450--