# # Patch managed by http://www.holgerschurig.de/patcher.html # --- packagemanager/oipkg.h~ipkg-fix +++ packagemanager/oipkg.h @@ -39,10 +39,6 @@ #include -extern "C" { -#include -}; - // Ipkg execution options (m_ipkgExecOptions) #define FORCE_DEPENDS 0x0001 #define FORCE_REMOVE 0x0002 @@ -94,7 +90,6 @@ 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 --- packagemanager/oipkg.cpp~ipkg-fix +++ packagemanager/oipkg.cpp @@ -38,6 +38,11 @@ #include #include +extern "C" { +#include +}; +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