summaryrefslogtreecommitdiff
authordrw <drw>2005-04-01 20:32:01 (UTC)
committer drw <drw>2005-04-01 20:32:01 (UTC)
commitcc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f (patch) (side-by-side diff)
tree3500347a14f4106be68712c4d4af49e3c69f7248
parent629c1c9a366f56e9d98940f8dcd0778d039f1421 (diff)
downloadopie-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...
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp5
-rw-r--r--noncore/settings/packagemanager/oipkg.h5
2 files changed, 5 insertions, 5 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
@@ -35,12 +35,17 @@ _;:, .> :=|. This program is free software; you can
#include <qfile.h>
#include <qtextstream.h>
#include <stdlib.h>
#include <unistd.h>
+extern "C" {
+#include <libipkg.h>
+};
+args_t m_ipkgArgs; // libipkg configuration arguments
+
const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file
const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files
const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists
const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location
const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location
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
@@ -36,16 +36,12 @@ _;:, .> :=|. This program is free software; you can
#include "opackage.h"
#include <qpe/config.h>
#include <qobject.h>
-extern "C" {
-#include <libipkg.h>
-};
-
// Ipkg execution options (m_ipkgExecOptions)
#define FORCE_DEPENDS 0x0001
#define FORCE_REMOVE 0x0002
#define FORCE_REINSTALL 0x0004
#define FORCE_OVERWRITE 0x0008
@@ -91,13 +87,12 @@ public:
void ipkgMessage( char *msg );
void ipkgStatus( char *status );
void ipkgList( char *filelist );
private:
Config *m_config; // Pointer to application configuration file
- args_t m_ipkgArgs; // libipkg configuration arguments
OConfItemList *m_confInfo; // Contains info from all Ipkg configuration files
int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options
int m_ipkgExecVerbosity; // Ipkg execution verbosity level
QString m_rootPath; // Directory path where the 'root' destination is located
void loadConfiguration();