From dfc8bf318ffa0c76dc08c032d48b3a04b7fa1adf Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 18 Nov 2010 00:49:38 +0800 Subject: libfm: add missing definitions and declarations Some macro definitions are missing in the new glib headers, which are needed by libfm. Add these to fix the libfm build issue. Signed-off-by: Dongxiao Xu Signed-off-by: Saul Wold --- .../libfm/libfm-0.1.12/add_missing.patch | 50 ++++++++++++++++++++++ meta/recipes-support/libfm/libfm_0.1.12.bb | 5 ++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libfm/libfm-0.1.12/add_missing.patch (limited to 'meta/recipes-support/libfm') diff --git a/meta/recipes-support/libfm/libfm-0.1.12/add_missing.patch b/meta/recipes-support/libfm/libfm-0.1.12/add_missing.patch new file mode 100644 index 000000000..3739d8056 --- /dev/null +++ b/meta/recipes-support/libfm/libfm-0.1.12/add_missing.patch @@ -0,0 +1,50 @@ +Add missing definitions and declarations for libfm which are +needed by libfm. + +Signed-off-by: Dongxiao Xu + +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 ++ * Extending GIO. ++ */ ++#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.12.bb b/meta/recipes-support/libfm/libfm_0.1.12.bb index 83e6af852..31f78a0a1 100644 --- a/meta/recipes-support/libfm/libfm_0.1.12.bb +++ b/meta/recipes-support/libfm/libfm_0.1.12.bb @@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SECTION = "x11/libs" DEPENDS = "gtk+ menu-cache intltool" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \ + file://add_missing.patch" inherit autotools pkgconfig -- cgit v1.2.3