diff options
4 files changed, 57 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc index 013dd74e70..ed92778b60 100644 --- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc @@ -45,6 +45,7 @@ SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" SRCREV_pn-librest ?= "ff4561e2a8c38f49127f6e3b2ce7c238a29e1571" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" +SRCREV_pn-moblin-app-installer ?= "7f7d50079c8bcc63874fd60a61f23d849e025445" SRCREV_pn-moblin-gtk-engine ?= "dff58e5f1b6c111a6c06e2385624e40d687ebf4f" SRCREV_pn-moblin-icon-theme ?= "36b7ac1e57ea6d95e6432779c4769c14fce24899" SRCREV_pn-moblin-menus ?= "1edfdab8234ec0b4bbc83fb706a15e08aa8a957a" diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index 360599695e..9792a99082 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc @@ -26,6 +26,7 @@ SRCREV_pn-libccss ?= "${AUTOREV}" SRCREV_pn-librest ?= "${AUTOREV}" SRCREV_pn-libsynthesis ?= "${AUTOREV}" SRCREV_pn-linux-moblin ?= "${AUTOREV}" +SRCREV_pn-moblin-app-installer ?= "${AUTOREV}" SRCREV_pn-moblin-gtk-engine ?= "${AUTOREV}" SRCREV_pn-moblin-menus ?= "${AUTOREV}" SRCREV_pn-moblin-web-browser ?= "${AUTOREV}" diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch new file mode 100644 index 0000000000..1b57ffe32a --- /dev/null +++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer/opkg.patch @@ -0,0 +1,44 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2009-10-05 17:05:14.000000000 +0100 ++++ git/configure.ac 2009-10-05 21:02:48.000000000 +0100 +@@ -34,7 +34,7 @@ + gtk+-2.0 + packagekit-glib >= 0.4 + packagekit-glib < 0.5 +- rpm >= 4.6' ++ libopkg' + + AC_MSG_CHECKING([for available nbtk version]) + PKG_CHECK_EXISTS(nbtk-1.2, +Index: git/src/mai-package.c +=================================================================== +--- git.orig/src/mai-package.c 2009-10-05 17:05:06.000000000 +0100 ++++ git/src/mai-package.c 2009-10-05 21:01:57.000000000 +0100 +@@ -23,7 +23,7 @@ + #include <gtk/gtk.h> + + /* FIXME make conditional. */ +-#include <rpm/rpmlib.h> ++#include <libopkg/opkg.h> + + #include "mai-model-priv.h" + #include "mai-package.h" +@@ -191,7 +191,7 @@ + + if (priv->package_id && + priv->version && +- rpmvercmp (version, priv->version) < 0) ++ opkg_compare_versions (version, priv->version) < 0) + { + g_debug (" skipping '%s'", version); + return; +@@ -955,7 +955,7 @@ + return -1; + + /* FIXME support deb. */ +- return rpmvercmp (priv->version, version); ++ return opkg_compare_versions (priv->version, version); + } + + gboolean diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb new file mode 100644 index 0000000000..502db63a08 --- /dev/null +++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Moblin Appliction Installer" +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ + file://opkg.patch;patch=1 " +LICENSE = "GPLv2" +PV = "0.0+git${SRCPV}" +PR = "r0" + +S = "${WORKDIR}/git" +DEPENDS = "clutter-1.0 glib-2.0 nbtk libxml2 gtk+ gnome-packagekit opkg" + +inherit autotools_stage |