[oe] [PATCH 03/12] osso-application-installer: nonworking

[Bernhard Reutner-Fischer]

osso-application-installer depends on nonworking hildon-lgpl

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 .../fix-buildsystem.patch                          |   65 --------------------
 .../maemo/osso-application-installer_1.0.03-1.bb   |   19 ------
 .../fix-buildsystem.patch                          |   65 ++++++++++++++++++++
 .../osso-application-installer_1.0.03-1.bb         |   19 ++++++
 4 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 recipes/maemo/osso-application-installer/fix-buildsystem.patch
 delete mode 100644 recipes/maemo/osso-application-installer_1.0.03-1.bb
 create mode 100644 recipes/nonworking/osso-application-installer/fix-buildsystem.patch
 create mode 100644 recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb

diff --git a/recipes/maemo/osso-application-installer/fix-buildsystem.patch b/recipes/maemo/osso-application-installer/fix-buildsystem.patch
deleted file mode 100644
index d89522b..0000000
--- a/recipes/maemo/osso-application-installer/fix-buildsystem.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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/recipes/maemo/osso-application-installer_1.0.03-1.bb b/recipes/maemo/osso-application-installer_1.0.03-1.bb
deleted file mode 100644
index 7380255..0000000
--- a/recipes/maemo/osso-application-installer_1.0.03-1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PR         = "r0"
-LICENSE    = "GPL"
-
-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
-}
diff --git a/recipes/nonworking/osso-application-installer/fix-buildsystem.patch b/recipes/nonworking/osso-application-installer/fix-buildsystem.patch
new file mode 100644
index 0000000..d89522b
--- /dev/null
+++ b/recipes/nonworking/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/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb b/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb
new file mode 100644
index 0000000..7380255
--- /dev/null
+++ b/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb
@@ -0,0 +1,19 @@
+PR         = "r0"
+LICENSE    = "GPL"
+
+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
+}
-- 
1.6.5