summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-09-21 01:26:08 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-09-21 01:26:08 +0000
commitad75410fbb7c3214b2f81d731e6b45a5e4314de0 (patch)
tree2987606b79ac6a3d9a728124e944a129b7726ec0 /games-kids
parentQA: Remove by now unnecessary patch from this revision. The added header incl... (diff)
downloadgentoo-2-ad75410fbb7c3214b2f81d731e6b45a5e4314de0.tar.gz
gentoo-2-ad75410fbb7c3214b2f81d731e6b45a5e4314de0.tar.bz2
gentoo-2-ad75410fbb7c3214b2f81d731e6b45a5e4314de0.zip
Re-roll patch and try to fix bug #273786
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-kids')
-rw-r--r--games-kids/cubetest/ChangeLog6
-rw-r--r--games-kids/cubetest/files/cubetest-0.9.4-build.patch55
2 files changed, 57 insertions, 4 deletions
diff --git a/games-kids/cubetest/ChangeLog b/games-kids/cubetest/ChangeLog
index 18f83a68e320..b655483eeafd 100644
--- a/games-kids/cubetest/ChangeLog
+++ b/games-kids/cubetest/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-kids/cubetest
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/cubetest/ChangeLog,v 1.13 2009/06/23 16:58:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/cubetest/ChangeLog,v 1.14 2009/09/21 01:26:08 mr_bones_ Exp $
+
+ 21 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ files/cubetest-0.9.4-build.patch:
+ Re-roll patch and try to fix bug #273786
23 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
cubetest-0.9.4.ebuild:
diff --git a/games-kids/cubetest/files/cubetest-0.9.4-build.patch b/games-kids/cubetest/files/cubetest-0.9.4-build.patch
index 052d319b3600..71411700c336 100644
--- a/games-kids/cubetest/files/cubetest-0.9.4-build.patch
+++ b/games-kids/cubetest/files/cubetest-0.9.4-build.patch
@@ -1,5 +1,6 @@
---- configure
-+++ configure
+diff -ru cubetest-0.9.4.orig/configure cubetest-0.9.4/configure
+--- cubetest-0.9.4.orig/configure 2005-12-05 17:29:43.000000000 -0500
++++ cubetest-0.9.4/configure 2009-09-20 21:23:24.886585972 -0400
@@ -19741,13 +19741,16 @@
if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -42,7 +43,7 @@
Qt3Support >= $QT_REQUIRED_VERSION"`
# Put the nasty error message in config.log where it belongs
echo "$QT_PKG_ERRORS" 1>&5
-@@ -19849,6 +19842,7 @@
+@@ -19842,6 +19849,7 @@
fi
@@ -50,3 +51,51 @@
{ echo "$as_me:$LINENO: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&5
echo "$as_me: Set QT_CXXFLAGS... $QT_CXXFLAGS" >&6;}
{ echo "$as_me:$LINENO: Set QT_LIBS... $QT_LIBS" >&5
+Only in cubetest-0.9.4: configure.orig
+diff -ru cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts cubetest-0.9.4/src/cubetest/cubetest_it.ts
+--- cubetest-0.9.4.orig/src/cubetest/cubetest_it.ts 2005-12-05 14:48:20.000000000 -0500
++++ cubetest-0.9.4/src/cubetest/cubetest_it.ts 2009-09-20 21:23:06.640704967 -0400
+@@ -19,11 +19,11 @@
+ </message>
+ <message>
+ <source>Well done! The correct answer is %1.</source>
+- <translation>Bene! La risposta esatta &egrave; %1.</translation>
++ <translation>Bene! La risposta esatta &#232; %1.</translation>
+ </message>
+ <message>
+ <source>Wrong! The correct answer is %1.</source>
+- <translation>Sbagliato! La risposta esatta &egrave; %1.</translation>
++ <translation>Sbagliato! La risposta esatta &#232; %1.</translation>
+ </message>
+ <message>
+ <source>Next question</source>
+@@ -69,11 +69,11 @@
+ </message>
+ <message>
+ <source>Difficulty </source>
+- <translation>Difficolt&agrave;</translation>
++ <translation>Difficolt&#224;</translation>
+ </message>
+ <message>
+ <source>Can I play Daddy?</source>
+- <translation>Posso giocare, Pap&agrave;?</translation>
++ <translation>Posso giocare, Pap&#224;?</translation>
+ </message>
+ <message>
+ <source>Don&apos;t hurt my brain</source>
+@@ -113,7 +113,7 @@
+ </message>
+ <message>
+ <source>CubeTest is written by Jos van den Oever and released under the General Public License.</source>
+- <translation>CubeTest &egrave; stato scritto da Jos van der Oever ed &egrave; rilasciato con la Licenza Pubblica Generale (GPL) di GNU.</translation>
++ <translation>CubeTest &#232; stato scritto da Jos van der Oever ed &#232; rilasciato con la Licenza Pubblica Generale (GPL) di GNU.</translation>
+ </message>
+ <message>
+ <source>Easy</source>
+@@ -132,4 +132,4 @@
+ <translation>Ostico</translation>
+ </message>
+ </context>
+-</TS>
+\ No newline at end of file
++</TS>