summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-puzzle/connectagram/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-puzzle/connectagram/files')
-rw-r--r--games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
new file mode 100644
index 000000000000..b02dfef46792
--- /dev/null
+++ b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
@@ -0,0 +1,76 @@
+--- connectagram-1.2.1.orig/connectagram.pro
++++ connectagram-1.2.1/connectagram.pro
+@@ -74,16 +74,16 @@
+ RESOURCES += icons/icon.qrc
+
+ isEmpty(PREFIX) {
+- PREFIX = /usr/local
++ PREFIX = /usr
+ }
+ isEmpty(BINDIR) {
+- BINDIR = bin
++ BINDIR = @GAMES_BINDIR@
+ }
+
+- target.path = $$PREFIX/$$BINDIR/
++ target.path = $$BINDIR/
+
+ data.files = data
+- data.path = $$PREFIX/share/connectagram/
++ data.path = @GAMES_DATADIR@/connectagram/
+
+ pixmap.files = icons/connectagram.xpm
+ pixmap.path = $$PREFIX/share/pixmaps/
+@@ -98,7 +98,7 @@
+ appdata.path = $$PREFIX/share/appdata/
+
+ qm.files = translations/*.qm
+- qm.path = $$PREFIX/share/connectagram/translations
++ qm.path = @GAMES_DATADIR@/connectagram/translations
+
+ man.files = doc/connectagram.6
+ man.path = $$PREFIX/share/man/man6
+--- connectagram-1.2.1.orig/src/locale_dialog.cpp
++++ connectagram-1.2.1/src/locale_dialog.cpp
+@@ -88,6 +88,7 @@
+ paths.append(appdir);
+ paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
+ paths.append(appdir + "/../Resources");
++ paths.append("@GAMES_DATADIR@/connectagram");
+ }
+ for (const QString& path : paths) {
+ if (QFile::exists(path + "/translations/")) {
+--- connectagram-1.2.1.orig/src/new_game_dialog.cpp
++++ connectagram-1.2.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);
+ for (const QString& language : languages) {
+ m_languages_box->addItem(LocaleDialog::languageName(language), language);
+ }
+--- connectagram-1.2.1.orig/src/wordlist.cpp
++++ connectagram-1.2.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;
+ }