Apply Debian patch fixing multiple build issues, including bug #470148

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 234 insertions, 7 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 718b90c18281..0529b1152b7f 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.152 2013/09/21 13:18:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.153 2013/09/22 09:17:10 pacho Exp $
+
+  22 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/icewm-1.3.7-build-fixes.patch, icewm-1.3.7-r1.ebuild:
+  Apply Debian patch fixing multiple build issues, including bug #470148
 
   21 Sep 2013; Pacho Ramos <pacho@gentoo.org> icewm-1.3.7-r1.ebuild:
   Fix automagic dep on fribidi (#485562 by Agostino Sarubbo)
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 4abd73c3bf4d..35ee27c591d6 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -5,6 +5,7 @@ AUX IceWM.desktop 200 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42
 AUX icewm 33 SHA256 9c227d5676372166707902073337c0610ea0e1e0bb1c5d8881bd4e3b44919df1 SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 WHIRLPOOL 7248377faae7454d1695d0c094829c47edad23b6bec84197bfeeda6500eb418dc9b627f3d4fe811ebffce2f91c508af66478d7177bfaa0013371f1cc0a4f391b
 AUX icewm-1.2.37-gnome2.patch 1194 SHA256 c1f64007fe60a898b3f816b08b8ef03a8ed9607a4367aead176220ad0b56c3c9 SHA512 f680359751a29de347de9c993d5cdda31291616897492b64acc8153333e4dc7eddd026e985765ccc75bfa42872c0c3322cbfe308c040de3db38712415a7a42ce WHIRLPOOL c046bad4bb2704863082a0d6b390c46792e600c6e82f4a9a395595dfecf4baa178a77fc7f03eb8dcdb65a5e839f7c2e1a7a8774ba26924be97bc42bb0c21e77a
 AUX icewm-1.2.37-libX11-1.5.0-deprecated.patch 711 SHA256 1b8ad309391c46d79f90feea0d47927a105ee413d82f2533f61530ecf22154cd SHA512 a73c2b3e6de1caa2ba9855ef49870ba37ac0d726e0ef18b600767128b62467e5f1281c20087cc3180510e7c56c6d9a73cd12b6964a5c7fcb0773a184a1e782e2 WHIRLPOOL f34a5fb98b335579ed581407468065e30b40e0a1d0c91f251459994256b93b82cd7124c6e0dd094daa1884a9e232f0936ebb65c1216c532a96ab4a9e92331bf9
+AUX icewm-1.3.7-build-fixes.patch 7116 SHA256 7e206b8e4d3fd88d4c64be1158cc7781772e00a2520669966db3f1ce87181d4b SHA512 e7118206876b7b3b04e17c594946e7f13a8f2b7aaa9f4a3d33bc4ecb7ebe8ff2feb1209c42cdd640770a06a1fe10c95ed2f2047646bb934a03ae93783dd0dbdc WHIRLPOOL 10f6d2de01687bba03eb76f0d3a4ff5f7b288d0e7d10b690efe3403d9294554bd834fe87a746dfc681ec32900518f8b415ecbef8c1ac221d6ebbb8f042f44def
 AUX icewm-1.3.7-configurenotify.patch 444 SHA256 d86d8e670211916b426e82088ce68af8cad271c0a957b18fa95a79eae513c5b2 SHA512 f5bd4637287f15f497482ae3f566c119a907a6fc7078f177bb16c9304d47f69de3b000b539f10597ad5c9910191b5ffbd443f3416d2de65c1192470e24f2c61b WHIRLPOOL 29f6396d6b533c0654b7fee859cab573f0d9a7ced6b60805ee7f1357e5bb4f482aff9ed28797cbd5968241b77d948c5ac231dfad285055be7e97c2d0d208c0b8
 AUX icewm-1.3.7-deprecated.patch 443 SHA256 a05efa3620f6e0c6bd92f53da7a0c920f95760c8350c91ab52ed7ca72adedbe4 SHA512 69c39fab4208ae3f3408d63713c210833460a03c181fde223fa5acba56dc6e1b2b1072e135143cf7ff9867b0a765074b62eb1218c49857553fb867a7590cf976 WHIRLPOOL 5f616811ff8b1320f7b200e74d5fc72c46fc14efde9db19af57be67a15bbed1e2e79b66fbbfc7701bcf866f6195b80855de887d961431da1fbf92fd66aa44fa4
 AUX icewm-1.3.7-dso.patch 376 SHA256 4c8108800ad05a88011a7e4dbe9ed009a3ff314a434afa0d832ab74785887223 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a WHIRLPOOL 3eef2a86500b03cba9c08b3159ff21bfe8ffdd6bdfc2747f4a2a2fc62ab0b021a48158ac7f6bf3648d922ab4b9f52f877c3b7894a76cc7c02a213a153c65e9cf
@@ -24,14 +25,14 @@ AUX icewm-xdg-menu 4380 SHA256 115f081152fe8d376b884402bd8af24f678e68bbf4d671769
 DIST icewm-1.2.37.tar.gz 841879 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595 SHA512 e7605470ab6480ac93ae482d68cab361b640a9355db0826c7d1a4b48f1a29c690fa908d649929db203ddb340e61a9fcbbf19732e237bbefd5116f33bdd85e34f WHIRLPOOL 8d55e97a5584c26151d4bbe64bd1be9a07ef9f8a10b767fd1d015f94fc95b66988ad3ce675bbbf446437b3ee199664934e7c432b4c42474e691aafcd9ccb2868
 DIST icewm-1.3.7.tar.gz 898197 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b SHA512 b0c09b19d1a6df3acf03eda364716b5a8516011c760806087fd6315ccf2a5c926471db56079b46d8fab01db87ea42a809a66fe3088b6ad8575e41a000914e895 WHIRLPOOL 8ea9ade64b2d6eadedb35ec146096fd6c3986142ff14d718c789315aaf3bfb1ef9afcb5206ee2286bc01f3775373428d5b969e3e632e87eb2bf1e49a3d03b9ef
 EBUILD icewm-1.2.37.ebuild 2982 SHA256 da8b5d7b54234d08b1f2c1cb66ba00a90f13f2291c662f3e3cf8f1d586f4f110 SHA512 b817ffc6f2ef6280e769ed7ab7713a2294dfe42775204ab80840b93fd68e629b30c6ed501feda2c850a5854773ae047835247bfff32a3f00215012afc410de35 WHIRLPOOL a75427d1169a089008d98a9b4d6ec60db0cc3fc8f7f8743f0a531a106080fa4e5f9e655cc9e3464f488d2c801c114af8acdfad6db65684d473a99affd3523f0e
-EBUILD icewm-1.3.7-r1.ebuild 3432 SHA256 ef3cc0bb7c830f16506e56b954fb587f60656b9bf9c1c1c42f8a7de9786961ee SHA512 8d43cf6da82471dd7fca5e6f91d8e24db89cf3fea83a53e91a3cfee7fd1ab57b92703569b7b171f3139c02aa6edc39a5db42c83987db6e02701619cba765d079 WHIRLPOOL f257bc1b8bc8166b5f357a54dfe91b3a489cee3aa1972565b6cd11e1afc0705e3dc4fb100242a1f2f22431aa376070157546e955e0eeff2a3a576fa5366c030d
+EBUILD icewm-1.3.7-r1.ebuild 3548 SHA256 a628cac16f452f4410091f4ae1397dc84bc457b5ad427aab3f07922438e7ccd2 SHA512 0c363a4ba1409c376e108e631788b10bd4a165831ddac2232f03dbe3bd69d7c56a54c841fe0e10f19aab0dd20464863c0adf01d55e314b57fd8169c404bf4ef1 WHIRLPOOL 392f5e9f6cb6e942a58bb585784e84b0717ec919654c205d796e73ca1d93bbc732c018e04799f35050933d7301ee9865b04013abdb889eee6c2486838325b72e
 EBUILD icewm-1.3.7.ebuild 2748 SHA256 b6ec683f6fa49fa9da122b2933fa58470427122ea0ad88a554f795363b1eefb8 SHA512 a4ffb9a713f06fa27244340e836319bf83569f58ac05d559edf9e5a1df61ee6a9b2de659a1ce1dabd3b472f704d2b396526045589acac0cff26bc20b07c1fa7f WHIRLPOOL c8f4bd8b14074915cc19d6faf7d3074f7119fdf233f6c6a23ddeee55f1cefbc55cb4232fc517029493e0d60dccdbd539df737683799c943a1b7f0a27ad66c2af
-MISC ChangeLog 23887 SHA256 3acad4b9ba5bbdaa4ed4549f4e2e99dc73422f636487a39fc5965cea71acf76c SHA512 4704f064c52d4ea72506efb089398deaefb02db19d925643ea483d55ec62a39f470da35e23c66dadb993f5a372b5d704abc17b4c8e9b38c602d09f8d8e7767a7 WHIRLPOOL ea83285a62f14d3bb27e0a7402ee956e7759584a3e6fc51d47f27b09f1f92b933655fe7561ef8d0973e493cb928e6bc7d1897247a6d0c9c34cbf0260a85e9472
+MISC ChangeLog 24070 SHA256 febeec186abb80c9b29d0039dfc2b1e87fb2dae3a2ce985be7606da835b30243 SHA512 81a305892c325f4f353460ce8fa9eee43ca9657b1a2bca2e90a8ae196c667ea50fd12404bacf1a2d68f3df8d2d07741a2a9def469f2c751da96ee36d02a88f6c WHIRLPOOL f14f234c4f4c178f8cbcb8c9e37969f2ac5bc36e8aea37015821f0decaf3199fdacf3d368bd4e9ea2c272ce8d7cf8aaff9b60890c68379fb6fd92c02938eaeca
 MISC metadata.xml 402 SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde SHA512 d2e1bdce89dda0c21ba433d43f4edfdf6b8e3f2fd394d5f9b52741ba9034b94f612d5e2f183ea67f345d5fc1480faf1632525a32f52babe6e027085fff216a65 WHIRLPOOL b2f6eab04cad767e6607d14f57a6d83d223663f006e21bf81ae53ce9173decf45afcfcf1361866e54469fbf7bcb0dc7593f75eef8bbfd3e403e7b0214b77bcc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlI9nLEACgkQCaWpQKGI+9SGuQCdGj/vkOm+/ECoamJEp6fBNjcF
-cqEAni0A8lNUydfnsbP6S/oycpOR8zh8
-=1ORw
+iEYEAREIAAYFAlI+tZcACgkQCaWpQKGI+9TZCQCdEPSnE0EeQtGTNd0E0VEzgS3u
+zcYAoILPQDxgf0xSjDn38tdHRYY8VJBm
+=VXeC
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
new file mode 100755
index 000000000000..0dd4b6dc0e76
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.7-build-fixes.patch
@@ -0,0 +1,219 @@
+Index: icewm-1.3.7/po/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/po/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/po/Makefile.in	2013-06-28 18:46:58.940864492 +0200
+@@ -20,6 +20,7 @@
+ XGETTEXT =	@XGETTEXT@
+ MSGMERGE =	@MSGMERGE@
+ MSGFMT =	@MSGFMT@
++VPATH = .:po:@srcdir@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .mo
+Index: icewm-1.3.7/src/WinMgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/WinMgr.h	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/WinMgr.h	2013-06-28 18:46:58.940864492 +0200
+@@ -128,7 +128,7 @@
+  * this where WIN_WORKSPACE_COUNT comes into play.
+  */
+ 
+-#define WinWorkspaceInvalid    (-1L)
++#define WinWorkspaceInvalid    ((unsigned long)-1)
+ 
+ /* workspaces */
+ #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
+Index: icewm-1.3.7/src/yfont.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yfont.cc	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yfont.cc	2013-06-28 18:46:58.940864492 +0200
+@@ -12,7 +12,7 @@
+ 
+ extern ref<YFont> getXftFont(ustring name, bool antialias);
+ extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
+-extern ref<YFont> getCoreFont(ustring name);
++extern ref<YFont> getCoreFont(const char*);
+ 
+ #ifdef CONFIG_XFREETYPE
+ ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
+@@ -46,7 +46,9 @@
+ #endif
+ 
+ #ifdef CONFIG_COREFONTS
+-    return getCoreFont(name);
++    char tmp[4096]; // XXX: such things should go into getCoreFont directly
++    name.copy(tmp, sizeof(tmp));
++    return getCoreFont(tmp);
+ #else
+     return null;
+ #endif
+Index: icewm-1.3.7/src/yapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yapp.cc	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/yapp.cc	2013-06-28 18:46:58.944864245 +0200
+@@ -269,7 +269,7 @@
+         }
+ #endif
+ 
+-        {
++        if(measure_latency) {
+             struct timeval difftime;
+             struct timeval curtime;
+             gettimeofday(&curtime, 0);
+Index: icewm-1.3.7/src/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/src/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/src/Makefile.in	2013-06-28 18:46:58.944864245 +0200
+@@ -11,7 +11,7 @@
+ 
+ CXX =           @CXX@
+ HOSTCXX =       @HOSTCXX@
+-LD =            @CXX_LINK@
++LD =            gcc
+ HOSTLD =        @HOSTCXX_LINK@
+ EXEEXT =        @EXEEXT@
+ 
+@@ -32,12 +32,12 @@
+                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
+                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
+ 
+ CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
+-	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
++	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ -I. # `fc-config --cflags`
+ LFLAGS =	@LDFLAGS@ 
+-LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
++LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
+ 
+ CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
+ IMAGE_LIBS =    @IMAGE_LIBS@
+@@ -192,6 +192,8 @@
+ TESTCASES = @TESTCASES@
+ OBJECTS = @BASEOBJS@ @TESTOBJS@
+ BINARIES = @BASEBINS@ @TESTBINS@
++BASEOBJS = @BASEOBJS@
++VPATH = .:@srcdir@
+ 
+ ################################################################################
+ 
+@@ -209,7 +211,8 @@
+ 	@echo "  CXX     " $@
+ 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+ 
+-$(BINARIES):
++$(BINARIES): $(BASEOBJS)
++#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
+ 	@echo "  LD      " $@
+ 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
+ 
+@@ -245,6 +248,8 @@
+ 
+ genpref$(EXEEXT): $(genpref_OBJS)
+ 
++build-dep: $(DEPLIST)
++
+ ################################################################################
+ 
+ check:	all tests
+Index: icewm-1.3.7/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/Makefile.in	2013-06-28 18:46:58.952863752 +0200
++++ icewm-1.3.7/Makefile.in	2013-06-28 18:46:58.944864245 +0200
+@@ -4,6 +4,8 @@
+ # Please run 'configure' first (generate it with autogen.sh)
+ ################################################################################
+ 
++SHELL=/bin/bash
++
+ srcdir     = @srcdir@
+ top_srcdir = @top_srcdir@
+ 
+@@ -33,7 +35,7 @@
+ 
+ ################################################################################
+ 
+-BINFILES    = @BINFILES@ icewm-set-gnomewm
++BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
+ LIBFILES    = lib/preferences lib/winoptions lib/keys \
+               lib/menu lib/toolbar # lib/programs
+ DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
+@@ -46,21 +48,22 @@
+ install:	@TARGETS_INSTALL@
+ 
+ base icesound icehelp:
+-	@cd src; $(MAKE) $@
++	@cd src && $(MAKE) $@
+ 
+ docs:
+-	@cd doc; $(MAKE) all
++	@cd doc && $(MAKE) all
+ 
+ nls:
+-	@cd po; $(MAKE) all
++	@cd po && $(MAKE) all
+ 
+ srcclean:
+-	@cd src; $(MAKE) clean
++	@cd src && $(MAKE) clean
+ 
+ clean:  srcclean
+-	@cd doc; $(MAKE) clean
++	@cd doc && $(MAKE) clean
+ 
+-distclean: clean
++distclean:
++	@-$(MAKE) clean
+ 	rm -f *~ config.cache config.log config.status install.inc \
+ 	sysdep.inc src/config.h \
+ 	lib/preferences \
+@@ -68,10 +71,10 @@
+ 
+ maintainer-clean: distclean
+ 	rm -f icewm.spec icewm.lsm Makefile configure src/config.h.in
+-	@cd doc; $(MAKE) maintainer-clean
++	@cd doc && $(MAKE) maintainer-clean
+ 
+ check:
+-	@cd src ; $(MAKE) check >/dev/null
++	@cd src && $(MAKE) check >/dev/null
+ 
+ dist:	distclean docs configure
+ 
+@@ -80,21 +83,23 @@
+ 	@echo ------------------------------------------
+ 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
++#generated files, relative to the build directory
+ 	@for bin in $(BINFILES); do \
+              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
+          done
+ 	
+ 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
+ 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
++# data files from the source directory
+ 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
+ 	@for lib in $(LIBFILES); do \
+-             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
++             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
+          done
+ 
+ 	@for xpmdir in $(XPMDIRS); do \
+-	     if test -d "lib/$${xpmdir}"; then \
++	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
+ 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+-		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
++		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
+ 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
+ 		done; \
+ 	    fi; \
+@@ -126,7 +131,7 @@
+ 
+ install-nls: nls
+ 	@echo ------------------------------------------
+-	@cd po; $(MAKE) install
++	@cd po && $(MAKE) install
+ 	@echo ------------------------------------------
+ 
+ install-man:
diff --git a/x11-wm/icewm/icewm-1.3.7-r1.ebuild b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
index 78c25f07f0e6..a2e48a242677 100644
--- a/x11-wm/icewm/icewm-1.3.7-r1.ebuild
+++ b/x11-wm/icewm/icewm-1.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.2 2013/09/21 13:18:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7-r1.ebuild,v 1.3 2013/09/22 09:17:10 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -78,6 +78,9 @@ src_prepare() {
 	# Get thermal info from proper locations, bug #452730
 	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
 
+	# Debian patch fixing multiple build issues, like bug #470148
+	epatch "${FILESDIR}"/${PN}-1.3.7-build-fixes.patch
+
 	cd "${S}/src"
 	use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"