Skip to contentSkip to conversation

glib-2.0 stable version and distro tracking update, Dongxiao, 2011/01/30

GIT PULL In review Dongxiao Xu 2 participants 4 messages Jan 30, 2011

lore
Share & tools
lore
#0 lore raw

From: Dongxiao Xu <[email protected]>

Hi Saul,

This pull request introduces the glib-2.0 stable version 2.26.1.

Besides it updates the distro tracking fields and adds the manual check items for those recipes whose upstream version could not be found automatically.

Please help to review and pull.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dxu4/glib-2.0
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/glib-2.0

Thanks,
Dongxiao Xu <[email protected]>
---

Dongxiao Xu (2):
glib-2.0: Add stable vesion 2.26.1
distro_tracking: update distro tracking fields

 .../conf/distro/include/distro_tracking_fields.inc |   23 +++++++--
 .../60_wait-longer-for-threads-to-die.patch        |    0
 .../configure-libtool.patch                        |    0
 .../g_once_init_enter.patch                        |    0
 .../glib-gettextize-dir.patch                      |    0
 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb      |   16 ++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    1 +
 .../libfm/libfm-0.1.14/add_missing.patch           |   50 --------------------
 meta/recipes-support/libfm/libfm_0.1.14.bb         |    5 +-
 9 files changed, 37 insertions(+), 58 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/60_wait-longer-for-threads-to-die.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/configure-libtool.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/g_once_init_enter.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/glib-gettextize-dir.patch (100%)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
 delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch
#1 lore raw

PATCH 1/2 glib-2.0: Add stable vesion 2.26.1

From: Dongxiao Xu <[email protected]>

Move patches into a common directory to be shared by both recipes.

Remove the libfm patch which is no longer needed. Or else it will have re-definition error along with glib 2.26.1.

---
 .../60_wait-longer-for-threads-to-die.patch        |    0
 .../configure-libtool.patch                        |    0
 .../g_once_init_enter.patch                        |    0
 .../glib-gettextize-dir.patch                      |    0
 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb      |   16 ++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    1 +
 .../libfm/libfm-0.1.14/add_missing.patch           |   50 --------------------
 meta/recipes-support/libfm/libfm_0.1.14.bb         |    5 +-
 8 files changed, 19 insertions(+), 53 deletions(-)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/60_wait-longer-for-threads-to-die.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/configure-libtool.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/g_once_init_enter.patch (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 => glib-2.0}/glib-gettextize-dir.patch (100%)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
 delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch
meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/60_wait-longer-for-threads-to-die.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/60_wait-longer-for-threads-to-die.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb new file +16 -0
new file mode 100644
index 0000000..eace71a
@@ -0,0 +1,16 @@
+require glib.inc
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2 \
+           file://configure-libtool.patch \
+           file://60_wait-longer-for-threads-to-die.patch \
+           file://g_once_init_enter.patch \
+          "
+
+SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
+SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+BBCLASSEXTEND = "native"
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -0
index b26da7b..92566c1 100644
@@ -12,4 +12,5 @@ SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"
 SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61d328dc"
 
 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+DEFAULT_PREFERENCE = "-1"
 BBCLASSEXTEND = "native"
meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-support/libfm/libfm_0.1.14.bb +2 -3
index e8e672c..c56ad33 100644
@@ -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"
Signature · 1 line
1.6.3.3
#3 lore raw

PATCH 2/2 distro_tracking: update distro tracking fields

In reply to Dongxiao Xu

From: Dongxiao Xu <[email protected]>

Add manual check date for recipes whose upstream vesion could not be found automatically.

Also update glib-2.0 tracking data.

---
 .../conf/distro/include/distro_tracking_fields.inc |   23 +++++++++++++++----
 1 files changed, 18 insertions(+), 5 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +18 -5
index 9f99e50..c90d37e 100644
@@ -80,11 +80,12 @@ RECIPE_LAST_UPDATE_pn-mingetty = "Sep 1, 2010"
 RECIPE_MAINTAINER_pn-mingetty = "Xiaofeng.Yan <[email protected]>"
 
 RECIPE_STATUS_pn-minicom="green"
-RECIPE_LATEST_VERSION_pn-minicom="2.4"
+RECIPE_LATEST_VERSION_pn-minicom="2.5"
 RECIPE_NO_OF_PATCHES_pn-minicom="1"
 RECIPE_LATEST_RELEASE_DATE_pn-minicom="2010/12/20"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-minicom="22 months"
 RECIPE_LAST_UPDATE_pn-minicom = "Nov 24, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-minicom = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-minicom = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-patch = "green"
