From ed2ba72b34c3894f7ab7234716fd93f2b42b1541 Mon Sep 17 00:00:00 2001
From: Jia Yuan Lo <jylo06g@gmail.com>
Date: Mon, 18 Nov 2024 16:09:26 +0800
Subject: [PATCH] chore(x11/i3): replace deprecated i3-gaps

i3-gaps is merged into i3 since i3 version 4.22
---
 x11-packages/i3-gaps/build.sh | 26 --------------------------
 x11-packages/i3/build.sh      |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 x11-packages/i3-gaps/build.sh

diff --git a/x11-packages/i3-gaps/build.sh b/x11-packages/i3-gaps/build.sh
deleted file mode 100644
index 8ff04a11e9ee6c..00000000000000
--- a/x11-packages/i3-gaps/build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/Airblader/i3
-TERMUX_PKG_DESCRIPTION="A fork of the i3 window manager with gaps and some other features"
-TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.21.1
-TERMUX_PKG_SRCURL=https://github.com/Airblader/i3/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=83f9b375c70f015611216cfa56956945c5b731c9943c53f4e3d6dee305de54f6
-TERMUX_PKG_DEPENDS="glib, libandroid-glob, libandroid-wordexp, libcairo, libev, libiconv, libxcb, libxkbcommon, pango, pcre2, perl, startup-notification, xcb-util, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl"
-TERMUX_PKG_RECOMMENDS="i3status"
-TERMUX_PKG_CONFLICTS="i3"
-
-TERMUX_PKG_CONFFILES="
-i3/config
-i3/config.keycodes
-"
-
-termux_step_post_get_source() {
-	for p in $TERMUX_SCRIPTDIR/x11-packages/i3/*.patch; do
-		sed 's|@TERMUX_PREFIX@|'"${TERMUX_PREFIX}"'|g' ${p} \
-			| patch --silent -p1
-	done
-}
-
-termux_step_pre_configure() {
-	LDFLAGS+=" -landroid-glob -landroid-wordexp"
-}
diff --git a/x11-packages/i3/build.sh b/x11-packages/i3/build.sh
index 6ab13e9e8f7c74..031bcd40bb9ebe 100644
--- a/x11-packages/i3/build.sh
+++ b/x11-packages/i3/build.sh
@@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="An improved dynamic tiling window manager"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="4.24"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://i3wm.org/downloads/i3-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=5baefd0e5e78f1bafb7ac85deea42bcd3cbfe65f1279aa96f7e49661637ac981
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="glib, libandroid-glob, libandroid-wordexp, libcairo, libev, libiconv, libxcb, libxkbcommon, pango, pcre2, perl, startup-notification, xcb-util, xcb-util-cursor, xcb-util-keysyms, xcb-util-wm, xcb-util-xrm, yajl"
 TERMUX_PKG_RECOMMENDS="i3status"
-
+TERMUX_PKG_BREAKS="i3-gaps (<< 4.21.1)"
+TERMUX_PKG_REPLACES="i3-gaps (<< 4.21.1)"
 TERMUX_PKG_CONFFILES="
 i3/config
 i3/config.keycodes