summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-12-22 01:19:06 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-12-22 01:19:06 +0000
commit8aac70daca8fd48db7c6666b5b13e032c2bbf388 (patch)
tree276b946cf3d7b529ccbb7685679302c77dae2846 /games-puzzle/tanglet/files
parentVersion bump. (diff)
downloadgentoo-2-8aac70daca8fd48db7c6666b5b13e032c2bbf388.tar.gz
gentoo-2-8aac70daca8fd48db7c6666b5b13e032c2bbf388.tar.bz2
gentoo-2-8aac70daca8fd48db7c6666b5b13e032c2bbf388.zip
version bump with patch from Michael (kensington) (bug #395583)
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'games-puzzle/tanglet/files')
-rw-r--r--games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch10
-rw-r--r--games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch21
2 files changed, 25 insertions, 6 deletions
diff --git a/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
index 7f94934d0493..af9dedc24918 100644
--- a/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
+++ b/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
@@ -1,6 +1,5 @@
-diff -ru tanglet-1.0.1.orig/src/main.cpp tanglet-1.0.1/src/main.cpp
---- tanglet-1.0.1.orig/src/main.cpp 2010-01-11 20:23:45.000000000 -0500
-+++ tanglet-1.0.1/src/main.cpp 2010-02-27 13:54:16.915177582 -0500
+--- tanglet-1.0.1.orig/src/main.cpp
++++ tanglet-1.0.1/src/main.cpp
@@ -36,6 +36,7 @@
QString path = app.applicationDirPath();
@@ -9,9 +8,8 @@ diff -ru tanglet-1.0.1.orig/src/main.cpp tanglet-1.0.1/src/main.cpp
paths.append(path + "/data/");
paths.append(path + "/../share/tanglet/data/");
paths.append(path + "/../Resources/");
-diff -ru tanglet-1.0.1.orig/tanglet.pro tanglet-1.0.1/tanglet.pro
---- tanglet-1.0.1.orig/tanglet.pro 2010-01-11 18:25:54.000000000 -0500
-+++ tanglet-1.0.1/tanglet.pro 2010-02-27 13:53:13.104184583 -0500
+--- tanglet-1.0.1.orig/tanglet.pro
++++ tanglet-1.0.1/tanglet.pro
@@ -48,7 +48,7 @@
unix:!macx {
diff --git a/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch
new file mode 100644
index 000000000000..af9dedc24918
--- /dev/null
+++ b/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch
@@ -0,0 +1,21 @@
+--- tanglet-1.0.1.orig/src/main.cpp
++++ tanglet-1.0.1/src/main.cpp
+@@ -36,6 +36,7 @@
+
+ QString path = app.applicationDirPath();
+ QStringList paths;
++ paths.append("GENTOO_DIR");
+ paths.append(path + "/data/");
+ paths.append(path + "/../share/tanglet/data/");
+ paths.append(path + "/../Resources/");
+--- tanglet-1.0.1.orig/tanglet.pro
++++ tanglet-1.0.1/tanglet.pro
+@@ -48,7 +48,7 @@
+
+ unix:!macx {
+ isEmpty(PREFIX) {
+- PREFIX = /usr/local
++ PREFIX = /usr
+ }
+
+ target.path = $$PREFIX/bin/