Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Nov 2020 12:14:14 +0000 (UTC)
From:      Dmitri Goutnik <dmgk@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555963 - in head/x11-wm/i3-gaps: . files
Message-ID:  <202011211214.0ALCEEst022336@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dmgk
Date: Sat Nov 21 12:14:14 2020
New Revision: 555963
URL: https://svnweb.freebsd.org/changeset/ports/555963

Log:
  x11-wm/i3-gaps: Unbreak build when both DOCS and MANPAGES are selected
  
  Upstream PR: https://github.com/i3/i3/pull/4264

Added:
  head/x11-wm/i3-gaps/files/
  head/x11-wm/i3-gaps/files/patch-meson.build   (contents, props changed)
Modified:
  head/x11-wm/i3-gaps/Makefile

Modified: head/x11-wm/i3-gaps/Makefile
==============================================================================
--- head/x11-wm/i3-gaps/Makefile	Sat Nov 21 12:11:26 2020	(r555962)
+++ head/x11-wm/i3-gaps/Makefile	Sat Nov 21 12:14:14 2020	(r555963)
@@ -29,7 +29,7 @@ RUN_DEPENDS=	p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \
 		p5-JSON-XS>=0:converters/p5-JSON-XS \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
-USES=		compiler:c11 gettext-runtime gmake gnome iconv localbase:ldflags \
+USES=		compiler:c11 gettext-runtime gnome iconv localbase:ldflags \
 		meson perl5 pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Airblader

Added: head/x11-wm/i3-gaps/files/patch-meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/i3-gaps/files/patch-meson.build	Sat Nov 21 12:14:14 2020	(r555963)
@@ -0,0 +1,34 @@
+Upstream PR: https://github.com/i3/i3/pull/4264
+--- meson.build.orig	2020-11-15 18:11:08 UTC
++++ meson.build
+@@ -428,7 +428,9 @@ command_parser = custom_target(
+   command: [perl, parser_gen, '--input=@INPUT@', '--prefix=command'],
+ )
+ 
+-i3srcs += command_parser
++command_parser_dep = declare_dependency(
++    sources : [command_parser]
++)
+ 
+ config_parser = custom_target(
+   'config_parser',
+@@ -441,7 +443,9 @@ config_parser = custom_target(
+   command: [parser_gen, '--input=@INPUT@', '--prefix=config'],
+ )
+ 
+-i3srcs += config_parser
++config_parser_dep = declare_dependency(
++    sources : [config_parser]
++)
+ 
+ # src/log.c uses threading primitives for synchronization
+ thread_dep = dependency('threads')
+@@ -472,6 +476,8 @@ common_deps = [
+   gobject_dep,
+   ev_dep,
+   config_h,
++  command_parser_dep,
++  config_parser_dep
+ ]
+ 
+ executable(



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011211214.0ALCEEst022336>