Commit: patch 9.2.0449: Make proto fails in non GTK builds

2 views
Skip to first unread message

Christian Brabandt

unread,
May 6, 2026, 2:30:16 PM (yesterday) May 6
to vim...@googlegroups.com
patch 9.2.0449: Make proto fails in non GTK builds

Commit: https://github.com/vim/vim/commit/0ab4316fced588dd8d5aba1284c0ada14aa8eb7a
Author: Christian Brabandt <c...@256bit.org>
Date: Wed May 6 18:17:00 2026 +0000

patch 9.2.0449: Make proto fails in non GTK builds

Problem: Make proto fails when not building the GTK gui
Solution: Test for $GLIB_COMPILE_RESOURCES as done elsewhere

closes: #20145

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index 2a8ff097b..97200a6b0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2152,7 +2152,9 @@ proto/%.pro: %.c
@$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)

proto/gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
- @$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)
+ @if test -n "$(GLIB_COMPILE_RESOURCES)"; then \
+ $(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG) ; \
+ fi

notags:
-rm -f tags
@@ -3175,7 +3177,9 @@ GUI_GTK_RES_INPUTS = \
../pixmaps/stock_vim_window_split_vertical.png

auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
- $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml
+ if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \
+ $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \
+ fi
auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \
$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \
diff --git a/src/version.c b/src/version.c
index 0c23e6a51..3cbce87d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 449,
/**/
448,
/**/
Reply all
Reply to author
Forward
0 new messages