diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-13 08:11:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-13 08:11:47 +0000 |
| commit | 2c5ca7cc6398f6b7fd60785234024810f2b05cfb (patch) | |
| tree | fb3f502541e4345a0553d76574e9b0debed7b393 /packages | |
| parent | 050e640df9036ed249caf35d86fd06aab7acf67d (diff) | |
opie-packagemanager: drop ipkg-fix.patch which was applied upstream
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/opie-packagemanager/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-packagemanager/files/ipkg-fix.patch | 40 | ||||
| -rw-r--r-- | packages/opie-packagemanager/opie-packagemanager_1.2.1.bb | 6 |
3 files changed, 2 insertions, 44 deletions
diff --git a/packages/opie-packagemanager/files/.mtn2git_empty b/packages/opie-packagemanager/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-packagemanager/files/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-packagemanager/files/ipkg-fix.patch b/packages/opie-packagemanager/files/ipkg-fix.patch deleted file mode 100644 index 256727b0f3..0000000000 --- a/packages/opie-packagemanager/files/ipkg-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ - -# -# 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 diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb index 43538c0880..23e6a1fabd 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb @@ -1,8 +1,6 @@ include ${PN}.inc - - + SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${CVSDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${CVSDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://ipkg-fix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" |