summaryrefslogtreecommitdiff
path: root/packages/opie-packagemanager/files/ipkg-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/opie-packagemanager/files/ipkg-fix.patch')
-rw-r--r--packages/opie-packagemanager/files/ipkg-fix.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/packages/opie-packagemanager/files/ipkg-fix.patch b/packages/opie-packagemanager/files/ipkg-fix.patch
index e69de29bb2..256727b0f3 100644
--- a/packages/opie-packagemanager/files/ipkg-fix.patch
+++ b/packages/opie-packagemanager/files/ipkg-fix.patch
@@ -0,0 +1,40 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- packagemanager/oipkg.h~ipkg-fix
++++ packagemanager/oipkg.h
+@@ -39,10 +39,6 @@
+
+ #include <qobject.h>
+
+-extern "C" {
+-#include <libipkg.h>
+-};
+-
+ // 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 <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