summaryrefslogtreecommitdiff
path: root/packages/opie-packagemanager/files/ipkg-fix.patch
blob: 256727b0f390bbc7d30649250d51304defe00fab (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
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