@@ -165,6 +166,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glib-2.0 = "1 month"
 RECIPE_LATEST_RELEASE_DATE_pn-glib-2.0 = "2010/12/20"
 RECIPE_COMMENTS_pn-glib-2.0 = ""
 RECIPE_LAST_UPDATE_pn-glib-2.0 = "Dec 30, 2010"
+RECIPE_NO_UPDATE_REASON_pn-glib-2.0 ="do not upgrade to 2.27.5 because it is unstable version"
 RECIPE_MAINTAINER_pn-glib-2.0 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libpam = "green"
@@ -1000,8 +1002,9 @@ RECIPE_LATEST_VERSION_pn-ethtool = "2.6.36"
 RECIPE_LAST_UPDATE_pn-ethtool = "Nov 28, 2010"
 RECIPE_MAINTAINER_pn-ethtool = "Edwin Zhai <[email protected]>"
 
-RECIPE_STATUS_pn-net-tools = "red"
+RECIPE_STATUS_pn-net-tools = "green"
 RECIPE_LAST_UPDATE_pn-net-tools = "Aug 16, 2010"
+RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
 RECIPE_MAINTAINER_pn-net-tools = "Dongxiao Xu <[email protected]>"
 RECIPE_LATEST_VERSION_pn-net-tools = "1.60-23"
 
@@ -1148,11 +1151,12 @@ RECIPE_MAINTAINER_pn-eee-acpi-scripts = "Edwin Zhai <[email protected]>"
 DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts"
 
 RECIPE_STATUS_pn-gssdp = "green"
-RECIPE_LATEST_VERSION_pn-gssdp = "0.9.0"
+RECIPE_LATEST_VERSION_pn-gssdp = "0.9.2"
 RECIPE_NO_OF_PATCHES_pn-gssdp="0"
 RECIPE_LATEST_RELEASE_DATE_pn-gssdp="2010/11/12"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gssdp="2 month"
 RECIPE_LAST_UPDATE_pn-gssdp = "Nov 25, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gssdp = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-gssdp = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-insserv = "green"
@@ -1974,6 +1978,7 @@ RECIPE_NO_OF_PATCHES_pn-lrzsz="3"
 RECIPE_LATEST_RELEASE_DATE_pn-lrzsz="1998/12/31"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lrzsz="12 months"
 RECIPE_LAST_UPDATE_pn-lrzsz = "Jul 21, 2006"
+RECIPE_MANUAL_CHECK_DATE_pn-lrzsz = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-lrzsz = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-wireless-tools="yellow" # patch investigation needed
@@ -1982,6 +1987,7 @@ RECIPE_NO_OF_PATCHES_pn-wireless-tools="3"
 RECIPE_LATEST_RELEASE_DATE_pn-wireless-tools="2007/09/18"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-wireless-tools="18 months"
 RECIPE_LAST_UPDATE_pn-wireless-tools = "Oct 19, 2007"
+RECIPE_MANUAL_CHECK_DATE_pn-wireless-tools = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-wireless-tools = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-bluez-dtl1-workaround="yellow" # LICENSE double check
@@ -2041,6 +2047,7 @@ RECIPE_NO_OF_PATCHES_pn-libproxy="1"
 RECIPE_LATEST_RELEASE_DATE_pn-libproxy="2010/09/01"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libproxy="10 days"
 RECIPE_LAST_UPDATE_pn-libproxy = "Nov 16, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-libproxy = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-libproxy = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-connman = "green"
@@ -2067,19 +2074,21 @@ RECIPE_LAST_UPDATE_pn-empathy = "Aug 19, 2009"
 RECIPE_MAINTAINER_pn-empathy = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-gupnp = "green"
-RECIPE_LATEST_VERSION_pn-gupnp = "0.14.0"
+RECIPE_LATEST_VERSION_pn-gupnp = "0.15.1"
 RECIPE_NO_OF_PATCHES_pn-gupnp= "1"
 RECIPE_LATEST_RELEASE_DATE_pn-gupnp= "2010/09/16"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp= "1 month"
 RECIPE_LAST_UPDATE_pn-gupnp = "Dec 7, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gupnp = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-gupnp= "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-gupnp-av = "green"
-RECIPE_LATEST_VERSION_pn-gupnp-av = "0.7.0"
+RECIPE_LATEST_VERSION_pn-gupnp-av = "0.7.1"
 RECIPE_NO_OF_PATCHES_pn-gupnp-av= "0"
 RECIPE_LATEST_RELEASE_DATE_pn-gupnp-av= "2010/11/08"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp-av= "15 days"
 RECIPE_LAST_UPDATE_pn-gupnp-av = "Nov 25, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gupnp-av = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-gupnp-av = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-gupnp-tools = "green"
