diff options
| author | wiz <wiz@pkgsrc.org> | 2020-03-11 10:54:43 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-03-11 10:54:43 +0000 |
| commit | 45c4445a87828828cd85127f296bd725b6692831 (patch) | |
| tree | 01ec0cc4bfb34796224e4b48c4b97f0d37c14ae3 | |
| parent | 26fe19a61fed6d219da0b40f392724051502e72a (diff) | |
| download | pkgsrc-45c4445a87828828cd85127f296bd725b6692831.tar.gz | |
geeqie: switch libchamplain dependency to 012
This is detected and compiles fine.
I have not enabled the option by default though.
Fix typo in patch comment.
| -rw-r--r-- | graphics/geeqie/distinfo | 4 | ||||
| -rw-r--r-- | graphics/geeqie/options.mk | 6 | ||||
| -rw-r--r-- | graphics/geeqie/patches/patch-doc_Makefile.am | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index 6de418909e3..1eeb1121962 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2019/09/16 21:55:46 nia Exp $ +$NetBSD: distinfo,v 1.16 2020/03/11 10:54:43 wiz Exp $ SHA1 (geeqie-1.5.1.tar.xz) = fe14b122744a4297e9e98a9cfc5821f2b5e6e1ce RMD160 (geeqie-1.5.1.tar.xz) = 90627c49e53d9389bcbb8feec5315cd02a5ea616 @@ -6,5 +6,5 @@ SHA512 (geeqie-1.5.1.tar.xz) = 265eade90afe45856855e856c5f640786ca2e3add57c3ade8 Size (geeqie-1.5.1.tar.xz) = 1587116 bytes SHA1 (patch-Makefile.am) = 74aa2631b468d7984a4a02ad827d839cfe2155b9 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170 -SHA1 (patch-doc_Makefile.am) = 9ffbcd6f8e5bc5710b61dfbfb020e92497d3414f +SHA1 (patch-doc_Makefile.am) = 5f85c689505b9981cd9d61e3cdd5860c2b7c3a60 SHA1 (patch-src_layout__util.c) = c7ee3ea2e9874e32df21ebecad22758d9ccc17c3 diff --git a/graphics/geeqie/options.mk b/graphics/geeqie/options.mk index 5ca3f58dc80..9fc19793cd9 100644 --- a/graphics/geeqie/options.mk +++ b/graphics/geeqie/options.mk @@ -1,11 +1,9 @@ -# $NetBSD: options.mk,v 1.5 2019/09/16 21:55:46 nia Exp $ +# $NetBSD: options.mk,v 1.6 2020/03/11 10:54:43 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie PKG_OPTIONS_OPTIONAL_GROUPS= gtk PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 PKG_SUPPORTED_OPTIONS= libchamplain -# The libchamplain option doesn't actually work, so leave it off -# to avoid the pain of dependencies with no benefit, until debugged. PKG_SUGGESTED_OPTIONS= gtk3 .include "../../mk/bsd.options.mk" @@ -13,7 +11,7 @@ PKG_SUGGESTED_OPTIONS= gtk3 .if !empty(PKG_OPTIONS:Mlibchamplain) CONFIGURE_ARGS+= --enable-gps CONFIGURE_ARGS+= --enable-clutter -.include "../../geography/libchamplain04/buildlink3.mk" +.include "../../geography/libchamplain012/buildlink3.mk" .include "../../graphics/clutter/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-gps diff --git a/graphics/geeqie/patches/patch-doc_Makefile.am b/graphics/geeqie/patches/patch-doc_Makefile.am index 6d1cb7b1981..b1d91985197 100644 --- a/graphics/geeqie/patches/patch-doc_Makefile.am +++ b/graphics/geeqie/patches/patch-doc_Makefile.am @@ -1,4 +1,4 @@ -$NetBSD: patch-doc_Makefile.am,v 1.2 2018/01/10 09:38:32 wiz Exp $ +$NetBSD: patch-doc_Makefile.am,v 1.3 2020/03/11 10:54:43 wiz Exp $ Generate html docs in build phase (instead of install phase). gnome-doc-tool seems to ignore "-o html" so manually generate @@ -6,7 +6,7 @@ the same effect. Solves PLIST problem due to missing html files. -This is not know to be reported upstream. +This is not known to be reported upstream. --- doc/Makefile.am.orig 2017-12-31 12:31:21.000000000 +0000 +++ doc/Makefile.am |