diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-06-10 17:08:11 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-06-14 08:57:14 -0700 |
commit | 4cc750c9c8f10d7679f936abd34fa95f97e9d587 (patch) | |
tree | 7d9543386bcf6de65c18282effc2e7f690887477 /meta-xfce | |
parent | eb0fe21c15356fe6c9c0e7e2712a0c95e422c4bf (diff) | |
download | meta-openembedded-4cc750c9c8f10d7679f936abd34fa95f97e9d587.tar.gz |
thunar-volman: update 0.8.1 -> 0.9.0
* remove gtk+ dependency: Thunar moved to gkt3 and depending on libxfce4u* is
good enough
* it is a development release but no stoppers could be found.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch | 26 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb (renamed from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb) | 7 |
2 files changed, 3 insertions, 30 deletions
diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch deleted file mode 100644 index 7233ea7ba..000000000 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 2e295e9ce8f7f60a271adf004588b0d8db88db09 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Thirtytwo <matt.59491@gmail.com> | ||
3 | Date: Sat, 7 Mar 2015 22:50:32 +0100 | ||
4 | Subject: [PATCH] Fix return with no value in function returning non-void (bug | ||
5 | #11656) | ||
6 | |||
7 | --- | ||
8 | thunar-volman/tvm-block-device.c | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c | ||
12 | index da31efa..edb6cad 100644 | ||
13 | --- a/thunar-volman/tvm-block-device.c | ||
14 | +++ b/thunar-volman/tvm-block-device.c | ||
15 | @@ -714,7 +714,7 @@ tvm_block_device_mount (TvmContext *context) | ||
16 | GMountOperation *mount_operation; | ||
17 | GVolume *volume; | ||
18 | |||
19 | - g_return_if_fail (context != NULL); | ||
20 | + g_return_val_if_fail ((context != NULL), FALSE); | ||
21 | |||
22 | /* determine the GVolume corresponding to the udev device */ | ||
23 | volume = | ||
24 | -- | ||
25 | 1.9.0 | ||
26 | |||
diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb index c61d4512d..5a37b69bd 100644 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb | |||
@@ -2,15 +2,14 @@ SUMMARY = "Automatic management of removable drives and media for thunar" | |||
2 | SECTION = "x11" | 2 | SECTION = "x11" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
5 | DEPENDS = "exo glib-2.0 gtk+ libxfce4ui libxfce4util xfconf libnotify libgudev" | 5 | DEPENDS = "exo glib-2.0 libxfce4ui libxfce4util xfconf libnotify libgudev" |
6 | 6 | ||
7 | inherit xfce distro_features_check | 7 | inherit xfce distro_features_check |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
10 | 10 | ||
11 | SRC_URI += "file://0001-Fix-return-with-no-value-in-function-returning-non-v.patch" | 11 | SRC_URI[md5sum] = "3b403a4f846927391ea4bee765a055df" |
12 | SRC_URI[md5sum] = "65ab6e05b2e808d1dcc8d36683a59b7e" | 12 | SRC_URI[sha256sum] = "e4bffcfee15530e277fa80865eb1de31e63c7effaf8835c9fa7c71e5a0076b2e" |
13 | SRC_URI[sha256sum] = "5a08bb5ce32c296a64dfbdb2406d4e45a208b2c91e4efa831dc28f1d6c2ac2bd" | ||
14 | 13 | ||
15 | PACKAGECONFIG ??= "" | 14 | PACKAGECONFIG ??= "" |
16 | PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" | 15 | PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" |