From 15563edbc3ae1b3fd9d0a2ca3f2d1c96b452a5f8 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Thu, 18 Feb 2021 11:19:19 +0000
Subject: [PATCH] i3/forks: don't detect that we're running a debug build.
 worked out with tb@ https://github.com/i3/i3/issues/4350

---
 x11/i3-gaps/Makefile                             |  3 ++-
 x11/i3-gaps/patches/patch-libi3_is_debug_build_c | 16 ++++++++++++++++
 x11/i3-mousedrag/Makefile                        |  4 ++--
 .../patches/patch-libi3_is_debug_build_c         | 16 ++++++++++++++++
 x11/i3-mousedrag/patches/patch-meson_build       |  4 ++--
 x11/i3/Makefile                                  |  3 ++-
 x11/i3/patches/patch-libi3_is_debug_build_c      | 16 ++++++++++++++++
 7 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 x11/i3-gaps/patches/patch-libi3_is_debug_build_c
 create mode 100644 x11/i3-mousedrag/patches/patch-libi3_is_debug_build_c
 create mode 100644 x11/i3/patches/patch-libi3_is_debug_build_c

diff --git a/x11/i3-gaps/Makefile b/x11/i3-gaps/Makefile
index bad50f07372..6a9bd0289bc 100644
--- a/x11/i3-gaps/Makefile
+++ b/x11/i3-gaps/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2021/02/13 05:59:02 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.12 2021/02/18 11:19:19 sthen Exp $
 
 COMMENT =	improved dynamic tiling window manager, fork with gaps
 
 V =		4.19.1
+REVISION =	0
 DISTNAME =	i3-gaps-${V}
 
 CATEGORIES =	x11
diff --git a/x11/i3-gaps/patches/patch-libi3_is_debug_build_c b/x11/i3-gaps/patches/patch-libi3_is_debug_build_c
new file mode 100644
index 00000000000..225c129a55e
--- /dev/null
+++ b/x11/i3-gaps/patches/patch-libi3_is_debug_build_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-libi3_is_debug_build_c,v 1.1 2021/02/18 11:19:19 sthen Exp $
+
+https://github.com/i3/i3/issues/4350
+
+Index: libi3/is_debug_build.c
+--- libi3/is_debug_build.c.orig
++++ libi3/is_debug_build.c
+@@ -15,6 +15,8 @@
+  *
+  */
+ bool is_debug_build(void) {
++    return false;
++
+     /* i3_version contains either something like this:
+      *     "4.0.2 (2011-11-11)" (release version)
+      * or: "4.0.2-123-gC0FFEE"  (debug version)
diff --git a/x11/i3-mousedrag/Makefile b/x11/i3-mousedrag/Makefile
index cefe102e92a..c8643890f48 100644
--- a/x11/i3-mousedrag/Makefile
+++ b/x11/i3-mousedrag/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2021/02/14 21:11:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2021/02/18 11:19:19 sthen Exp $
 
 # see https://github.com/i3/i3/issues/3085 / orestisfl:issue-2643
 COMMENT=	improved dynamic tiling window manager, fork with mouse drag
@@ -8,7 +8,7 @@ GH_PROJECT=	i3
 GH_COMMIT=	1b0585ddf8f2e2206effbd106cb028cac6ffe6d9
 
 DISTNAME=	i3-mousedrag-4.19.1pl20210102
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	x11
 
diff --git a/x11/i3-mousedrag/patches/patch-libi3_is_debug_build_c b/x11/i3-mousedrag/patches/patch-libi3_is_debug_build_c
new file mode 100644
index 00000000000..225c129a55e
--- /dev/null
+++ b/x11/i3-mousedrag/patches/patch-libi3_is_debug_build_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-libi3_is_debug_build_c,v 1.1 2021/02/18 11:19:19 sthen Exp $
+
+https://github.com/i3/i3/issues/4350
+
+Index: libi3/is_debug_build.c
+--- libi3/is_debug_build.c.orig
++++ libi3/is_debug_build.c
+@@ -15,6 +15,8 @@
+  *
+  */
+ bool is_debug_build(void) {
++    return false;
++
+     /* i3_version contains either something like this:
+      *     "4.0.2 (2011-11-11)" (release version)
+      * or: "4.0.2-123-gC0FFEE"  (debug version)
diff --git a/x11/i3-mousedrag/patches/patch-meson_build b/x11/i3-mousedrag/patches/patch-meson_build
index 2f345a15d7e..b8f64b50b7d 100644
--- a/x11/i3-mousedrag/patches/patch-meson_build
+++ b/x11/i3-mousedrag/patches/patch-meson_build
@@ -1,9 +1,9 @@
-$OpenBSD: patch-meson_build,v 1.1 2021/02/13 09:02:26 sthen Exp $
+$OpenBSD: patch-meson_build,v 1.2 2021/02/18 11:19:19 sthen Exp $
 
 Index: meson.build
 --- meson.build.orig
 +++ meson.build
-@@ -598,7 +598,7 @@ install_headers(
+@@ -600,7 +600,7 @@ install_headers(
  # because configure_file strips the backslash in e.g. \@display,
  # resulting in @display, breaking our Perl code:
  # https://github.com/mesonbuild/meson/issues/7165
diff --git a/x11/i3/Makefile b/x11/i3/Makefile
index aeb675977a9..5ab87491c17 100644
--- a/x11/i3/Makefile
+++ b/x11/i3/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.128 2021/02/13 09:00:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.129 2021/02/18 11:19:19 sthen Exp $
 
 COMMENT =	improved dynamic tiling window manager
 
 DISTNAME =	i3-4.19.1
+REVISION =	0
 
 CATEGORIES =	x11
 
diff --git a/x11/i3/patches/patch-libi3_is_debug_build_c b/x11/i3/patches/patch-libi3_is_debug_build_c
new file mode 100644
index 00000000000..225c129a55e
--- /dev/null
+++ b/x11/i3/patches/patch-libi3_is_debug_build_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-libi3_is_debug_build_c,v 1.1 2021/02/18 11:19:19 sthen Exp $
+
+https://github.com/i3/i3/issues/4350
+
+Index: libi3/is_debug_build.c
+--- libi3/is_debug_build.c.orig
++++ libi3/is_debug_build.c
+@@ -15,6 +15,8 @@
+  *
+  */
+ bool is_debug_build(void) {
++    return false;
++
+     /* i3_version contains either something like this:
+      *     "4.0.2 (2011-11-11)" (release version)
+      * or: "4.0.2-123-gC0FFEE"  (debug version)