[packages/vim] Up to 9.2.0909; security

[arekm]

commit eed151eec0251f030298fed55e68ed4f9b570b19
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Aug 4 23:06:28 2026 +0200

    Up to 9.2.0909; security
    
    GHSA-r5v6-q6j8-8qw2, GHSA-rcr7-f3wr-22r2, GHSA-hm4g-pjfx-m27j, GHSA-49m8-wwxj-mr69,
    GHSA-pmvp-6rcj-98p4, GHSA-69ch-22ch-r887, GHSA-cx73-phcg-3j5g, GHSA-9jqx-hgpr-6v64,
    GHSA-r22p-fhw4-84p2

 vim-gtk2-popup-image.patch    | 13 -------------
 vim-hardcopy-pango-libs.patch | 21 +++++++++++++++++++++
 vim.spec                      |  6 +++---
 3 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index e90c547..6a2ff39 100644
--- a/vim.spec
+++ b/vim.spec
@@ -31,7 +31,7 @@
 # wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
 # VCS Commits: https://github.com/vim/vim/commits/master
 
-%define		ver		9.2.0804
+%define		ver		9.2.0909
 %define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
@@ -52,7 +52,7 @@ License:	Charityware
 Group:		Applications/Editors/Vim
 #TODO:	https://github.com/vim/vim/archive/v%{ver}/%{name}-%{ver}.tar.gz
 Source0:	https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5:	3e950f943462f9317bf0c1bee4f70222
+# Source0-md5:	8f5f9296c6fbdcc00c618bd3fcdf2ffc
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:	http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -106,7 +106,7 @@ Patch38:	%{name}-ft-gyp.patch
 Patch39:	%{name}-revert-7.4.165-noundo.patch
 Patch40:	desktop.patch
 Patch41:	%{name}-lua.patch
-Patch42:	%{name}-gtk2-popup-image.patch
+Patch42:	%{name}-hardcopy-pango-libs.patch
 URL:		http://www.vim.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
diff --git a/vim-gtk2-popup-image.patch b/vim-gtk2-popup-image.patch
deleted file mode 100644
index 8b90349..0000000
--- a/vim-gtk2-popup-image.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/feature.h
-+++ b/src/feature.h
-@@ -1134,7 +1134,9 @@
- #if defined(FEAT_IMAGE) && defined(FEAT_GUI_GTK)
- # ifdef USE_GTK4_SNAPSHOT
- #  define FEAT_IMAGE_GDK
--# else
-+// The cairo popup image backend draws onto gui.surface, which only exists
-+// for GTK3/GTK4; GTK2 has no such surface, so leave the feature off there.
-+# elif defined(USE_GTK3) || defined(USE_GTK4)
- #  define FEAT_IMAGE_CAIRO
- # endif
- #endif
diff --git a/vim-hardcopy-pango-libs.patch b/vim-hardcopy-pango-libs.patch
new file mode 100644
index 0000000..0d887a1
--- /dev/null
+++ b/vim-hardcopy-pango-libs.patch
@@ -0,0 +1,21 @@
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -3191,8 +3191,18 @@
+
+   CPPFLAGS=$cppflags_save
+   CFLAGS=$cflags_save
++else
++  dnl AC_SUBST() above expands unconditionally, so the values picked up by the
++  dnl "for cairo"/"for pango" checks would still reach ALL_LIBS and break e.g.
++  dnl a --disable-gui -static link on a host that has pango/cairo installed.
++  CAIRO_CFLAGS=
++  CAIRO_CPPFLAGS=
++  CAIRO_LIBS=
++  PANGO_CFLAGS=
++  PANGO_CPPFLAGS=
++  PANGO_LIBS=
+ fi
+
+
+ dnl Check for Motif include files location.
+ dnl The LAST one found is used, this makes the highest version to be used,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/eed151eec0251f030298fed55e68ed4f9b570b19