| 1 |
mr_bones_ 14/02/05 07:14:44 |
| 2 |
|
| 3 |
Added: connectagram-1.1.1-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump (bug #500200) |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/connectagram/files/connectagram-1.1.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: connectagram-1.1.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- connectagram-1.1.1.orig/connectagram.pro |
| 18 |
+++ connectagram-1.1.1/connectagram.pro |
| 19 |
@@ -70,16 +70,16 @@ |
| 20 |
|
| 21 |
unix: !macx { |
| 22 |
isEmpty(PREFIX) { |
| 23 |
- PREFIX = /usr/local |
| 24 |
+ PREFIX = /usr |
| 25 |
} |
| 26 |
isEmpty(BINDIR) { |
| 27 |
- BINDIR = bin |
| 28 |
+ BINDIR = @GAMES_BINDIR@ |
| 29 |
} |
| 30 |
|
| 31 |
- target.path = $$PREFIX/$$BINDIR/ |
| 32 |
+ target.path = @GAMES_BINDIR@/ |
| 33 |
|
| 34 |
data.files = data |
| 35 |
- data.path = $$PREFIX/share/connectagram/ |
| 36 |
+ data.path = @GAMES_DATADIR@/connectagram/ |
| 37 |
|
| 38 |
pixmap.files = icons/connectagram.xpm |
| 39 |
pixmap.path = $$PREFIX/share/pixmaps/ |
| 40 |
@@ -91,7 +91,7 @@ |
| 41 |
desktop.path = $$PREFIX/share/applications/ |
| 42 |
|
| 43 |
qm.files = translations/*.qm |
| 44 |
- qm.path = $$PREFIX/share/connectagram/translations |
| 45 |
+ qm.path = @GAMES_DATADIR@/connectagram/translations/ |
| 46 |
|
| 47 |
INSTALLS += target pixmap icon desktop data qm |
| 48 |
} |
| 49 |
--- connectagram-1.1.1.orig/src/locale_dialog.cpp |
| 50 |
+++ connectagram-1.1.1/src/locale_dialog.cpp |
| 51 |
@@ -87,6 +87,7 @@ |
| 52 |
paths.append(appdir); |
| 53 |
paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower()); |
| 54 |
paths.append(appdir + "/../Resources"); |
| 55 |
+ paths.append("@GAMES_DATADIR@/connectagram"); |
| 56 |
} |
| 57 |
foreach (const QString& path, paths) { |
| 58 |
if (QFile::exists(path + "/translations/")) { |
| 59 |
--- connectagram-1.1.1.orig/src/new_game_dialog.cpp |
| 60 |
+++ connectagram-1.1.1/src/new_game_dialog.cpp |
| 61 |
@@ -48,7 +48,7 @@ |
| 62 |
m_wordlist = new WordList(this); |
| 63 |
m_wordlist->setLanguage(WordList::defaultLanguage()); |
| 64 |
m_languages_box = new QComboBox(this); |
| 65 |
- QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot); |
| 66 |
+ QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot); |
| 67 |
foreach (const QString& language, languages) { |
| 68 |
m_languages_box->addItem(LocaleDialog::languageName(language), language); |
| 69 |
} |
| 70 |
--- connectagram-1.1.1.orig/src/wordlist.cpp |
| 71 |
+++ connectagram-1.1.1/src/wordlist.cpp |
| 72 |
@@ -91,9 +91,9 @@ |
| 73 |
|
| 74 |
QString WordList::defaultLanguage() { |
| 75 |
QString language = QLocale().name(); |
| 76 |
- if (!QFile::exists("connectagram:" + language)) { |
| 77 |
+ if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) { |
| 78 |
language = language.left(2); |
| 79 |
- if (!QFile::exists("connectagram:" + language)) { |
| 80 |
+ if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) { |
| 81 |
language = "en"; |
| 82 |
} |
| 83 |
} |
| 84 |
@@ -112,7 +112,7 @@ |
| 85 |
m_maximum_length(0) |
| 86 |
{ |
| 87 |
// Read words from disk |
| 88 |
- QFile file("connectagram:" + language + "/words"); |
| 89 |
+ QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words"); |
| 90 |
if (!file.open(QFile::ReadOnly | QIODevice::Text)) { |
| 91 |
return; |
| 92 |
} |
Archives