summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2011-06-21 21:31:06 +0000
committerMichael Januszewski <spock@gentoo.org>2011-06-21 21:31:06 +0000
commit9642a317463639894bf9dd3fda87b11266cb8473 (patch)
tree7ce1f05a66506cea34e79913631d5ff7f3726592 /media-gfx
parentCleanup not required anymore since bug 372407 is fixed (diff)
downloadgentoo-2-9642a317463639894bf9dd3fda87b11266cb8473.tar.gz
gentoo-2-9642a317463639894bf9dd3fda87b11266cb8473.tar.bz2
gentoo-2-9642a317463639894bf9dd3fda87b11266cb8473.zip
Fix bug #372233 (patch by Michal Gorny).
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fbida/ChangeLog6
-rw-r--r--media-gfx/fbida/fbida-2.08.ebuild3
-rw-r--r--media-gfx/fbida/files/fbida-2.08-posix-make.patch49
3 files changed, 56 insertions, 2 deletions
diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 94f5d640ac2e..b73c10b968a0 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/fbida
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.80 2011/06/18 18:29:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.81 2011/06/21 21:31:06 spock Exp $
+
+ 21 Jun 2011; Michał Januszewski <spock@gentoo.org> fbida-2.08.ebuild,
+ +files/fbida-2.08-posix-make.patch:
+ Fix bug #372233 (patch by Michal Gorny).
*fbida-2.08 (18 Jun 2011)
diff --git a/media-gfx/fbida/fbida-2.08.ebuild b/media-gfx/fbida/fbida-2.08.ebuild
index c788bd17418c..bfc84843f1e9 100644
--- a/media-gfx/fbida/fbida-2.08.ebuild
+++ b/media-gfx/fbida/fbida-2.08.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.08.ebuild,v 1.1 2011/06/18 18:29:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.08.ebuild,v 1.2 2011/06/21 21:31:06 spock Exp $
EAPI=2
@@ -47,6 +47,7 @@ src_prepare() {
fi
epatch "${FILESDIR}"/ida-desktop.patch
+ epatch "${FILESDIR}"/fbida-2.08-posix-make.patch
}
src_configure() {
diff --git a/media-gfx/fbida/files/fbida-2.08-posix-make.patch b/media-gfx/fbida/files/fbida-2.08-posix-make.patch
new file mode 100644
index 000000000000..6add679bca6b
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.08-posix-make.patch
@@ -0,0 +1,49 @@
+From e0c867a12fd3d49fd49ee348bcabe4eafc217082 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 19 Jun 2011 10:24:55 +0200
+Subject: [PATCH] Use `printf' instead of `echo -[en]', to make the code POSIX
+ friendly.
+
+---
+ GNUmakefile | 2 +-
+ mk/Autoconf.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index c96e635..9de3f6c 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -30,7 +30,7 @@ include $(srcdir)/mk/Autoconf.mk
+
+ ac_jpeg_ver = $(shell \
+ $(call ac_init,for libjpeg version);\
+- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
++ $(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
+ | cpp | tail -n 1);\
+ $(call ac_fini))
+
+diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk
+index 7608ea5..513f449 100644
+--- a/mk/Autoconf.mk
++++ b/mk/Autoconf.mk
+@@ -24,7 +24,7 @@ ifneq ($(verbose),no)
+ ac_fini = echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}"
+ else
+ # normal
+- ac_init = echo -n "checking $(1) ... " >&2; rc=no
++ ac_init = printf '%s' "checking $(1) ... " >&2; rc=no
+ ac_b_cmd = $(1) >/dev/null 2>&1 && rc=yes
+ ac_s_cmd = rc=`$(1) 2>/dev/null`
+ ac_fini = echo "$${rc}" >&2; echo "$${rc}"
+@@ -162,7 +162,7 @@ config: Make.config
+ @true
+
+ Make.config: $(srcdir)/GNUmakefile
+- @echo -e "$(make-config-q)" > $@
++ @printf '%b' "$(make-config-q)" > $@
+ @echo
+ @echo "Make.config written, edit if needed"
+ @echo
+--
+1.7.5.3
+