diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2010-10-10 12:52:04 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2010-10-10 12:52:04 +0000 |
| commit | d4a8047bd2bec6e6400c719e4a0c318155e8f560 (patch) | |
| tree | 7a9b8dc8962094b4607dba11ea6fbf5fb7c0f8a3 /media-gfx | |
| parent | x86 stable wrt bug #340277 (diff) | |
| download | gentoo-2-d4a8047bd2bec6e6400c719e4a0c318155e8f560.tar.gz gentoo-2-d4a8047bd2bec6e6400c719e4a0c318155e8f560.tar.bz2 gentoo-2-d4a8047bd2bec6e6400c719e4a0c318155e8f560.zip | |
Add two patches to fix bug #339767.
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
4 files changed, 55 insertions, 2 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 738ed80f1328..70f13d7f5f31 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.182 2010/09/30 08:15:33 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.183 2010/10/10 12:52:04 spock Exp $ + + 10 Oct 2010; Michał Januszewski <spock@gentoo.org> + splashutils-1.5.4.3-r3.ebuild, + +files/splashutils-1.5.4.3-splash-functions.patch, + +files/splashutils-1.5.4.3-splash_util.patch: + Add two patches to fix bug #339767. 30 Sep 2010; Michał Januszewski <spock@gentoo.org> splashutils-1.5.4.3-r3.ebuild: diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch new file mode 100644 index 000000000000..ad5aab914638 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch @@ -0,0 +1,21 @@ +commit 7077483874a842c607d6e877696891ba4d5f1dd7 +Author: Michał Januszewski <spock@gentoo.org> +Date: Sat Oct 9 21:07:37 2010 +0200 + + Fix a bug in splash-functions.sh. + + This problem was reported in Gentoo bug #339767. + +diff --git a/core/scripts/splash-functions.sh.in b/core/scripts/splash-functions.sh.in +index 1a89486..2c39c6a 100644 +--- a/core/scripts/splash-functions.sh.in ++++ b/core/scripts/splash-functions.sh.in +@@ -341,7 +341,7 @@ splash_comm_send() { + + # Returns the current splash mode. + splash_get_mode() { +- local ctty="${spl_bindir}/fgconsole" ++ local ctty="$({spl_bindir}/fgconsole)" + local mode="$(${spl_util})" + + if [ "${mode}" = "silent" ]; then diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch new file mode 100644 index 000000000000..a3566bdaf07f --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch @@ -0,0 +1,24 @@ +diff -Naurp splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in splashutils-1.5.4.3/scripts/splash-functions.sh.in +--- splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in 2010-10-09 21:44:39.127691474 +0200 ++++ splashutils-1.5.4.3/scripts/splash-functions.sh.in 2010-10-09 21:44:54.678690080 +0200 +@@ -26,7 +26,7 @@ export spl_cachedir="@libdir@/splash/cac + export spl_tmpdir="@libdir@/splash/tmp" + export spl_fifo="${spl_cachedir}/.splash" + export spl_pidfile="${spl_cachedir}/daemon.pid" +-export spl_util="@bindir@/splash_util.static" ++export spl_util="@sbindir@/splash_util.static" + export spl_daemon="@sbindir@/fbsplashd.static" + export spl_decor="@sbindir@/fbcondecor_ctl.static" + export spl_bindir="@libdir@/splash/bin" +diff -Naurp splashutils-1.5.4.3-orig//src/Makefile.am splashutils-1.5.4.3/src/Makefile.am +--- splashutils-1.5.4.3-orig//src/Makefile.am 2010-10-09 21:44:39.121691920 +0200 ++++ splashutils-1.5.4.3/src/Makefile.am 2010-10-09 21:45:10.934689775 +0200 +@@ -166,7 +166,7 @@ if CONFIG_FBCON_DECOR + sbin_PROGRAMS += fbcondecor_ctl + endif + sbin_PROGRAMS += fbsplashd +-bin_PROGRAMS += splash_util ++sbin_PROGRAMS += fbsplashd splash_util + eexecsbin_PROGRAMS += fbsplashctl + + fbcondecor_ctl_SOURCES = fbcon_decor_ctl.c fbcon_decor.h ../include/console_decor.h ../include/fbcondecor.h common.h fbsplash.h diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild index 20b5cbd21aaa..e9802e70bc2d 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.7 2010/09/30 08:15:33 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.8 2010/10/10 12:52:04 spock Exp $ EAPI="2" @@ -90,6 +90,8 @@ src_prepare() { epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch epatch "${FILESDIR}"/splashutils-1.5.4.3-libjpeg.patch epatch "${FILESDIR}"/splashutils-1.5.4.3-daemon-exit-signal.patch + epatch "${FILESDIR}"/splashutils-1.5.4.3-splash-functions.patch + epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_util.patch cd "${SG}" if has_version ">=sys-apps/openrc-0.4.0"; then |