From 8ab10476c6533b4b18c3d7eccb4fda677e716a49 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 10:57:48 +0000 Subject: more meamo improvements, courtesy Florian Boor --- .../osso-application-installer/.mtn2git_empty | 0 .../fix-buildsystem.patch | 65 ++++++++++++++++++++++ .../maemo/osso-application-installer_1.0.03-1.bb | 20 +++++++ 3 files changed, 85 insertions(+) create mode 100644 packages/maemo/osso-application-installer/.mtn2git_empty create mode 100644 packages/maemo/osso-application-installer/fix-buildsystem.patch create mode 100644 packages/maemo/osso-application-installer_1.0.03-1.bb (limited to 'packages/maemo') diff --git a/packages/maemo/osso-application-installer/.mtn2git_empty b/packages/maemo/osso-application-installer/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/maemo/osso-application-installer/fix-buildsystem.patch b/packages/maemo/osso-application-installer/fix-buildsystem.patch new file mode 100644 index 0000000000..d89522bbb5 --- /dev/null +++ b/packages/maemo/osso-application-installer/fix-buildsystem.patch @@ -0,0 +1,65 @@ +diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac +--- osso-application-installer-1.0.03_old/configure.ac 2005-05-22 22:06:52.000000000 +0200 ++++ osso-application-installer-1.0.03/configure.ac 2005-06-30 12:19:24.000000000 +0200 +@@ -38,9 +38,9 @@ + AC_SUBST(CP_CFLAGS) + AC_SUBST(CP_LIBS) + +-cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir` ++cp_pluginlibdir=${libdir}/hildon-control-panel + AC_SUBST(cp_pluginlibdir) +-cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir` ++cp_plugindesktopdir=${datadir}/applications/hildon-control-panel + AC_SUBST(cp_plugindesktopdir) + + # Localisation-related +@@ -52,12 +52,12 @@ + AM_GLIB_GNU_GETTEXT + + # Mime crap +-dnl MIME-type registration check (2.6 / 2.8 version) +-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) +-AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) ++#dnl MIME-type registration check (2.6 / 2.8 version) ++#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) ++#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) + +-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) +-AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) ++#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) ++#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) + + + applicationinstallerlocaledir=${datadir}/locale +@@ -76,7 +76,7 @@ + AC_SUBST(hildonpixmapdir) + AC_SUBST(hildonstatusbarlibdir) + +-dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1` ++dbuslibpathdir=${libdir} + dbusconfdir=/etc/dbus-1/system.d + dbusservdir=${dbuslibpathdir}/dbus-1.0/services + AC_SUBST(dbuslibpathdir) +diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am +--- osso-application-installer-1.0.03_old/mime/Makefile.am 2005-05-22 22:06:52.000000000 +0200 ++++ osso-application-installer-1.0.03/mime/Makefile.am 2005-06-30 12:19:24.000000000 +0200 +@@ -2,19 +2,3 @@ + mime_DATA = osso-application-installer.xml + + EXTRA_DIST = $(mime_DATA) +- +-install-data-hook: +-if HAVE_26_MIME +- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" +-endif +-if HAVE_28_MIME +- $(UPDATE_DESKTOP_DATABASE) +-endif +- +-uninstall-hook: +-if HAVE_26_MIME +- $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" +-endif +-if HAVE_28_MIME +- $(UPDATE_DESKTOP_DATABASE) +-endif diff --git a/packages/maemo/osso-application-installer_1.0.03-1.bb b/packages/maemo/osso-application-installer_1.0.03-1.bb new file mode 100644 index 0000000000..947368c46c --- /dev/null +++ b/packages/maemo/osso-application-installer_1.0.03-1.bb @@ -0,0 +1,20 @@ +PR = "r0" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " + +DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info" +RDEPENDS = "shared-mime-info" + +SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \ + file://fix-buildsystem.patch;patch=1" + +S = "${WORKDIR}/osso-application-installer-1.0.03" + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/dbus-1.0 ${libdir}/hildon-control-panel/*.so ${datadir}/applications ${datadir}/mime" + +pkg_postinst () { + echo "Updating MIME database... this may take a while." + ${bindir}/update-mime-database ${datadir}/mime +} -- cgit v1.2.3