From cc4594a5c8d45d2f8d14c6ac1723a8ed39577f8f Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Fri, 01 Apr 2005 20:32:01 +0000
Subject: Fix linking issue with libipkg >= 0.99.146, at least until I can come up with a better way to do it...

---
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
@@ -38,6 +38,11 @@ _;:,   .>  :=|.         This program is free software; you can
 #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
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
@@ -39,10 +39,6 @@ _;:,   .>  :=|.         This program is free software; you can
 
 #include <qobject.h>
 
-extern "C" {
-#include <libipkg.h>
-};
-
 // Ipkg execution options (m_ipkgExecOptions)
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
@@ -79,7 +75,7 @@ public:
 
     OConfItem    *findConfItem( OConfItem::Type type = OConfItem::NotDefined,
                                 const QString &name = QString::null );
-    
+
     bool executeCommand( OPackage::Command command = OPackage::NotDefined,
                          const QStringList &parameters = QStringList(),
                          const QString &destination = QString::null,
@@ -94,7 +90,6 @@ public:
 
 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
--
cgit v0.9.0.2