diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-02-01 13:05:39 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 23:59:42 +0000 |
| commit | 50b9f87124bcfce2ff2dd65009272885eed6ee7a (patch) | |
| tree | 566325bc9a20019f28021bf3d3739027752b7266 | |
| parent | a196ab068fa0717d724e7e7c6c60bb38237f771b (diff) | |
| download | openembedded-core-50b9f87124bcfce2ff2dd65009272885eed6ee7a.tar.gz openembedded-core-50b9f87124bcfce2ff2dd65009272885eed6ee7a.tar.bz2 openembedded-core-50b9f87124bcfce2ff2dd65009272885eed6ee7a.zip | |
libfm: remove add_missing.patch as part of glib-2.0 downgrade
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-support/libfm/libfm_0.1.14.bb | 5 |
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch b/meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch deleted file mode 100644 index 3739d8056e..0000000000 --- a/meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch +++ /dev/null @@ -1,50 +0,0 @@ -Add missing definitions and declarations for libfm which are -needed by libfm. - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -diff -ruN libfm-0.1.12-orig/src/gio/fm-app-lookup.h libfm-0.1.12/src/gio/fm-app-lookup.h ---- libfm-0.1.12-orig/src/gio/fm-app-lookup.h 2010-11-17 22:00:48.000000000 +0800 -+++ libfm-0.1.12/src/gio/fm-app-lookup.h 2010-11-17 22:01:13.000000000 +0800 -@@ -53,6 +53,41 @@ - GType fm_app_lookup_get_type(void); - void fm_app_lookup_register(GIOModule *module); - -+#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ()) -+#define G_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup)) -+#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP)) -+#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface)) -+ -+/** -+ * G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME: -+ * -+ * Extension point for default handler to URI association. See -+ * <link linkend="extending-gio">Extending GIO</link>. -+ */ -+#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup" -+ -+/** -+ * GDesktopAppInfoLookup: -+ * -+ * Interface that is used by backends to associate default -+ * handlers with URI schemes. -+ */ -+typedef struct _GDesktopAppInfoLookup GDesktopAppInfoLookup; -+typedef struct _GDesktopAppInfoLookupIface GDesktopAppInfoLookupIface; -+ -+struct _GDesktopAppInfoLookupIface -+{ -+ GTypeInterface g_iface; -+ -+ GAppInfo * (* get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup, -+ const char *uri_scheme); -+}; -+ -+GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST; -+ -+GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, -+ const char *uri_scheme); -+ - G_END_DECLS - - #endif /* __FM_APP_LOOKUP_H__ */ diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.14.bb index e8e672cf83..c56ad331c1 100644 --- a/meta/recipes-support/libfm/libfm_0.1.14.bb +++ b/meta/recipes-support/libfm/libfm_0.1.14.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SECTION = "x11/libs" DEPENDS = "gtk+ menu-cache intltool" -PR = "r1" +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ - file://add_missing.patch" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz" SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f" SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b" |