* [gentoo-commits] gentoo-x86 commit in games-engines/residualvm/files: residualvm-0.1.0-EE.patch
@ 2013-01-31 15:30 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-01-31 15:30 UTC (permalink / raw
To: gentoo-commits
hasufell 13/01/31 15:30:42
Added: residualvm-0.1.0-EE.patch
Log:
fix build under EE locale
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 games-engines/residualvm/files/residualvm-0.1.0-EE.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch?rev=1.1&content-type=text/plain
Index: residualvm-0.1.0-EE.patch
===================================================================
--- config.guess
+++ config.guess
@@ -855,7 +855,7 @@
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[:upper:]' '[:lower:]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
@@ -955,7 +955,7 @@
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ case `grep '^cpu[^[:lower:]]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-gnu ;;
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
--- configure
+++ configure
@@ -3395,8 +3395,8 @@
if test -z "$_freetypeconfig"; then
_freetype2=no
else
- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
+ FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs`
+ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags`
if test "$_freetype2" = "auto"; then
_freetype2=no
@@ -3848,7 +3848,7 @@
fi
# Save the settings
- defname="ENABLE_`echo $engine | tr '[a-z]' '[A-Z]'`"
+ defname="ENABLE_`echo $engine | tr '[:lower:]' '[:upper:]'`"
if test "$isbuilt" = "no" ; then
add_line_to_config_mk "# $defname"
else
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-engines/residualvm/files: residualvm-0.1.0-EE.patch
@ 2013-02-02 22:57 Julian Ospald (hasufell)
0 siblings, 0 replies; 3+ messages in thread
From: Julian Ospald (hasufell) @ 2013-02-02 22:57 UTC (permalink / raw
To: gentoo-commits
hasufell 13/02/02 22:57:43
Modified: residualvm-0.1.0-EE.patch
Log:
comply with upstream patch
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.2 games-engines/residualvm/files/residualvm-0.1.0-EE.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch?r1=1.1&r2=1.2
Index: residualvm-0.1.0-EE.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-engines/residualvm/files/residualvm-0.1.0-EE.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- residualvm-0.1.0-EE.patch 31 Jan 2013 15:30:42 -0000 1.1
+++ residualvm-0.1.0-EE.patch 2 Feb 2013 22:57:43 -0000 1.2
@@ -1,42 +1,33 @@
---- config.guess
-+++ config.guess
-@@ -855,7 +855,7 @@
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
-- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[:upper:]' '[:lower:]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
-@@ -955,7 +955,7 @@
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
-- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ case `grep '^cpu[^[:lower:]]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
---- configure
-+++ configure
-@@ -3395,8 +3395,8 @@
- if test -z "$_freetypeconfig"; then
- _freetype2=no
- else
-- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs`
-- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags`
-+ FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs`
-+ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags`
+From b65365e0d314bff91f5fb3c4fbdd3da7944ea7a2 Mon Sep 17 00:00:00 2001
+From: hasufell <julian.ospald@googlemail.com>
+Date: Fri, 1 Feb 2013 19:31:15 +0100
+Subject: [PATCH] CONFIGURE: Fix build under et_EE locale
+
+Freetype-config reports a broken include dir
+when et_EE locale is used. We set LC_ALL
+and LANGUAGE to "C" explicitly like autoconf
+does to force consistent behavior.
+---
+ configure | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure b/configure
+index 91364eb..3b8b845 100755
+--- a/configure
++++ b/configure
+@@ -21,6 +21,12 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
- if test "$_freetype2" = "auto"; then
- _freetype2=no
-@@ -3848,7 +3848,7 @@
- fi
-
- # Save the settings
-- defname="ENABLE_`echo $engine | tr '[a-z]' '[A-Z]'`"
-+ defname="ENABLE_`echo $engine | tr '[:lower:]' '[:upper:]'`"
- if test "$isbuilt" = "no" ; then
- add_line_to_config_mk "# $defname"
- else
++# NLS nuisances.
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
+ # Save the current environment variables for next runs
+ SAVED_CONFIGFLAGS=$@
+ SAVED_LDFLAGS=$LDFLAGS
+--
+1.7.10
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-engines/residualvm/files: residualvm-0.1.0-EE.patch
@ 2015-01-27 7:12 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2015-01-27 7:12 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 15/01/27 07:12:58
Removed: residualvm-0.1.0-EE.patch
Log:
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-27 7:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-31 15:30 [gentoo-commits] gentoo-x86 commit in games-engines/residualvm/files: residualvm-0.1.0-EE.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2013-02-02 22:57 Julian Ospald (hasufell)
2015-01-27 7:12 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox