summaryrefslogtreecommitdiff
authortille <tille>2002-07-15 16:03:13 (UTC)
committer tille <tille>2002-07-15 16:03:13 (UTC)
commitdcea0e50a00ed9efb988ded5abf5d39de1bea393 (patch) (unidiff)
treea0deba1e0a736c8ae6bae5dcd73b457ed27962d8
parentecf2a873be3274bb30be0c659b7db6ef8a43be84 (diff)
downloadopie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.zip
opie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.tar.gz
opie-dcea0e50a00ed9efb988ded5abf5d39de1bea393.tar.bz2
oipkg works with ipkg 0.99.20
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/opie-oipkg.control2
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp8
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h1
3 files changed, 2 insertions, 9 deletions
diff --git a/noncore/unsupported/oipkg/opie-oipkg.control b/noncore/unsupported/oipkg/opie-oipkg.control
index 1cff44e..ff1c6ca 100644
--- a/noncore/unsupported/oipkg/opie-oipkg.control
+++ b/noncore/unsupported/oipkg/opie-oipkg.control
@@ -1,9 +1,9 @@
1Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/* 1Files: bin/oipkg apps/Settings/oipkg.desktop pics/oipkg/*
2Priority: optional 2Priority: optional
3Section: opie/settings 3Section: opie/settings
4Maintainer: Patrick S. Vogt <tille@almana.ch> 4Maintainer: Patrick S. Vogt <tille@almana.ch>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION 6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION), ipkg (>0.9) 7Depends: opie-base ($QPE_VERSION), ipkg (>0.99.20)
8Description: Opie Projects advanced gui ipkg installer 8Description: Opie Projects advanced gui ipkg installer
9 A GUI front-end to ipkg for the Opie environment. 9 A GUI front-end to ipkg for the Opie environment.
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 71e9b88..2ed86ee 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -36,13 +36,13 @@
36#include "mainwindow.h" 36#include "mainwindow.h"
37 37
38 38
39//#define OPROCESS 39//#define OPROCESS
40 40
41PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) 41PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
42 : QObject ( p ), shellWarning(true) 42 : QObject ( p )
43{ 43{
44 settings = s; 44 settings = s;
45 runwindow = new RunWindow( p, name, true, f ); 45 runwindow = new RunWindow( p, name, true, f );
46#ifdef OPROCESS 46#ifdef OPROCESS
47 ipkgProcess = new OProcess(); 47 ipkgProcess = new OProcess();
48 connect ( ipkgProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), 48 connect ( ipkgProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
@@ -153,18 +153,12 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
153 out(lineStr); 153 out(lineStr);
154 lineStrOld = lineStr; 154 lineStrOld = lineStr;
155 qApp->processEvents(); 155 qApp->processEvents();
156 } 156 }
157 } 157 }
158 pclose(fp); 158 pclose(fp);
159 if (!ret && shellWarning)
160 {
161 shellWarning = false;
162 QMessageBox::critical( runwindow, tr("install failure"),
163 tr("<p>Did you start me from the command line?</p>"));
164 }
165#endif 159#endif
166 //out( "Finished!"); 160 //out( "Finished!");
167 pvDebug(2,QString(ret?"success\n":"failure\n")); 161 pvDebug(2,QString(ret?"success\n":"failure\n"));
168 return ret; 162 return ret;
169} 163}
170 164
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index 662800a..c84acfa 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -50,13 +50,12 @@ public slots:
50 void removeLinks( const QString &dest ); 50 void removeLinks( const QString &dest );
51 51
52//private slots: 52//private slots:
53 void getIpkgOutput(OProcess *proc, char *buffer, int buflen); 53 void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
54 54
55private: 55private:
56 bool shellWarning;
57 OProcess *ipkgProcess; 56 OProcess *ipkgProcess;
58 PackageManagerSettings* settings; 57 PackageManagerSettings* settings;
59 RunWindow *runwindow; 58 RunWindow *runwindow;
60 InstallDialog *installDialog; 59 InstallDialog *installDialog;
61 QList<Package> to_remove; 60 QList<Package> to_remove;
62 QList<Package> to_install; 61 QList<Package> to_install;