opkg: Really fix the prototype problem (and an invalid call)

3 files changed, 17 insertions, 2 deletions

diff --git a/meta/packages/opkg/files/fix_prototype.patch b/meta/packages/opkg/files/fix_prototype.patch
index 8d4eb7b5ad..4be881aa7e 100644
--- a/meta/packages/opkg/files/fix_prototype.patch
+++ b/meta/packages/opkg/files/fix_prototype.patch
@@ -24,3 +24,16 @@ Index: opkg/libopkg/opkg_utils.h
  
  int get_available_blocks(char * filesystem);
  char **read_raw_pkgs_from_file(const char *file_name);
+Index: opkg/libopkg/opkg_cmd.c
+===================================================================
+--- opkg.orig/libopkg/opkg_cmd.c        2008-10-23 12:02:29.000000000 +0100
++++ opkg/libopkg/opkg_cmd.c     2008-10-23 12:02:53.000000000 +0100
+@@ -151,7 +151,7 @@
+            error_list = error_list->next;
+ 
+      }
+-     free_error_list(&error_list);
++     free_error_list();
+   }
+ 
+ }
diff --git a/meta/packages/opkg/opkg-native_svn.bb b/meta/packages/opkg/opkg-native_svn.bb
index 888c4117c9..d9c86509c1 100644
--- a/meta/packages/opkg/opkg-native_svn.bb
+++ b/meta/packages/opkg/opkg-native_svn.bb
@@ -3,7 +3,7 @@ require opkg.inc
 DEPENDS = "curl-native"
 PROVIDES += "virtual/update-alternatives-native"
 RPROVIDES_${PN} += "update-alternatives-native"
-PR = "r2"
+PR = "r4"
 
 target_libdir := "${libdir}"
 
diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc
index 6c6a7a7afb..d0167f6283 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -6,7 +6,9 @@ LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.0+svnr${SRCREV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \
+           file://fix_prototype.patch;patch=1"
+
 S = "${WORKDIR}/opkg"
 
 inherit autotools pkgconfig