@@ -2088,6 +2097,7 @@ RECIPE_NO_OF_PATCHES_pn-gupnp-tools = "0"
 RECIPE_LATEST_RELEASE_DATE_pn-gupnp-tools = "2010/09/16"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp-tools = "3 month"
 RECIPE_LAST_UPDATE_pn-gupnp-tools = "Nov 25, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gupnp-tools = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-gupnp-tools = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libopensync = "red"
@@ -2439,6 +2449,7 @@ RECIPE_NO_OF_PATCHES_pn-liba52="1"
 RECIPE_LATEST_RELEASE_DATE_pn-liba52="2002/07/27"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liba52="5 months"
 RECIPE_LAST_UPDATE_pn-liba52 = "Sep 1, 2006"
+RECIPE_MANUAL_CHECK_DATE_pn-liba52 = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-liba52 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libid3tag="yellow" # patch investigation needed
@@ -2623,6 +2634,7 @@ RECIPE_NO_OF_PATCHES_pn-taglib = "2"
 RECIPE_LATEST_RELEASE_DATE_pn-taglib = "2010/04/19"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-taglib = "10 days"
 RECIPE_LAST_UPDATE_pn-taglib = "Nov 16, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-taglib = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-taglib = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libnice = "red"
@@ -2658,6 +2670,7 @@ RECIPE_STATUS_pn-libsamplerate0 = "red"
 DISTRO_PN_ALIAS_pn-libsamplerate0 = "Meego=libsamplerate Fedora=libsamplerate OpenSuSE=libsamplerate Ubuntu=libsamplerate Mandriva=libsamplerate Debian=libsamplerate"
 RECIPE_LATEST_VERSION_pn-libsamplerate0 = "0.1.7"
 RECIPE_LAST_UPDATE_pn-libsamplerate0 = "Nov 22, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-libsamplerate0 = "Jan 30, 2011"
 RECIPE_MAINTAINER_pn-libsamplerate0 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-oprofileui = "green"
Signature · 1 line
1.6.3.3
#2 lore raw

Re: [PATCH 1/2] glib-2.0: Add stable vesion 2.26.1

In reply to Dongxiao Xu
Quoted 7 lines · Dongxiao Xu

From: Dongxiao Xu<[email protected]>

Move patches into a common directory to be shared by both recipes.

Remove the libfm patch which is no longer needed. Or else it will have re-definition error along with glib 2.26.1.

This should really be applied as 2 commits, one for glib and a second one for libfm.

Can you please remake this as 2 commits.

Thanks
Sau!

Quoted 139 lines
---
  .../60_wait-longer-for-threads-to-die.patch        |    0
  .../configure-libtool.patch                        |    0
  .../g_once_init_enter.patch                        |    0
  .../glib-gettextize-dir.patch                      |    0
  meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb      |   16 ++++++
  meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    1 +
  .../libfm/libfm-0.1.14/add_missing.patch           |   50 --------------------
  meta/recipes-support/libfm/libfm_0.1.14.bb         |    5 +-
  8 files changed, 19 insertions(+), 53 deletions(-)
  rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 =>  glib-2.0}/60_wait-longer-for-threads-to-die.patch (100%)
  rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 =>  glib-2.0}/configure-libtool.patch (100%)
  rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 =>  glib-2.0}/g_once_init_enter.patch (100%)
  rename meta/recipes-core/glib-2.0/{glib-2.0-2.27.5 =>  glib-2.0}/glib-gettextize-dir.patch (100%)

create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch

meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/60_wait-longer-for-threads-to-die.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/60_wait-longer-for-threads-to-die.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch renamed from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch
rename to meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch
meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb new file +16 -0
new file mode 100644
index 0000000..eace71a
@@ -0,0 +1,16 @@
+require glib.inc
+
+PE = "1"
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2 \
+           file://configure-libtool.patch \
+           file://60_wait-longer-for-threads-to-die.patch \
+           file://g_once_init_enter.patch \
+          "
+
+SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
+SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+BBCLASSEXTEND = "native"
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -0
index b26da7b..92566c1 100644
@@ -12,4 +12,5 @@ SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"
  SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61d328dc"
 
  SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+DEFAULT_PREFERENCE = "-1"
  BBCLASSEXTEND = "native"
meta/recipes-support/libfm/libfm-0.1.14/add_missing.patch deleted +0 -50
deleted file mode 100644
index 3739d80..0000000
@@ -1,50 +0,0 @@
-Add missing definitions and declarations for libfm which are
-needed by libfm.
-
-Signed-off-by: Dongxiao Xu<[email protected]>
-
-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__ */
meta/recipes-support/libfm/libfm_0.1.14.bb +2 -3
index e8e672c..c56ad33 100644
@@ -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"