author | drw <drw> | 2005-04-01 20:32:01 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-01 20:32:01 (UTC) |
commit | cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f (patch) (unidiff) | |
tree | 3500347a14f4106be68712c4d4af49e3c69f7248 | |
parent | 629c1c9a366f56e9d98940f8dcd0778d039f1421 (diff) | |
download | opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.zip opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.tar.gz opie-cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f.tar.bz2 |
Fix linking issue with libipkg >= 0.99.146, at least until I can come up with a better way to do it...
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index 127204d..7bc2040 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -9,64 +9,69 @@ _;:, .> :=|. This program is free software; you can | |||
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "oipkg.h" | 32 | #include "oipkg.h" |
33 | 33 | ||
34 | #include <qdir.h> | 34 | #include <qdir.h> |
35 | #include <qfile.h> | 35 | #include <qfile.h> |
36 | #include <qtextstream.h> | 36 | #include <qtextstream.h> |
37 | 37 | ||
38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | 40 | ||
41 | extern "C" { | ||
42 | #include <libipkg.h> | ||
43 | }; | ||
44 | args_t m_ipkgArgs; // libipkg configuration arguments | ||
45 | |||
41 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file | 46 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file |
42 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files | 47 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files |
43 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists | 48 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists |
44 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location | 49 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location |
45 | const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location | 50 | const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location |
46 | 51 | ||
47 | OIpkg *oipkg; | 52 | OIpkg *oipkg; |
48 | 53 | ||
49 | // Ipkg callback functions | 54 | // Ipkg callback functions |
50 | 55 | ||
51 | int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) | 56 | int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) |
52 | { | 57 | { |
53 | // Display message only if it is below the message level threshold | 58 | // Display message only if it is below the message level threshold |
54 | if ( conf && ( conf->verbosity < level ) ) | 59 | if ( conf && ( conf->verbosity < level ) ) |
55 | return 0; | 60 | return 0; |
56 | else | 61 | else |
57 | oipkg->ipkgMessage( msg ); | 62 | oipkg->ipkgMessage( msg ); |
58 | 63 | ||
59 | return 0; | 64 | return 0; |
60 | } | 65 | } |
61 | 66 | ||
62 | char *fIpkgResponse( char */*question*/ ) | 67 | char *fIpkgResponse( char */*question*/ ) |
63 | { | 68 | { |
64 | return 0l; | 69 | return 0l; |
65 | } | 70 | } |
66 | 71 | ||
67 | int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) | 72 | int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) |
68 | { | 73 | { |
69 | oipkg->ipkgStatus( desc ); | 74 | oipkg->ipkgStatus( desc ); |
70 | return 0; | 75 | return 0; |
71 | } | 76 | } |
72 | 77 | ||
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h index 0263f50..4e390fa 100644 --- a/noncore/settings/packagemanager/oipkg.h +++ b/noncore/settings/packagemanager/oipkg.h | |||
@@ -10,107 +10,102 @@ _;:, .> :=|. This program is free software; you can | |||
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #ifndef OIPKG_H | 32 | #ifndef OIPKG_H |
33 | #define OIPKG_H | 33 | #define OIPKG_H |
34 | 34 | ||
35 | #include "oconfitem.h" | 35 | #include "oconfitem.h" |
36 | #include "opackage.h" | 36 | #include "opackage.h" |
37 | 37 | ||
38 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
39 | 39 | ||
40 | #include <qobject.h> | 40 | #include <qobject.h> |
41 | 41 | ||
42 | extern "C" { | ||
43 | #include <libipkg.h> | ||
44 | }; | ||
45 | |||
46 | // Ipkg execution options (m_ipkgExecOptions) | 42 | // Ipkg execution options (m_ipkgExecOptions) |
47 | #define FORCE_DEPENDS 0x0001 | 43 | #define FORCE_DEPENDS 0x0001 |
48 | #define FORCE_REMOVE 0x0002 | 44 | #define FORCE_REMOVE 0x0002 |
49 | #define FORCE_REINSTALL 0x0004 | 45 | #define FORCE_REINSTALL 0x0004 |
50 | #define FORCE_OVERWRITE 0x0008 | 46 | #define FORCE_OVERWRITE 0x0008 |
51 | 47 | ||
52 | class OConfItemList; | 48 | class OConfItemList; |
53 | 49 | ||
54 | class OIpkg : public QObject | 50 | class OIpkg : public QObject |
55 | { | 51 | { |
56 | Q_OBJECT | 52 | Q_OBJECT |
57 | 53 | ||
58 | public: | 54 | public: |
59 | OIpkg( Config *config = 0l, QObject *parent = 0l, const char *name = 0l ); | 55 | OIpkg( Config *config = 0l, QObject *parent = 0l, const char *name = 0l ); |
60 | ~OIpkg(); | 56 | ~OIpkg(); |
61 | 57 | ||
62 | OConfItemList *configItems(); | 58 | OConfItemList *configItems(); |
63 | OConfItemList *servers(); | 59 | OConfItemList *servers(); |
64 | OConfItemList *destinations(); | 60 | OConfItemList *destinations(); |
65 | OConfItemList *options(); | 61 | OConfItemList *options(); |
66 | 62 | ||
67 | int ipkgExecOptions() { return m_ipkgExecOptions; } | 63 | int ipkgExecOptions() { return m_ipkgExecOptions; } |
68 | int ipkgExecVerbosity() { return m_ipkgExecVerbosity; } | 64 | int ipkgExecVerbosity() { return m_ipkgExecVerbosity; } |
69 | 65 | ||
70 | void setConfigItems( OConfItemList *configList ); | 66 | void setConfigItems( OConfItemList *configList ); |
71 | void setIpkgExecOptions( int options ) { m_ipkgExecOptions = options; } | 67 | void setIpkgExecOptions( int options ) { m_ipkgExecOptions = options; } |
72 | void setIpkgExecVerbosity( int verbosity ) { m_ipkgExecVerbosity = verbosity; } | 68 | void setIpkgExecVerbosity( int verbosity ) { m_ipkgExecVerbosity = verbosity; } |
73 | 69 | ||
74 | void saveSettings(); | 70 | void saveSettings(); |
75 | 71 | ||
76 | OPackageList *availablePackages( const QString &server = QString::null ); | 72 | OPackageList *availablePackages( const QString &server = QString::null ); |
77 | OPackageList *installedPackages( const QString &destName = QString::null, | 73 | OPackageList *installedPackages( const QString &destName = QString::null, |
78 | const QString &destPath = QString::null ); | 74 | const QString &destPath = QString::null ); |
79 | 75 | ||
80 | OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, | 76 | OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, |
81 | const QString &name = QString::null ); | 77 | const QString &name = QString::null ); |
82 | 78 | ||
83 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, | 79 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, |
84 | const QStringList ¶meters = QStringList(), | 80 | const QStringList ¶meters = QStringList(), |
85 | const QString &destination = QString::null, | 81 | const QString &destination = QString::null, |
86 | const QObject *receiver = 0l, | 82 | const QObject *receiver = 0l, |
87 | const char *slotOutput = 0l, | 83 | const char *slotOutput = 0l, |
88 | bool rawOutput = true ); | 84 | bool rawOutput = true ); |
89 | void abortCommand(); | 85 | void abortCommand(); |
90 | 86 | ||
91 | void ipkgMessage( char *msg ); | 87 | void ipkgMessage( char *msg ); |
92 | void ipkgStatus( char *status ); | 88 | void ipkgStatus( char *status ); |
93 | void ipkgList( char *filelist ); | 89 | void ipkgList( char *filelist ); |
94 | 90 | ||
95 | private: | 91 | private: |
96 | Config *m_config; // Pointer to application configuration file | 92 | Config *m_config; // Pointer to application configuration file |
97 | args_t m_ipkgArgs; // libipkg configuration arguments | ||
98 | OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files | 93 | OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files |
99 | int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options | 94 | int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options |
100 | int m_ipkgExecVerbosity; // Ipkg execution verbosity level | 95 | int m_ipkgExecVerbosity; // Ipkg execution verbosity level |
101 | QString m_rootPath; // Directory path where the 'root' destination is located | 96 | QString m_rootPath; // Directory path where the 'root' destination is located |
102 | 97 | ||
103 | void loadConfiguration(); | 98 | void loadConfiguration(); |
104 | OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); | 99 | OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); |
105 | const QString &rootPath(); | 100 | const QString &rootPath(); |
106 | void linkPackageDir( const QString &dest = QString::null ); | 101 | void linkPackageDir( const QString &dest = QString::null ); |
107 | void unlinkPackage( const QString &package = QString::null, | 102 | void unlinkPackage( const QString &package = QString::null, |
108 | OConfItemList *destList = 0l ); | 103 | OConfItemList *destList = 0l ); |
109 | 104 | ||
110 | signals: | 105 | signals: |
111 | void signalIpkgMessage( const QString &msg ); | 106 | void signalIpkgMessage( const QString &msg ); |
112 | void signalIpkgStatus( const QString &status ); | 107 | void signalIpkgStatus( const QString &status ); |
113 | void signalIpkgList( const QString &filelist ); | 108 | void signalIpkgList( const QString &filelist ); |
114 | }; | 109 | }; |
115 | 110 | ||
116 | #endif | 111 | #endif |