r426 - in x86/branches/utf8: . packages/vim

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Jul 31 05:06:07 PDT 2005


Author: alexander
Date: 2005-07-31 06:06:06 -0600 (Sun, 31 Jul 2005)
New Revision: 426

Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/vim/Makefile
Log:
Built (g)vim with all upstream patches that apply.


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-31 01:09:27 UTC (rev 425)
+++ x86/branches/utf8/Makefile	2005-07-31 12:06:06 UTC (rev 426)
@@ -183,7 +183,7 @@
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype ch-fontconfig ch-Xorg ch-freefont ch-inputattach \
 	ch-fonts-dejavu ch-update-fontsdir ch-libjpeg ch-libtiff ch-openssh ch-pkgconfig ch-glib2 \
 	ch-libungif ch-imlib2 ch-imlib ch-boehm-gc ch-w3m ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification stop-here ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
+	ch-startup-notification ch-gvim stop-here ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd \
 	ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn \
 	ch-raidtools ch-eject ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux

Modified: x86/branches/utf8/packages/vim/Makefile
===================================================================
--- x86/branches/utf8/packages/vim/Makefile	2005-07-31 01:09:27 UTC (rev 425)
+++ x86/branches/utf8/packages/vim/Makefile	2005-07-31 12:06:06 UTC (rev 426)
@@ -3,6 +3,7 @@
 # Package versions
 NM= vim
 VRS= 6.3
+PATCHLEVEL= 086
 DIR= $(NM)63
 FILE= $(NM)-$(VRS).tar.bz2
 PATCH= $(NM)-$(VRS)-security_fix-1.patch
@@ -10,7 +11,7 @@
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(PATCH)
 URL2= $(HTTP)/$(NM)/$(LANG_PACK)
-
+URL3= ftp://ftp.vim.org/pub/vim/patches/$(VRS)/
 # RULES
 
 .PHONY: clean chroot stage2 stage3
@@ -21,26 +22,30 @@
 chroot3:
 	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-gvim $(chbash2)'
 
-stage2:
-	@echo ""
-	@echo "======> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(LANG_PACK) ] ; then $(WGET) $(URL2) && \
-	 mv $(LANG_PACK) $(SRC) ; fi
-	@if [ ! -f /usr/bin/vi ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 unpack $(SRC)/$(LANG_PACK) --strip-components=1 && \
-	 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h && \
-	 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure --prefix=/usr --enable-multibyte && \
-	 make -j3 && make install && \
-	 ln -sf vim /usr/bin/vi ; fi && cp $(ROOT)/etc/vimrc /etc
-	@make clean
+# Known rejected patches, all because we don't download the -extra tarball:
+# 
+#   - 6.3.022: (extra) Win32: can't write file with path sep. in trail byte
+#   - 6.3.025: (extra) missing NUL for list of server names
+#   - 6.3.035: (extra) RISC OS: compilation problems, better Makefile
+#   - 6.3.038: (extra) Win32: mouse click take effect much later
+#   - 6.3.041: (extra) Win32: ":cd %:p:h" doesn't work when 'enc' is not ACP
+#   - 6.3.044: (extra) Mac: pixels left behind when 'linespace' is non-zero
+#   - 6.3.047: (extra) Win XP with Borland: new file is created read-only
+#   - 6.3.048: (extra) VMS: doesn't build on IA64
+#   - 6.3.052: (extra) Win 98: can't enter non-ASCII characters if 'enc' set
+#   - 6.3.073: Win32 GUI: display errors when scrolling up/down
+#   - 6.3.077: (extra) VMS: character after ESC not handled correctly
+#   - 6.3.078: (extra, after 6.3.077) VMS: performance issue
+#   - 6.3.080: (extra) Win32: edit fails when 'enc' is utf-8 and Chinese cp
+#   - 6.3.084: (extra) Cygwin: update src makefile and add src/po makefile
 
+# Non-ISO-8859-1 tutorials are removed because in UTF-8 locales "vimtutor"
+# mis-converts such tutorials, thus making them unreadable.
+#
+# UTF-8 based distros (like Fedora Core) convert all tutorials to UTF-8, thus
+# avoiding mis-conversion, but that leaves non-UTF-8 users with unreadable
+# tutorials and thus it is not acceptable for LFS.
+
 stage3:
 	@echo ""
 	@echo "======> Building $(NM) in chroot (stage 3)"
@@ -49,16 +54,27 @@
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
 	 mv $(PATCH) $(SRC) ; fi
+	@if [ ! -f patches/$(VRS).$(PATCHLEVEL) ] ; then mkdir -p patches && \
+	 cd patches && $(WGET) -np -r -nd $(URL3) && \
+	 sed 's,^MD5 (\(.*\)) = \(.*\),\2  \1,' MD5 | md5sum -c ; fi
 	@if [ ! -f $(SRC)/$(LANG_PACK) ] ; then $(WGET) $(URL2) && \
 	 mv $(LANG_PACK) $(SRC) ; fi
-	@if [ ! -f /usr/bin/gvim ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 unpack $(SRC)/$(LANG_PACK) --strip-components=1 && \
+	@if [ ! -f /usr/bin/gvim ] ; then unpack $(SRC)/$(FILE) && \
+	 unpack $(SRC)/$(LANG_PACK) && cd $(DIR) && \
+	 for P in ../patches/$(VRS).* ; do \
+	  if patch -Np0 --dry-run -s -t -b -i $$P >/dev/null ; then \
+	   echo "+ Applying $$P..." && patch -s -Np0 -i $$P ; \
+	   else echo "- Rejecting $$P" ; \
+	  fi ; \
+	 done && \
 	 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h && \
 	 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
 	 ./configure --prefix=/usr --with-features=huge && \
 	 make -j3 && make install && \
+	 rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk} && \
+	 rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.* && \
 	 ln -sf vim /usr/bin/vi ; fi && cp $(ROOT)/etc/vimrc /etc
 	@make clean
+
 clean:
 	@-rm -rf $(DIR)




More information about the livecd mailing list