Author: alexander
Date: 2006-07-13 09:30:12 -0600 (Thu, 13 Jul 2006)
New Revision: 1634
Added:
trunk/packages/gaim/
trunk/packages/gaim/Makefile
trunk/packages/gaim/gaim-1.5.0-simhtml-1.patch
trunk/packages/gnutls/
trunk/packages/gnutls/Makefile
trunk/packages/libgcrypt/
trunk/packages/libgcrypt/Makefile
trunk/packages/libgpg-error/
trunk/packages/libgpg-error/Makefile
trunk/packages/proprietary-drivers/
trunk/packages/proprietary-drivers/Makefile
trunk/root/.gaim/
trunk/root/.gaim/accounts.xml
trunk/root/.gaim/blist.xml
Modified:
trunk/Makefile
trunk/scripts/functions
Log:
Added GAIM and proprietary video drivers.
NVIDIA drivers are not tested because I don't have NVIDIA card.
FGLRX doesn't work on my Radeon 9200 LE card (known ATI bug).
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-07-13 13:07:46 UTC (rev 1633)
+++ trunk/Makefile 2006-07-13 15:30:12 UTC (rev 1634)
@@ -245,7 +245,8 @@
ch-gc ch-w3m ch-cairo ch-hicolor-icon-theme \
ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-seamonkey \
ch-librsvg ch-startup-notification chroot-gvim ch-xfce ch-vte ch-exo \
- ch-XML-Parser ch-Terminal ch-mousepad ch-irssi \
+ ch-XML-Parser ch-Terminal ch-mousepad ch-irssi ch-libgpg-error \
+ ch-libgcrypt ch-gnutls ch-gaim \
ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc \
ch-dialog ch-ncftp ch-pciutils ch-device-mapper ch-LVM2 ch-dmraid \
@@ -261,6 +262,7 @@
update-fontsdir
ifeq ($(LFS-ARCH),x86)
make ch-gcc33
+ make ch-proprietary-drivers
endif
ifeq ($(LFS-ARCH),ppc)
make ch-yaboot
Added: trunk/packages/gaim/Makefile
===================================================================
--- trunk/packages/gaim/Makefile (rev 0)
+++ trunk/packages/gaim/Makefile 2006-07-13 15:30:12 UTC (rev 1634)
@@ -0,0 +1,33 @@
+# gaim Makefile
+
+NM= gaim
+VRS= 1.5.0
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://puzzle.dl.sourceforge.net/sourceforge/gaim/$(FILE)
+SHA-$(FILE)= a280d005f01be7fa89c9fa210efb86cc6a9eb9c7
+
+PATCH1= $(DIR)-simhtml-1.patch
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ patch -Np1 -i ../$(PATCH1)
+ ./configure --prefix=/usr
+ make
+ make install
+ cp -rv $(ROOT)/root/.gaim /root
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Added: trunk/packages/gaim/gaim-1.5.0-simhtml-1.patch
===================================================================
--- trunk/packages/gaim/gaim-1.5.0-simhtml-1.patch
(rev 0)
+++ trunk/packages/gaim/gaim-1.5.0-simhtml-1.patch 2006-07-13 15:30:12 UTC
(rev 1634)
@@ -0,0 +1,24 @@
+Submitted By: Alexander E. Patrakov
+Date: 2006-07-13
+Initial Package Version: 1.5.0
+Origin:
http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/net-im/gaim/files/patch-src_protocols_oscar_oscar.c?rev=1.3&content-type=text/plain
+Upstream Status: This is not a bug in GAIM.
+Description: Do not escape HTML messages in ICQ if they begin with <HTML>.
+
+This works around a bug with messages sent by the sim 0.9.3 client where they
+would be displayed as: <HTML><BODY BGCOLOR="#FFFFFF">hello</BODY></HTML>
+
+The bug is already fixed in sim 0.9.4, but there are lots of sim 0.9.3
+installations in the wild.
+
+--- gaim-1.5.0/src/protocols/oscar/oscar.c.orig Wed Aug 25 21:29:00 2004
++++ gaim-1.5.0/src/protocols/oscar/oscar.c Thu Aug 26 21:55:32 2004
+@@ -3247,7 +3247,7 @@
+ * Note: There *may* be some clients which send messages as HTML
formatted -
+ * they need to be special-cased somehow.
+ */
+- if (isdigit(gaim_account_get_username(account)[0]) &&
isdigit(userinfo->sn[0])) {
++ if (isdigit(gaim_account_get_username(account)[0]) &&
isdigit(userinfo->sn[0]) && g_strncasecmp(tmp, "<HTML>", 6)) {
+ /* being recevied by ICQ from ICQ - escape HTML so it is
displayed as sent */
+ gchar *tmp2 = gaim_escape_html(tmp);
+ g_free(tmp);
Added: trunk/packages/gnutls/Makefile
===================================================================
--- trunk/packages/gnutls/Makefile (rev 0)
+++ trunk/packages/gnutls/Makefile 2006-07-13 15:30:12 UTC (rev 1634)
@@ -0,0 +1,30 @@
+# gnutls Makefile
+
+NM= gnutls
+VRS= 1.4.0
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://ftp.gnupg.org/gcrypt/gnutls/$(FILE)
+SHA-$(FILE)= 71c2df8072796592bb20910f3554923b4178b352
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Added: trunk/packages/libgcrypt/Makefile
===================================================================
--- trunk/packages/libgcrypt/Makefile (rev 0)
+++ trunk/packages/libgcrypt/Makefile 2006-07-13 15:30:12 UTC (rev 1634)
@@ -0,0 +1,30 @@
+# libgcrypt Makefile
+
+NM= libgcrypt
+VRS= 1.2.2
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://ftp.gnupg.org/gcrypt/libgcrypt/$(FILE)
+SHA-$(FILE)= fc61709a9719a239cf8ebbf19b84f99622655dda
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Added: trunk/packages/libgpg-error/Makefile
===================================================================
--- trunk/packages/libgpg-error/Makefile (rev 0)
+++ trunk/packages/libgpg-error/Makefile 2006-07-13 15:30:12 UTC (rev
1634)
@@ -0,0 +1,30 @@
+# libgpg-error Makefile
+
+NM= libgpg-error
+VRS= 1.3
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://ftp.gnupg.org/gcrypt/libgpg-error/$(FILE)
+SHA-$(FILE)= 10bd8d8503b674e114ecc6620324d5d1c8c918b7
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Added: trunk/packages/proprietary-drivers/Makefile
===================================================================
--- trunk/packages/proprietary-drivers/Makefile (rev 0)
+++ trunk/packages/proprietary-drivers/Makefile 2006-07-13 15:30:12 UTC (rev
1634)
@@ -0,0 +1,36 @@
+# Makefile for proprietary video drivers
+
+NM= proprietary-drivers
+VRS= 3
+
+# NVIDIA legacy driver
+FILE1= NVIDIA-Linux-x86-1.0-7182-pkg0.run
+URL-$(FILE1)= http://download.nvidia.com/XFree86/Linux-x86/1.0-7182/$(FILE1)
+SHA-$(FILE1)= 263244a24eab5334c77afbcda3534dba67fa0e51
+
+# Current NVIDIA driver
+FILE2= NVIDIA-Linux-x86-1.0-8762-pkg0.run
+URL-$(FILE2)= http://download.nvidia.com/XFree86/Linux-x86/1.0-8762/$(FILE2)
+SHA-$(FILE2)= d186a4b31177dad951dcb0f0c15adad06d800962
+
+# ATI FGLRX driver
+FILE3= ati-driver-installer-8.26.18-x86.run
+URL-$(FILE3)= http://www2.ati.com/drivers/linux/$(FILE3)
+SHA-$(FILE3)= 5c84a8d3526accccb0154c9d701948629f7ae45d
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE1) $(FILE2) $(FILE3)
+ @install -m755 $(FILE1) $(FILE2) $(FILE3) /usr/src
+ @touch $@
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot
Added: trunk/root/.gaim/accounts.xml
===================================================================
--- trunk/root/.gaim/accounts.xml (rev 0)
+++ trunk/root/.gaim/accounts.xml 2006-07-13 15:30:12 UTC (rev 1634)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<accounts version='1.0'>
+ <account>
+ <protocol>prpl-irc</protocol>
+ <name>[EMAIL PROTECTED]</name>
+ <alias>lfs-livecd</alias>
+ <settings>
+ <setting name='username' type='string'>guest</setting>
+ <setting name='encoding' type='string'>UTF-8</setting>
+ <setting name='realname' type='string'>LFS LiveCD</setting>
+ <setting name='port' type='int'>6667</setting>
+ </settings>
+ <settings ui='gtk-gaim'>
+ <setting name='auto-login' type='bool'>1</setting>
+ </settings>
+ </account>
+</accounts>
Added: trunk/root/.gaim/blist.xml
===================================================================
--- trunk/root/.gaim/blist.xml (rev 0)
+++ trunk/root/.gaim/blist.xml 2006-07-13 15:30:12 UTC (rev 1634)
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<gaim version='1.0'>
+ <blist>
+ <group name="LFS">
+ <setting name="collapsed" type="bool">0</setting>
+ <chat proto="prpl-irc" account="[EMAIL PROTECTED]">
+ <component name="channel">#livecd</component>
+ <component name="password"></component>
+ </chat>
+ <chat proto="prpl-irc" account="[EMAIL PROTECTED]">
+ <component name="channel">#lfs</component>
+ <component name="password"></component>
+ </chat>
+ <chat proto="prpl-irc" account="[EMAIL PROTECTED]">
+ <component
name="channel">#lfs-support</component>
+ <component name="password"></component>
+ </chat>
+ </group>
+ </blist>
+ <privacy>
+ <account proto="prpl-irc" name="[EMAIL PROTECTED]" mode="1">
+ </account>
+ </privacy>
+</gaim>
Modified: trunk/scripts/functions
===================================================================
--- trunk/scripts/functions 2006-07-13 13:07:46 UTC (rev 1633)
+++ trunk/scripts/functions 2006-07-13 15:30:12 UTC (rev 1634)
@@ -57,7 +57,7 @@
@ln -sf $(SRC)/$(1) .
endef
-%.gz %.tgz %.bz2 %.zip %.patch %.diff %.rules %.ttf %.jpg:
+%.gz %.tgz %.bz2 %.zip %.patch %.diff %.rules %.ttf %.jpg %.run:
$(call download,$@,$(URL-$@),$(SHA-$@))
wget-list-entry:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
