CVS commit: pkgsrc/graphics/geeqie

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Nov 21 23:55:23 UTC 2022

Modified Files:
        pkgsrc/graphics/geeqie: distinfo
Added Files:
        pkgsrc/graphics/geeqie/patches: patch-meson.build

Log Message:
graphics/geeqie: Don't find pandoc

pandoc is used to make README.html, and it's not ok to have a
different set of installed files based on random programs being
present.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/geeqie/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/geeqie/patches/patch-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/graphics/geeqie/distinfo
diff -u pkgsrc/graphics/geeqie/distinfo:1.28 pkgsrc/graphics/geeqie/distinfo:1.29
--- pkgsrc/graphics/geeqie/distinfo:1.28        Mon Nov 21 22:26:54 2022
+++ pkgsrc/graphics/geeqie/distinfo     Mon Nov 21 23:55:22 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2022/11/21 22:26:54 wiz Exp $
+$NetBSD: distinfo,v 1.29 2022/11/21 23:55:22 gdt Exp $
 
 BLAKE2s (geeqie-2.0.1.tar.xz) = 344660eddf23258c87afb4855c616ba24a6eb0562756c15c554bed30e241ae78
 SHA512 (geeqie-2.0.1.tar.xz) = cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
@@ -6,4 +6,5 @@ Size (geeqie-2.0.1.tar.xz) = 1666600 byt
 SHA1 (patch-ac) = 6cebab3e14ce51c59e70fc902a514d1bbafc3b33
 SHA1 (patch-config.h.in) = 301b461a7c3ce8b699f4651363ddf18017eca0df
 SHA1 (patch-doc_meson.build) = bfa986b7181355c8f02ffec1af39476a0bc6b491
+SHA1 (patch-meson.build) = c6a0ac55b03d3c78619c55f82feebe66ea0a1e6b
 SHA1 (patch-meson__options.txt) = e25acfd12c46337e1a992e5629cf82b5fa8f838d

Added files:

Index: pkgsrc/graphics/geeqie/patches/patch-meson.build
diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-meson.build:1.1
--- /dev/null   Mon Nov 21 23:55:23 2022
+++ pkgsrc/graphics/geeqie/patches/patch-meson.build    Mon Nov 21 23:55:23 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-meson.build,v 1.1 2022/11/21 23:55:23 gdt Exp $
+
+Do not look for pandoc to avoid non-repro build output.
+
+Commented on upstream at
+  https://github.com/BestImageViewer/geeqie/pull/1051
+
+--- meson.build.orig   2022-08-12 09:32:25.000000000 +0000
++++ meson.build
+@@ -485,7 +485,7 @@ else
+     summary({'ChangeLog' : ['ChangeLog, ChangeLog.html created:', false]}, section : 'Documentation', bool_yn : true)
+ endif
+ 
+-pandoc = find_program('pandoc', required : false)
++pandoc = find_program('pandoc-really-do-not-find-pandoc', required : false)
+ if pandoc.found()
+     run_command(find_program('gen_readme.sh'), meson.source_root(), meson.build_root(), check : false)
+