r771 - in x86/branches/utf8-newmake: . packages/xfce packages/xfce/desktop-files

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Sep 25 08:22:29 PDT 2005


Author: alexander
Date: 2005-09-25 09:22:28 -0600 (Sun, 25 Sep 2005)
New Revision: 771

Added:
   x86/branches/utf8-newmake/packages/xfce/desktop-files/w3m.desktop
Removed:
   x86/branches/utf8-newmake/packages/xfce/desktop-files/glinks.desktop
   x86/branches/utf8-newmake/packages/xfce/desktop-files/links.desktop
Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/packages/xfce/Makefile
Log:
Built XFCE, added a patch for incorrectly tagged message

Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-09-25 14:24:16 UTC (rev 770)
+++ x86/branches/utf8-newmake/Makefile	2005-09-25 15:22:28 UTC (rev 771)
@@ -213,7 +213,7 @@
 	ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff ch-openssh \
 	ch-glib2 ch-libungif ch-imlib ch-imlib2 ch-gc ch-w3m ch-pango ch-atk ch-gtk2 \
 	ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification ch-vim stop-here ch-xfce ch-lua ch-ion ch-irssi \
+	ch-startup-notification ch-vim ch-xfce stop-here 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 \

Modified: x86/branches/utf8-newmake/packages/xfce/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/xfce/Makefile	2005-09-25 14:24:16 UTC (rev 770)
+++ x86/branches/utf8-newmake/packages/xfce/Makefile	2005-09-25 15:22:28 UTC (rev 771)
@@ -8,6 +8,9 @@
 URL-$(FILE)= $(HTTPBLFS)/W-Z/$(FILE)
 SHA-$(FILE)= e589ded559cf86fbb92b85711081df0aca00249d
 
+PATCH1= $(DIR)-message-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= 2d88093ce453fc549cbc33e86c9bf8151b0494e2
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,14 +19,16 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
-	echo "" > ../$(DIR)-$@.log
 	cd src; for i in `cat ../../list`; \
 	do unpack $$i.tar.gz ; \
-	cd $$i ; ./configure --prefix=/usr --sysconfdir=/etc \
+	cd $$i ; \
+	 if [ "$$i" = "xfce-mcs-plugins-4.2.2" ] ; then \
+	 patch -Np1 -i ../../../$(PATCH) ; fi ; \
+	 ./configure --prefix=/usr --sysconfdir=/etc \
 	 --enable-debug=no --enable-panel --enable-startup-notification \
 	 --libexecdir=/usr/sbin ; \
 	make $(PM) ; \

Deleted: x86/branches/utf8-newmake/packages/xfce/desktop-files/glinks.desktop
===================================================================
--- x86/branches/utf8-newmake/packages/xfce/desktop-files/glinks.desktop	2005-09-25 14:24:16 UTC (rev 770)
+++ x86/branches/utf8-newmake/packages/xfce/desktop-files/glinks.desktop	2005-09-25 15:22:28 UTC (rev 771)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec="links -g"
-Name=Links (graphical)
-Terminal=0
-Comment=Links (graphical)
-Icon=html
-MimeType=text/html
-XClassHintResName=Links
-Categories=Application;Network;

Deleted: x86/branches/utf8-newmake/packages/xfce/desktop-files/links.desktop
===================================================================
--- x86/branches/utf8-newmake/packages/xfce/desktop-files/links.desktop	2005-09-25 14:24:16 UTC (rev 770)
+++ x86/branches/utf8-newmake/packages/xfce/desktop-files/links.desktop	2005-09-25 15:22:28 UTC (rev 771)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=links %u
-Name=Links
-Terminal=1
-Comment=Links
-Icon=html
-MimeType=text/html
-XClassHintResName=Links
-Categories=Application;Network;

Added: x86/branches/utf8-newmake/packages/xfce/desktop-files/w3m.desktop
===================================================================
--- x86/branches/utf8-newmake/packages/xfce/desktop-files/w3m.desktop	2005-09-25 14:24:16 UTC (rev 770)
+++ x86/branches/utf8-newmake/packages/xfce/desktop-files/w3m.desktop	2005-09-25 15:22:28 UTC (rev 771)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec=w3m %u
+Name=W3M
+Terminal=1
+Comment=W3M
+Icon=html
+MimeType=text/html
+Categories=Application;Network;




More information about the livecd mailing list