From 220533aa038f967a5ab55b131f074ce9ac94d241 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 5 Oct 2009 21:18:00 +0100 Subject: packagekit: 0.3.8 -> 0.4.9 (and sync with OE.dev) and add gnome-packagekit from OE.dev) Signed-off-by: Richard Purdie --- .../packagekit/files/opkg-fix-declarations.diff | 22 ++++++++ .../packages/packagekit/gnome-packagekit_0.4.5.bb | 17 +++++++ .../packages/packagekit/packagekit_0.3.8.bb | 12 ----- .../packages/packagekit/packagekit_0.4.9.bb | 58 ++++++++++++++++++++++ 4 files changed, 97 insertions(+), 12 deletions(-) create mode 100644 meta-moblin/packages/packagekit/files/opkg-fix-declarations.diff create mode 100644 meta-moblin/packages/packagekit/gnome-packagekit_0.4.5.bb delete mode 100644 meta-moblin/packages/packagekit/packagekit_0.3.8.bb create mode 100644 meta-moblin/packages/packagekit/packagekit_0.4.9.bb (limited to 'meta-moblin/packages') diff --git a/meta-moblin/packages/packagekit/files/opkg-fix-declarations.diff b/meta-moblin/packages/packagekit/files/opkg-fix-declarations.diff new file mode 100644 index 0000000000..8c86fabe4b --- /dev/null +++ b/meta-moblin/packages/packagekit/files/opkg-fix-declarations.diff @@ -0,0 +1,22 @@ +http://bugs.freedesktop.org/show_bug.cgi?id=20922 + +--- /tmp/pk-backend-opkg.c 2009-03-28 12:32:28.000000000 +0100 ++++ PackageKit-0.4.5/backends/opkg/pk-backend-opkg.c 2009-03-28 12:48:04.000000000 +0100 +@@ -47,7 +47,7 @@ + } SearchParams; + + static void +-opkg_unknown_error (PkBackend *backend, gint error_code, gchar *failed_cmd) ++opkg_unknown_error (PkBackend *backend, gint error_code, const gchar *failed_cmd) + { + gchar *msg; + +@@ -105,7 +105,7 @@ + * + * returns true if the tag is present + */ +-gboolean ++static gboolean + opkg_check_tag (opkg_package_t *pkg, gchar *tag) + { + if (pkg->tags && tag) diff --git a/meta-moblin/packages/packagekit/gnome-packagekit_0.4.5.bb b/meta-moblin/packages/packagekit/gnome-packagekit_0.4.5.bb new file mode 100644 index 0000000000..ee3bfe356e --- /dev/null +++ b/meta-moblin/packages/packagekit/gnome-packagekit_0.4.5.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GNOME frontend for packagekit" +LICENSE = "GPL" + +DEPENDS = "packagekit libsexy gconf-dbus policykit policykit-gnome libunique gnome-menus" + +inherit gnome + +SRC_URI = "http://www.packagekit.org/releases/gnome-packagekit-${PV}.tar.gz" + +EXTRA_OECONF = " --enable-compile-warnings=no --disable-scrollkeeper " + +do_configure_prepend() { + sed -i -e s/help/docs/ Makefile.am + sed -i -e s:-Werror::g configure.ac +} + +FILES_${PN} += "${datadir}/icons ${datadir}/gnome" diff --git a/meta-moblin/packages/packagekit/packagekit_0.3.8.bb b/meta-moblin/packages/packagekit/packagekit_0.3.8.bb deleted file mode 100644 index 687b5e026b..0000000000 --- a/meta-moblin/packages/packagekit/packagekit_0.3.8.bb +++ /dev/null @@ -1,12 +0,0 @@ -HOMEPAGE = "http://www.packagekit.org/" -PR = "r7" - -SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz \ - file://no_validate.patch;patch=1 " - -DEPENDS = "python policykit pam" -EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local --with-security-framework=polkit --disable-gstreamer-plugin --disable-browser-plugin" - -S = "${WORKDIR}/PackageKit-${PV}" - -inherit autotools pkgconfig diff --git a/meta-moblin/packages/packagekit/packagekit_0.4.9.bb b/meta-moblin/packages/packagekit/packagekit_0.4.9.bb new file mode 100644 index 0000000000..c2f075d21f --- /dev/null +++ b/meta-moblin/packages/packagekit/packagekit_0.4.9.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ python policykit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "opkg" + +inherit gnome autotools_stage + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ + file://no_validate.patch;patch=1" +PR = "r2" +PE = "1" + +S = "${WORKDIR}/PackageKit-${PV}" + +EXTRA_OECONF = "--with-security-framework=dummy \ + --with-default-backend=opkg \ + --enable-opkg \ + --disable-tests \ + --disable-qt \ + --disable-gstreamer-plugin \ + --disable-local \ + ac_cv_path_XMLTO=no \ + " + + +do_configure_prepend() { + mkdir -p m4 + echo "EXTRA_DIST=" > gtk-doc.make + sed -i -e s:0\.1\.5:0\.1\.6:g -e /Werror/d configure.ac +} + +do_configure_append() { + for i in $(find . -name Makefile) ; do + sed -i -e s:${STAGING_DIR_NATIVE}::g \ + -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ + -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ + $i + done +} + + +PACKAGES =+ "${PN}-website" +FILES_${PN}-website = "${datadir}/PackageKit/website" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir}/python*" + +PACKAGES =+ "${PN}-gtkmodule" +FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" + +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" +FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a" + + + -- cgit v1.2.3-54-g00ecf