- patchlevel 122

7.1.122

@@ -0,0 +1,98 @@
+To: vim-dev@vim.org
+Subject: patch 7.1.122
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.122
+Problem:    Mac: building Vim.app fails.  Using wrong architecture.
+Solution:   Use line continuation for the gui_bundle dependency.  Detect the
+	    system architecture with "uname -a".
+Files:	    src/main.aap
+
+
+*** ../vim-7.1.121/src/main.aap	Thu May 10 18:48:19 2007
+--- src/main.aap	Tue Sep 25 21:26:03 2007
+***************
+*** 56,64 ****
+      config {virtual} auto/config.h auto/config.aap :
+                           auto/configure.aap configure.aap
+                           config.arg config.h.in config.aap.in
+          :sys CONFIG_STATUS=auto/config.status
+                  ./configure.aap `file2string("config.arg")`
+!                     --with-mac-arch=ppc
+                      --cache-file=auto/config.cache
+  
+      # Configure arguments: create an empty "config.arg" file when its missing
+--- 56,71 ----
+      config {virtual} auto/config.h auto/config.aap :
+                           auto/configure.aap configure.aap
+                           config.arg config.h.in config.aap.in
++         # Use "uname -a" to detect the architecture of the system.
++         @ok, uname = redir_system('uname -a', 0)
++         @if string.find(uname, "i386") >= 0:
++         @   arch = "i386"
++         @else:
++         @   arch = "ppc"
++         :print Building for $arch system
+          :sys CONFIG_STATUS=auto/config.status
+                  ./configure.aap `file2string("config.arg")`
+!                     --with-mac-arch=$arch
+                      --cache-file=auto/config.cache
+  
+      # Configure arguments: create an empty "config.arg" file when its missing
+***************
+*** 1167,1173 ****
+          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
+  # TODO: Create the vimtutor application.
+  
+! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
+                          bundle-resource bundle-language
+  
+  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
+--- 1174,1180 ----
+          :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
+  # TODO: Create the vimtutor application.
+  
+! gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
+                          bundle-resource bundle-language
+  
+  bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
+***************
+*** 1187,1193 ****
+          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
+  
+  bundle-resource {virtual}: bundle-dir bundle-rsrc
+!     :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
+  
+  ### Classic resources
+  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
+--- 1194,1200 ----
+          :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
+  
+  bundle-resource {virtual}: bundle-dir bundle-rsrc
+!         :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
+  
+  ### Classic resources
+  # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
+*** ../vim-7.1.121/src/version.c	Tue Sep 25 20:39:14 2007
+--- src/version.c	Tue Sep 25 22:12:16 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     122,
+  /**/
+
+-- 
+Men may not be seen publicly in any kind of strapless gown.
+		[real standing law in Florida, United States of America]
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

README.patches

@@ -148,3 +148,6 @@ Individual patches for Vim 7.1:
   1414  7.1.117  can't check wether Vim was compiled with Gnome
   1805  7.1.118  (after 7.1.107) compiler warning for Visual C compiler
   1761  7.1.119  crash after setting 'cmdheight' to huge value
+ 17416  7.1.120  can't use valgrind with "make test" to test for memory leaks
+  2350  7.1.121  ":cd %:h" fails when editing file in current directory
+  3732  7.1.122  Mac: building with Aap doesn't work properly

vim.spec

@@ -15,7 +15,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 119
+%define patchlevel 122
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
@@ -179,6 +179,9 @@ Patch116: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.116
 Patch117: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.117
 Patch118: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.118
 Patch119: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.119
+Patch120: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.120
+Patch121: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.121
+Patch122: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.122
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -442,6 +445,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch117 -p0 
 %patch118 -p0 
 %patch119 -p0 
+%patch120 -p0 
+%patch121 -p0 
+%patch122 -p0 
 
 # install spell files
 %if %{withvimspell}
@@ -827,6 +833,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Sep 26 2007 Karsten Hopp <karsten@redhat.com> 7.1.122-1
+- patchlevel 122
+
 * Tue Sep 25 2007 Karsten Hopp <karsten@redhat.com> 7.1.119-1
 - patchlevel 119