[gentoo-commits] gentoo-x86 commit in games-puzzle/connectagram/files: connectagram-1.1.2-gentoo.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    14/08/26 05:37:35

  Added:                connectagram-1.1.2-gentoo.patch
  Log:
  version bump
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  
games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/connectagram/files/connectagram-1.1.2-gentoo.patch?rev=1.1&content-type=text/plain

Index: connectagram-1.1.2-gentoo.patch
===================================================================
--- connectagram-1.1.1.orig/connectagram.pro
+++ connectagram-1.1.1/connectagram.pro
@@ -70,16 +70,16 @@
 
 unix: !macx {
        isEmpty(PREFIX) {
-               PREFIX = /usr/local
+               PREFIX = /usr
        }
        isEmpty(BINDIR) {
-               BINDIR = bin
+               BINDIR = @GAMES_BINDIR@
        }
 
-       target.path = $$PREFIX/$$BINDIR/
+       target.path = @GAMES_BINDIR@/
 
        data.files = data
-       data.path = $$PREFIX/share/connectagram/
+       data.path = @GAMES_DATADIR@/connectagram/
 
        pixmap.files = icons/connectagram.xpm
        pixmap.path = $$PREFIX/share/pixmaps/
@@ -91,7 +91,7 @@
        desktop.path = $$PREFIX/share/applications/
 
        qm.files = translations/*.qm
-       qm.path = $$PREFIX/share/connectagram/translations
+       qm.path = @GAMES_DATADIR@/connectagram/translations/
 
        INSTALLS += target pixmap icon desktop data qm
 }
--- connectagram-1.1.1.orig/src/locale_dialog.cpp
+++ connectagram-1.1.1/src/locale_dialog.cpp
@@ -87,6 +87,7 @@
                paths.append(appdir);
                paths.append(appdir + "/../share/" + 
QCoreApplication::applicationName().toLower());
                paths.append(appdir + "/../Resources");
+               paths.append("@GAMES_DATADIR@/connectagram");
        }
        foreach (const QString& path, paths) {
                if (QFile::exists(path + "/translations/")) {
--- connectagram-1.1.1.orig/src/new_game_dialog.cpp
+++ connectagram-1.1.1/src/new_game_dialog.cpp
@@ -48,7 +48,7 @@
        m_wordlist = new WordList(this);
        m_wordlist->setLanguage(WordList::defaultLanguage());
        m_languages_box = new QComboBox(this);
-       QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | 
QDir::NoDotAndDotDot);
+       QStringList languages = 
QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | 
QDir::NoDotAndDotDot);
        foreach (const QString& language, languages) {
                m_languages_box->addItem(LocaleDialog::languageName(language), 
language);
        }
--- connectagram-1.1.1.orig/src/wordlist.cpp
+++ connectagram-1.1.1/src/wordlist.cpp
@@ -91,9 +91,9 @@
 
 QString WordList::defaultLanguage() {
        QString language = QLocale().name();
-       if (!QFile::exists("connectagram:" + language)) {
+       if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
                language = language.left(2);
-               if (!QFile::exists("connectagram:" + language)) {
+               if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + 
language)) {
                        language = "en";
                }
        }
@@ -112,7 +112,7 @@
        m_maximum_length(0)
 {
        // Read words from disk
-       QFile file("connectagram:" + language + "/words");
+       QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
        if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
                return;
        }