[patch] slim-1.2.6.ebuild.diff

slim-1.2.6.ebuild.diff (text/plain), 2.22 KB, created by hiyuh on 2006-09-26 12:09:35 UTC

--- slim-1.2.5.ebuild	2006-08-18 20:29:41.000000000 +0900
+++ slim-1.2.6.ebuild	2006-09-27 03:54:14.000000000 +0900
@@ -27,19 +27,24 @@
 
 	cd "${S}"
 
-	# Purge Makefile w/o any patches
+	einfo "Purge Makefile params w/o any patch"
 	local my_incs="-I. \`pkg-config --cflags xft xmu libpng\`"
 	local my_libs="\`pkg-config --libs xft xmu libpng\` -lcrypt -ljpeg"
 	sed -i \
-		-e "s:^CXX=.*:CXX=$(tc-getCXX):"                  \
-		-e "s:^CC=.*:CC=$(tc-getCC):"                     \
-		-e "s:^CFLAGS=.*:CFLAGS=${CFLAGS} ${my_incs}:"    \
+		-e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:"      \
+		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:"           \
+		-e "s:^CFLAGS=.*:CFLAGS=${my_incs}:"              \
 		-e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS} ${my_libs}:" \
 		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:"          \
 		-e "s:^DESTDIR=.*::"                              \
-		Makefile || die 'sed failed in Makefile'
+		Makefile || die 'sed for Makefile params failed'
 
-	# Remove all X11R6 references from slim.conf
+	einfo "Purge linking order for --as-needed"
+	sed -i \
+		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
+		Makefile || die "sed for Makefile linking order"
+
+	einfo "Remove all X11R6 references from slim.conf"
 	# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop
 	# Set the default logfile to /dev/null to avoid cluttering up the harddisk
 	# as slim puts a lot of garbage in it's logfile
@@ -48,13 +53,14 @@
 		-e "s#/usr/bin:##"                   \
 		-e "s/# daemon/daemon/"              \
 		-e "s#/var/log/slim.log#/dev/null#g" \
-		slim.conf || die "sed slim.conf failed"
+		slim.conf || die "sed for slim.conf failed"
 
-	# Silence all warnigs for "-O2 -Wall"
-	epatch "${FILESDIR}"/${P}_image-x-to-lx.patch
-	epatch "${FILESDIR}"/${P}_panel-no-unused-uninit.patch
-	epatch "${FILESDIR}"/${P}_cfg-use-int.patch
-	epatch "${FILESDIR}"/${P}_switchuser-correct-init.patch
+	#einfo "Silence all warnigs for \"-O2 -Wall\""
+	# Merged upstream 1.2.6, yum! :)
+	#epatch "${FILESDIR}"/${P}_image-x-to-lx.patch
+	#epatch "${FILESDIR}"/${P}_panel-no-unused-uninit.patch
+	#epatch "${FILESDIR}"/${P}_cfg-use-int.patch
+	#epatch "${FILESDIR}"/${P}_switchuser-correct-init.patch
 }
 
 src_compile() {