pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
i3: remove, used for updating pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Dec 27 16:40:20 2025 +0100
Changeset: 1c8c6f9414591f2da220ec2e74ad03717e0b69f4
Modified Files:
Makefile
Removed Files:
i3/DESCR
i3/Makefile
i3/PLIST
i3/TODO
i3/buildlink3.mk
i3/distinfo
i3/patches/patch-etc_config
i3/patches/patch-etc_config.keycodes
i3/patches/patch-i3-config-wizard_main.c
i3/patches/patch-i3bar_src_child.c
i3/patches/patch-meson.build
i3/patches/patch-src_config.c
i3/patches/patch-src_ipc.c
i3/patches/patch-src_load__layout.c
i3/patches/patch-src_log.c
i3/patches/patch-src_util.c
Log Message:
i3: remove, used for updating pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c8c6f9414591f2da220ec2e74ad03717e0b69f4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
i3/DESCR | 8 --
i3/Makefile | 53 -------------
i3/PLIST | 67 -----------------
i3/TODO | 4 -
i3/buildlink3.mk | 15 ----
i3/distinfo | 15 ----
i3/patches/patch-etc_config | 36 ---------
i3/patches/patch-etc_config.keycodes | 36 ---------
i3/patches/patch-i3-config-wizard_main.c | 16 ----
i3/patches/patch-i3bar_src_child.c | 16 ----
i3/patches/patch-meson.build | 35 ---------
i3/patches/patch-src_config.c | 17 -----
i3/patches/patch-src_ipc.c | 123 -------------------------------
i3/patches/patch-src_load__layout.c | 78 --------------------
i3/patches/patch-src_log.c | 15 ----
i3/patches/patch-src_util.c | 38 ----------
17 files changed, 573 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 4830502073..80790c25e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1727,7 +1727,6 @@ SUBDIR+= hyperrogue
SUBDIR+= hztool
SUBDIR+= i2pd
SUBDIR+= i2pd-git
-SUBDIR+= i3
SUBDIR+= i3-git
SUBDIR+= i686-elf-binutils
SUBDIR+= i686-elf-gcc
diff --git a/i3/DESCR b/i3/DESCR
deleted file mode 100644
index 0996ded4a9..0000000000
--- a/i3/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Key features of i3 are correct implementation of Xinerama (workspaces are
-assigned to virtual screens, i3 does the right thing when attaching new
-monitors), XrandR support (not done yet), horizontal and vertical columns
-(think of a table) in tiling. Also, special focus is on writing clean,
-readable and well documented code. i3 uses xcb for asynchronous
-communication with X11, and has several measures to be very fast.
-
-Please be aware i3 is primarily targeted at advanced users and developers.
diff --git a/i3/Makefile b/i3/Makefile
deleted file mode 100644
index 39a871c186..0000000000
--- a/i3/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.64 2025/10/23 20:39:41 wiz Exp $
-
-DISTNAME= i3-4.25
-CATEGORIES= wm
-MASTER_SITES= https://i3wm.org/downloads/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://i3wm.org/
-COMMENT= Improved dynamic tiling window manager
-LICENSE= modified-bsd
-
-# for i3-save-tree
-DEPENDS+= p5-AnyEvent-I3>=0.12:../../wm/p5-AnyEvent-I3
-DEPENDS+= p5-JSON-XS-[0-9]*:../../converters/p5-JSON-XS
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= bash pkg-config perl:run
-USE_LANGUAGES= c
-
-CFLAGS.SunOS+= -D__EXTENSIONS__
-LDFLAGS.SunOS+= -lgen -lsocket
-
-EGDIR= ${PREFIX}/share/examples/i3
-OWN_DIRS+= ${PKG_SYSCONFDIR}/i3
-CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/i3/config
-CONF_FILES+= ${EGDIR}/config.keycodes ${PKG_SYSCONFDIR}/i3/config.keycodes
-
-REPLACE_PERL+= i3-dmenu-desktop
-REPLACE_PERL+= i3-migrate-config-to-v4
-REPLACE_PERL+= i3-save-tree
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
- ${FIND} ${DESTDIR}${PREFIX} -name '*.orig' -exec ${RM} '{}' ';'
-
-.include "../../devel/meson/build.mk"
-.include "../../devel/libev/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pcre2/buildlink3.mk"
-.include "../../devel/yajl/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../x11/xcb-util/buildlink3.mk"
-.include "../../x11/xcb-util-cursor/buildlink3.mk"
-.include "../../x11/xcb-util-keysyms/buildlink3.mk"
-.include "../../x11/xcb-util-wm/buildlink3.mk"
-.include "../../x11/xcb-util-xrm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/i3/PLIST b/i3/PLIST
deleted file mode 100644
index c22d8647b2..0000000000
--- a/i3/PLIST
+++ /dev/null
@@ -1,67 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2023/11/03 08:31:40 wiz Exp $
-bin/i3
-bin/i3-config-wizard
-bin/i3-dmenu-desktop
-bin/i3-dump-log
-bin/i3-input
-bin/i3-migrate-config-to-v4
-bin/i3-msg
-bin/i3-nagbar
-bin/i3-save-tree
-bin/i3-sensible-editor
-bin/i3-sensible-pager
-bin/i3-sensible-terminal
-bin/i3-with-shmlog
-bin/i3bar
-include/i3/ipc.h
-man/man1/i3-config-wizard.1
-man/man1/i3-dmenu-desktop.1
-man/man1/i3-dump-log.1
-man/man1/i3-input.1
-man/man1/i3-migrate-config-to-v4.1
-man/man1/i3-msg.1
-man/man1/i3-nagbar.1
-man/man1/i3-save-tree.1
-man/man1/i3-sensible-editor.1
-man/man1/i3-sensible-pager.1
-man/man1/i3-sensible-terminal.1
-man/man1/i3.1
-man/man1/i3bar.1
-share/applications/i3.desktop
-share/doc/i3/LICENSE
-share/doc/i3/bigpicture.png
-share/doc/i3/debugging.html
-share/doc/i3/gaps1920.png
-share/doc/i3/hacking-howto.html
-share/doc/i3/i3-sync-working.png
-share/doc/i3/i3-sync.png
-share/doc/i3/i3bar-protocol.html
-share/doc/i3/i3bar-workspace-protocol.html
-share/doc/i3/ipc.html
-share/doc/i3/keyboard-layer1.png
-share/doc/i3/keyboard-layer2.png
-share/doc/i3/layout-saving-1.png
-share/doc/i3/layout-saving.html
-share/doc/i3/logo-30.png
-share/doc/i3/modes.png
-share/doc/i3/multi-monitor.html
-share/doc/i3/refcard.html
-share/doc/i3/refcard_style.css
-share/doc/i3/single_terminal.png
-share/doc/i3/snapping.png
-share/doc/i3/testsuite.html
-share/doc/i3/tree-layout1.png
-share/doc/i3/tree-layout2.png
-share/doc/i3/tree-shot1.png
-share/doc/i3/tree-shot2.png
-share/doc/i3/tree-shot3.png
-share/doc/i3/tree-shot4.png
-share/doc/i3/two_columns.png
-share/doc/i3/two_terminals.png
-share/doc/i3/userguide.html
-share/doc/i3/wsbar.html
-share/doc/i3/wsbar.png
-share/examples/i3/config
-share/examples/i3/config.keycodes
-share/xsessions/i3-with-shmlog.desktop
-share/xsessions/i3.desktop
diff --git a/i3/TODO b/i3/TODO
deleted file mode 100644
index 0af66432a7..0000000000
--- a/i3/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-Does not build because NetBSD does not provide uselocale().
-
-Reported upstream at
-https://github.com/i3/i3/issues/6567
diff --git a/i3/buildlink3.mk b/i3/buildlink3.mk
deleted file mode 100644
index 29877c048b..0000000000
--- a/i3/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/06/28 11:37:00 wiz Exp $
-
-BUILDLINK_TREE+= i3
-
-.if !defined(I3_BUILDLINK3_MK)
-I3_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.i3?= build
-BUILDLINK_API_DEPENDS.i3+= i3>=4.10.1
-BUILDLINK_ABI_DEPENDS.i3?= i3>=4.20.1nb2
-BUILDLINK_PKGSRCDIR.i3?= ../../wip/i3
-
-.endif # I3_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -i3
diff --git a/i3/distinfo b/i3/distinfo
deleted file mode 100644
index 9ad969e582..0000000000
--- a/i3/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.33 2024/11/20 13:15:06 wiz Exp $
-
-BLAKE2s (i3-4.25.tar.xz) = 20fe167cf78466836f8cf3383c29b79712aa687f6a0ada5b4543bd86b0cb1f26
-SHA512 (i3-4.25.tar.xz) = 237f62ccb25b13bd676cca562abe6ba4c65451a02976cd0547ee44c9ed8a5ccd60e90c871e75a625fc6e3cbda1aaa6abfff246293a9b2460ae6bf9ee074bd3fb
-Size (i3-4.25.tar.xz) = 1357280 bytes
-SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb
-SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011
-SHA1 (patch-i3-config-wizard_main.c) = 39d740b5b8ed89f03e9d90a98ff0aaf43dd17848
-SHA1 (patch-i3bar_src_child.c) = 7fb302dbe263c59dd33e9b198c7f479df189ee1f
-SHA1 (patch-meson.build) = 89ec2c7f594f8f13c13b522c7635cb59626554af
-SHA1 (patch-src_config.c) = 7985366b892f240379daa19d9b7baeddb22f66ee
-SHA1 (patch-src_ipc.c) = 0e8961d8da4b55fca4f207829f6e26deffa3c47c
-SHA1 (patch-src_load__layout.c) = 35ab682dd326c3a8ad00337321305eda52924feb
-SHA1 (patch-src_log.c) = 19b33b43d1716ead4bad36e2afd52ff30af017c1
-SHA1 (patch-src_util.c) = 6285072f4d0d385bb1d3868a2a5574bd6f375fdc
diff --git a/i3/patches/patch-etc_config b/i3/patches/patch-etc_config
deleted file mode 100644
index 59191290cb..0000000000
--- a/i3/patches/patch-etc_config
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-etc_config,v 1.2 2021/09/12 07:22:47 nia Exp $
-
-Useful default volume controls for NetBSD.
-
---- etc/config.orig 2021-02-27 09:37:58.746645500 +0000
-+++ etc/config
-@@ -22,18 +22,22 @@ font pango:monospace 8
-
- # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
- # screen before suspend. Use loginctl lock-session to lock your screen.
--exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
- # NetworkManager is the most popular way to manage wireless networks on Linux,
- # and nm-applet is a desktop environment-independent system tray GUI for it.
--exec --no-startup-id nm-applet
-+#exec --no-startup-id nm-applet
-
--# Use pactl to adjust volume in PulseAudio.
-+# Use mixerctl to adjust volume in NetBSD.
- set $refresh_i3status killall -SIGUSR1 i3status
--bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
--bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
--bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
--bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-+bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=15 && $refresh_i3status
-+bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=15 && $refresh_i3status
-+
-+# Use pactl to adjust volume in PulseAudio.
-+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-+#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
- # use these keys for focus, movement, and resize directions when reaching for
- # the arrows is not convenient
diff --git a/i3/patches/patch-etc_config.keycodes b/i3/patches/patch-etc_config.keycodes
deleted file mode 100644
index b67c3a4ba2..0000000000
--- a/i3/patches/patch-etc_config.keycodes
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-etc_config.keycodes,v 1.2 2021/09/12 07:22:47 nia Exp $
-
-Useful default volume controls for NetBSD.
-
---- etc/config.keycodes.orig 2021-02-27 09:37:58.746645500 +0000
-+++ etc/config.keycodes
-@@ -23,18 +23,22 @@ font pango:monospace 8
-
- # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
- # screen before suspend. Use loginctl lock-session to lock your screen.
--exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-+#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
-
- # NetworkManager is the most popular way to manage wireless networks on Linux,
- # and nm-applet is a desktop environment-independent system tray GUI for it.
--exec --no-startup-id nm-applet
-+#exec --no-startup-id nm-applet
-
--# Use pactl to adjust volume in PulseAudio.
-+# Use mixerctl to adjust volume in NetBSD.
- set $refresh_i3status killall -SIGUSR1 i3status
--bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
--bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
--bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
--bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-+bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=5 && $refresh_i3status
-+bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=5 && $refresh_i3status
-+
-+# Use pactl to adjust volume in PulseAudio.
-+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
-+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-+#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-+#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
- # Use Mouse+$mod to drag floating windows to their wanted position
- floating_modifier $mod
diff --git a/i3/patches/patch-i3-config-wizard_main.c b/i3/patches/patch-i3-config-wizard_main.c
deleted file mode 100644
index 03fbd9e8a7..0000000000
--- a/i3/patches/patch-i3-config-wizard_main.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix ctype(3) usage.
-https://github.com/i3/i3/issues/6566
-
---- i3-config-wizard/main.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ i3-config-wizard/main.c
-@@ -732,7 +732,7 @@ static void finish(void) {
-
- /* Skip leading whitespace */
- char *walk = line;
-- while (isspace(*walk) && walk < (line + len)) {
-+ while (isspace((unsigned char)*walk) && walk < (line + len)) {
- /* Pre-output the skipped whitespaces to keep proper indentation */
- fputc(*walk, ks_config);
- walk++;
diff --git a/i3/patches/patch-i3bar_src_child.c b/i3/patches/patch-i3bar_src_child.c
deleted file mode 100644
index ebab3bf507..0000000000
--- a/i3/patches/patch-i3bar_src_child.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix ctype(3) usage.
-https://github.com/i3/i3/issues/6566
-
---- i3bar/src/child.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ i3bar/src/child.c
-@@ -525,7 +525,7 @@ static void stdin_io_first_line_cb(int f
-
- static bool isempty(char *s) {
- while (*s != '\0') {
-- if (!isspace(*s)) {
-+ if (!isspace((unsigned char)*s)) {
- return false;
- }
- s++;
diff --git a/i3/patches/patch-meson.build b/i3/patches/patch-meson.build
deleted file mode 100644
index 784b353c07..0000000000
--- a/i3/patches/patch-meson.build
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-meson.build,v 1.1 2021/09/12 07:22:47 nia Exp $
-
-Install config files to examples, per pkgsrc policy.
-
-Check for uselocale() before using it.
-https://github.com/i3/i3/issues/6566
-
---- meson.build.orig 2021-02-27 09:37:58.753311900 +0000
-+++ meson.build
-@@ -44,7 +44,7 @@ else
- cdata.set('PATCH_VERSION', 0)
- endif
- cdata.set_quoted('I3_VERSION', '@VCS_TAG@')
--cdata.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
-+cdata.set_quoted('SYSCONFDIR', join_paths(get_option('sysconfdir')))
-
- if get_option('b_sanitize').split(',').contains('address')
- cdata.set('I3_ASAN_ENABLED', 1)
-@@ -52,6 +52,7 @@ endif
-
- cdata.set('HAVE_STRNDUP', cc.has_function('strndup'))
- cdata.set('HAVE_MKDIRP', cc.has_function('mkdirp'))
-+cdata.set('HAVE_USELOCALE', cc.has_function('uselocale'))
-
- # Instead of generating config.h directly, make vcs_tag generate it so that
- # @VCS_TAG@ is replaced.
-@@ -580,7 +581,7 @@ install_data(
- install_subdir(
- 'etc',
- strip_directory: true,
-- install_dir: join_paths(get_option('sysconfdir'), 'i3'),
-+ install_dir: join_paths(get_option('datadir'), 'examples', 'i3'),
- )
-
- install_subdir(
diff --git a/i3/patches/patch-src_config.c b/i3/patches/patch-src_config.c
deleted file mode 100644
index 2466b5f314..0000000000
--- a/i3/patches/patch-src_config.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_config.c,v 1.1 2023/11/06 11:08:52 nia Exp $
-
-Include the correct headers for realpath(3), PATH_MAX.
-
-Should help SunOS.
-
---- src/config.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ src/config.c
-@@ -12,6 +12,8 @@
-
- #include <libgen.h>
- #include <xkbcommon/xkbcommon.h>
-+#include <stdlib.h>
-+#include <limits.h>
-
- char *current_configpath = NULL;
- Config config;
diff --git a/i3/patches/patch-src_ipc.c b/i3/patches/patch-src_ipc.c
deleted file mode 100644
index 68248393a0..0000000000
--- a/i3/patches/patch-src_ipc.c
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD$
-
-Check for uselocale() before using it.
-https://github.com/i3/i3/issues/6566
-
---- src/ipc.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ src/ipc.c
-@@ -909,11 +909,18 @@ static void dump_bar_config(yajl_gen gen
- }
-
- IPC_HANDLER(tree) {
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- yajl_gen gen = ygenalloc();
- dump_node(gen, croot, false);
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
--
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- const unsigned char *payload;
- ylength length;
- y(get_buf, &payload, &length);
-@@ -1585,7 +1592,11 @@ ipc_client *ipc_new_client_on_fd(EV_P_ i
- * generator. Free with yajl_gen_free().
- */
- yajl_gen ipc_marshal_workspace_event(const char *change, Con *current, Con *old) {
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- yajl_gen gen = ygenalloc();
-
- y(map_open);
-@@ -1609,7 +1620,11 @@ yajl_gen ipc_marshal_workspace_event(con
-
- y(map_close);
-
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
-
- return gen;
- }
-@@ -1639,7 +1654,11 @@ void ipc_send_window_event(const char *p
- DLOG("Issue IPC window %s event (con = %p, window = 0x%08x)\n",
- property, con, (con->window ? con->window->id : XCB_WINDOW_NONE));
-
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- yajl_gen gen = ygenalloc();
-
- y(map_open);
-@@ -1658,7 +1677,11 @@ void ipc_send_window_event(const char *p
-
- ipc_send_event("window", I3_IPC_EVENT_WINDOW, (const char *)payload);
- y(free);
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- }
-
- /*
-@@ -1666,7 +1689,11 @@ void ipc_send_window_event(const char *p
- */
- void ipc_send_barconfig_update_event(Barconfig *barconfig) {
- DLOG("Issue barconfig_update event for id = %s\n", barconfig->id);
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- yajl_gen gen = ygenalloc();
-
- dump_bar_config(gen, barconfig);
-@@ -1677,7 +1704,11 @@ void ipc_send_barconfig_update_event(Bar
-
- ipc_send_event("barconfig_update", I3_IPC_EVENT_BARCONFIG_UPDATE, (const char *)payload);
- y(free);
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- }
-
- /*
-@@ -1686,7 +1717,11 @@ void ipc_send_barconfig_update_event(Bar
- void ipc_send_binding_event(const char *event_type, Binding *bind, const char *modename) {
- DLOG("Issue IPC binding %s event (sym = %s, code = %d)\n", event_type, bind->symbol, bind->keycode);
-
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
-
- yajl_gen gen = ygenalloc();
-
-@@ -1714,7 +1749,11 @@ void ipc_send_binding_event(const char *
- ipc_send_event("binding", I3_IPC_EVENT_BINDING, (const char *)payload);
-
- y(free);
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- }
-
- /*
diff --git a/i3/patches/patch-src_load__layout.c b/i3/patches/patch-src_load__layout.c
deleted file mode 100644
index 51d1eb96b3..0000000000
--- a/i3/patches/patch-src_load__layout.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD$
-
-Check for uselocale() before using it.
-https://github.com/i3/i3/issues/6566
-
---- src/load_layout.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ src/load_layout.c
-@@ -634,14 +634,22 @@ bool json_validate(const char *buf, cons
- /* Allow multiple values, i.e. multiple nodes to attach */
- yajl_config(hand, yajl_allow_multiple_values, true);
-
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- if (yajl_parse(hand, (const unsigned char *)buf, len) != yajl_status_ok) {
- unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
- ELOG("JSON parsing error: %s\n", str);
- yajl_free_error(hand, str);
- valid = false;
- }
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
-
- yajl_complete_parse(hand);
- yajl_free(hand);
-@@ -671,7 +679,11 @@ json_content_t json_determine_content(co
- yajl_config(hand, yajl_allow_comments, true);
- /* Allow multiple values, i.e. multiple nodes to attach */
- yajl_config(hand, yajl_allow_multiple_values, true);
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- const yajl_status stat = yajl_parse(hand, (const unsigned char *)buf, len);
- if (stat != yajl_status_ok && stat != yajl_status_client_canceled) {
- unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
-@@ -679,7 +691,11 @@ json_content_t json_determine_content(co
- yajl_free_error(hand, str);
- }
-
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- yajl_complete_parse(hand);
- yajl_free(hand);
-
-@@ -725,7 +741,11 @@ void tree_append_json(Con *con, const ch
- parsing_geometry = false;
- parsing_focus = false;
- parsing_marks = false;
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- const yajl_status stat = yajl_parse(hand, (const unsigned char *)buf, len);
- if (stat != yajl_status_ok) {
- unsigned char *str = yajl_get_error(hand, 1, (const unsigned char *)buf, len);
-@@ -750,7 +770,11 @@ void tree_append_json(Con *con, const ch
- * next time. */
- con_fix_percent(con);
-
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
- yajl_complete_parse(hand);
- yajl_free(hand);
-
diff --git a/i3/patches/patch-src_log.c b/i3/patches/patch-src_log.c
deleted file mode 100644
index 0316b70764..0000000000
--- a/i3/patches/patch-src_log.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_log.c,v 1.10 2021/11/01 20:42:58 wiz Exp $
-
-- ftruncate() is unimplemented in NetBSD FFS.
-
---- src/log.c.orig 2021-02-27 09:37:58.756645200 +0000
-+++ src/log.c
-@@ -136,7 +136,7 @@ void open_logbuffer(void) {
- return;
- }
-
--#if defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
- if (ftruncate(logbuffer_shm, logbuffer_size) == -1) {
- fprintf(stderr, "Could not ftruncate SHM segment for the i3 log: %s\n", strerror(errno));
- #else
diff --git a/i3/patches/patch-src_util.c b/i3/patches/patch-src_util.c
deleted file mode 100644
index 1f6ab54236..0000000000
--- a/i3/patches/patch-src_util.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-Check for uselocale() before using it.
-Fix ctype(3) abuse.
-https://github.com/i3/i3/issues/6566
-
---- src/util.c.orig 2025-12-19 07:19:53.000000000 +0000
-+++ src/util.c
-@@ -67,7 +67,7 @@ __attribute__((__const__)) bool rect_equ
- __attribute__((pure)) bool name_is_digits(const char *name) {
- /* positive integers and zero are interpreted as numbers */
- for (size_t i = 0; i < strlen(name); i++) {
-- if (!isdigit(name[i])) {
-+ if (!isdigit((unsigned char)name[i])) {
- return false;
- }
- }
-@@ -221,12 +221,20 @@ static char **add_argument(char **origin
- #define ystr(str) yajl_gen_string(gen, (unsigned char *)str, strlen(str))
-
- static char *store_restart_layout(void) {
-+#if HAVE_USELOCALE
- locale_t prev_locale = uselocale(numericC);
-+#else
-+ setlocale(LC_NUMERIC, "C");
-+#endif
- yajl_gen gen = yajl_gen_alloc(NULL);
-
- dump_node(gen, croot, true);
-
-+#if HAVE_USELOCALE
- uselocale(prev_locale);
-+#else
-+ setlocale(LC_NUMERIC, "");
-+#endif
-
- const unsigned char *payload;
- size_t length;
Home |
Main Index |
Thread Index |
Old Index