summaryrefslogtreecommitdiff
path: root/packages/pocketcellar/pocketcellar-1.1
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-06-30 08:19:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-06-30 08:19:37 +0000
commitc8e5702127e507e82e6f68a4b8c546803accea9d (patch)
tree00583491f40ecc640f2b28452af995e3a63a09d7 /packages/pocketcellar/pocketcellar-1.1
parent87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff)
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/pocketcellar/pocketcellar-1.1')
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/.mtn2git_empty0
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/cellardb.patch88
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/gcc3.patch16
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch14
-rw-r--r--packages/pocketcellar/pocketcellar-1.1/winedb.patch92
5 files changed, 210 insertions, 0 deletions
diff --git a/packages/pocketcellar/pocketcellar-1.1/.mtn2git_empty b/packages/pocketcellar/pocketcellar-1.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pocketcellar/pocketcellar-1.1/.mtn2git_empty
diff --git a/packages/pocketcellar/pocketcellar-1.1/cellardb.patch b/packages/pocketcellar/pocketcellar-1.1/cellardb.patch
index e69de29bb2..ff550441d4 100644
--- a/packages/pocketcellar/pocketcellar-1.1/cellardb.patch
+++ b/packages/pocketcellar/pocketcellar-1.1/cellardb.patch
@@ -0,0 +1,88 @@
+#
+#Try to remove hardcoded /home path
+#
+--- pocketcellar-1.1/cellardb.cpp.old 2005-02-28 13:43:19.000000000 +0000
++++ pocketcellar-1.1/cellardb.cpp 2005-02-28 13:42:55.000000000 +0000
+@@ -19,6 +19,7 @@
+
+ #include "cellardb.h"
+ #include <qfile.h>
++#include <qdir.h>
+ #include <qdatastream.h>
+ #include "winedb.h"
+
+@@ -55,16 +56,16 @@
+
+
+ bool CellarDB::load(QListView *parent, QListView *wines, int loc) {
+- QString path("/home");
+-
++ QString path(QDir::homeDirPath());
++
+ if (loc == 1)
+- path = "/usr/mnt.rom/cf";
++ path = "/media/cf";
+ else if (loc == 2)
+- path = "/usr/mnt.rom/card";
++ path = "/media/card";
+
+- mkdir(QString(path + "/QtPalmtop/data/PocketCellar").ascii(), 755);
++ mkdir(QString(path + "/Documents/application/PocketCellar").ascii(), 755);
+
+- QFile f(path+"/QtPalmtop/data/PocketCellar/PCellarDB");
++ QFile f(path+"/Documents/application/PocketCellar/PCellarDB");
+
+ if (!f.open(IO_ReadOnly))
+ return false;
+@@ -102,28 +103,28 @@
+
+ f.close();
+
+- if (loc != 0)
++/* if (loc != 0)
+ unlink("/home/QtPalmtop/data/PocketCellar/PCellarDB");
+ if (loc != 1)
+ unlink("/usr/mnt.rom/cf/QtPalmtop/data/PocketCellar/PCellarDB");
+ if (loc != 2)
+- unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCellarDB");
++ unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCellarDB");*/
+
+ return true;
+ }
+
+
+ bool CellarDB::save(QListView *parent, int loc) {
+- QString path("/home");
+-
++ QString path(QDir::homeDirPath());
++
+ if (loc == 1)
+- path = "/usr/mnt.rom/cf";
++ path = "/media/cf";
+ else if (loc == 2)
+- path = "/usr/mnt.rom/card";
++ path = "/media/card";
+
+- mkdir(QString(path + "/QtPalmtop/data/PocketCellar").ascii(), 755);
++ mkdir(QString(path + "/Documents/application/PocketCellar").ascii(), 755);
+
+- QFile f(path+"/QtPalmtop/data/PocketCellar/PCellarDB");
++ QFile f(path+"/Documents/application/PocketCellar/PCellarDB");
+
+ //qDebug("Filename %s\n", (path+"/QtPalmtop/data/PocketCellar/PCellarDB").latin1());
+ if (!f.open(IO_WriteOnly))
+@@ -143,12 +144,12 @@
+
+ f.close();
+
+- if (loc != 0)
++/* if (loc != 0)
+ unlink("/home/QtPalmtop/data/PocketCellar/PCellarDB");
+ if (loc != 1)
+ unlink("/usr/mnt.rom/cf/QtPalmtop/data/PocketCellar/PCellarDB");
+ if (loc != 2)
+- unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCellarDB");
++ unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCellarDB");*/
+
+ return true;
+ }
diff --git a/packages/pocketcellar/pocketcellar-1.1/gcc3.patch b/packages/pocketcellar/pocketcellar-1.1/gcc3.patch
index e69de29bb2..634944aef4 100644
--- a/packages/pocketcellar/pocketcellar-1.1/gcc3.patch
+++ b/packages/pocketcellar/pocketcellar-1.1/gcc3.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- pocketcellar-1.1/wineentry.cpp~gcc3 2002-11-15 02:06:44.000000000 +0100
++++ pocketcellar-1.1/wineentry.cpp 2004-02-11 14:27:26.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include "winedb.h"
+
+
+-WineEditor::WineEditor(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0)
++WineEditor::WineEditor(QWidget* parent, const char* name, bool modal, WFlags fl)
+ : WineEditorBase(parent, name, modal, fl), _databaseList(0)
+ {
+ }
diff --git a/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch b/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch
index e69de29bb2..a34f9d1535 100644
--- a/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch
+++ b/packages/pocketcellar/pocketcellar-1.1/pocketcellar.patch
@@ -0,0 +1,14 @@
+--- pocketcellar-1.1/pocketcellar.cpp.old
++++ pocketcellar-1.1/pocketcellar.cpp
+@@ -395,9 +395,9 @@
+ _wines->setText(QString::number(stats._wines));
+ _bottles->setText(QString::number(stats._bottles));
+ QString tmp;
+- tmp.sprintf(tr("$%.2f"), stats._totalPrice);
++ tmp.sprintf(tr("%.2f"), stats._totalPrice);
+ _value->setText(tmp);
+- tmp.sprintf(tr("$%.2f ... $%.2f, avg $%.2f"),
++ tmp.sprintf(tr("%.2f ... %.2f, avg %.2f"),
+ stats._minPrice <= stats._maxPrice ?
+ stats._minPrice : 0.0,
+ stats._maxPrice, stats._bottles > 0 ?
diff --git a/packages/pocketcellar/pocketcellar-1.1/winedb.patch b/packages/pocketcellar/pocketcellar-1.1/winedb.patch
index e69de29bb2..885a23a5ce 100644
--- a/packages/pocketcellar/pocketcellar-1.1/winedb.patch
+++ b/packages/pocketcellar/pocketcellar-1.1/winedb.patch
@@ -0,0 +1,92 @@
+#
+# Try to remove hardcoded /home path
+#
+--- pocketcellar-1.1/winedb.cpp.old 2005-02-28 13:43:30.000000000 +0000
++++ pocketcellar-1.1/winedb.cpp 2005-02-28 13:40:55.000000000 +0000
+@@ -141,6 +141,7 @@
+ #include <qdatastream.h>
+ #include <qtextstream.h>
+ #include <qfile.h>
++#include <qdir.h>
+
+
+ QDataStream& operator>>(QDataStream& s, Wine& w) {
+@@ -209,15 +210,15 @@
+
+
+ bool WineDB::load(QListView *parent, int loc) {
+- QString path("/home");
++ QString path(QDir::homeDirPath());
+
+ if (loc == 1)
+- path = "/usr/mnt.rom/cf";
++ path = "/media/cf";
+ else if (loc == 2)
+- path = "/usr/mnt.rom/card";
++ path = "/media/card";
+
+- mkdir(QString(path + "/QtPalmtop/data/PocketCellar").ascii(), 755);
+- QFile f(path + "/QtPalmtop/data/PocketCellar/PCWineDB");
++ mkdir(QString(path + "/Documents/application/PocketCellar").ascii(), 755);
++ QFile f(path + "/Documents/application/PocketCellar/PCWineDB");
+
+ if (!f.open(IO_ReadOnly))
+ return false;
+@@ -240,26 +241,26 @@
+
+ f.close();
+
+- if (loc != 0)
++/* if (loc != 0)
+ unlink("/home/QtPalmtop/data/PocketCellar/PCWineDB");
+ if (loc != 1)
+ unlink("/usr/mnt.rom/cf/QtPalmtop/data/PocketCellar/PCWineDB");
+ if (loc != 2)
+- unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCWineDB");
++ unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCWineDB");*/
+ return true;
+ }
+
+
+ bool WineDB::save(QListView *parent, int loc) {
+- QString path("/home");
++ QString path(QDir::homeDirPath());
+
+ if (loc == 1)
+- path = "/usr/mnt.rom/cf";
++ path = "/media/cf";
+ else if (loc == 2)
+- path = "/usr/mnt.rom/card";
++ path = "/media/card";
+
+- mkdir(QString(path + "/QtPalmtop/data/PocketCellar").ascii(), 755);
+- QFile f(path + "/QtPalmtop/data/PocketCellar/PCWineDB");
++ mkdir(QString(path + "/Documents/application/PocketCellar").ascii(), 755);
++ QFile f(path + "/Documents/application/PocketCellar/PCWineDB");
+
+ if (!f.open(IO_WriteOnly))
+ return false;
+@@ -277,12 +278,12 @@
+
+ f.close();
+
+- if (loc != 0)
++/* if (loc != 0)
+ unlink("/home/QtPalmtop/data/PocketCellar/PCWineDB");
+ if (loc != 1)
+ unlink("/usr/mnt.rom/cf/QtPalmtop/data/PocketCellar/PCWineDB");
+ if (loc != 2)
+- unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCWineDB");
++ unlink("/usr/mnt.rom/card/QtPalmtop/data/PocketCellar/PCWineDB");*/
+ return true;
+ }
+
+@@ -290,7 +291,7 @@
+ QStringList WineDB::grapeList;
+
+ bool WineDB::loadGrapeList() {
+- QFile f("/home/QtPalmtop/data/PocketCellar/grapelist.txt");
++ QFile f("/opt/QtPalmtop/data/PocketCellar/grapelist.txt");
+
+ if (!f.open(IO_ReadOnly))
+ return false;