summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch16
-rw-r--r--meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.2.0.bb (renamed from meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb)6
2 files changed, 11 insertions, 11 deletions
diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
index 64f06cebb5..f0435238ac 100644
--- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
+++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
@@ -23,16 +23,14 @@ diff --git a/configure.ac b/configure.ac
23index 375e64a..590b7ad 100644 23index 375e64a..590b7ad 100644
24--- a/configure.ac 24--- a/configure.ac
25+++ b/configure.ac 25+++ b/configure.ac
26@@ -65,6 +65,9 @@ dnl param.h is part of libc6 on Linux, but important for old-style Unix and espe 26@@ -36,4 +36,7 @@
27 AC_CHECK_HEADERS([sys/param.h]) 27 AC_PROG_INSTALL
28 AC_CHECK_HEADERS([sys/mount.h]) 28
29
30+dnl make musl happy 29+dnl make musl happy
31+AC_CHECK_HEADERS([fstab.h]) 30+AC_CHECK_HEADERS([fstab.h])
32+ 31+
33 dnl Add -traditional to output variable CC if using the GNU C compiler and ioctl does not work properly without -traditional. That usually happens when the fixed header files have not been installed on an old system. Leave here commented out to comment in if some older *NIX systems might require it as was recently written on the ML. 32 dnl Initialize libtool
34 dnl AC_PROG_GCC_TRADITIONAL 33 LT_PREREQ([2.2.6])
35
36diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c 34diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
37index 797b079..d29df56 100644 35index 797b079..d29df56 100644
38--- a/panel-plugin/devices.c 36--- a/panel-plugin/devices.c
@@ -47,7 +45,7 @@ index 797b079..d29df56 100644
47 #include <glib.h> 45 #include <glib.h>
48 #include <stdio.h> 46 #include <stdio.h>
49 #include <stdlib.h> 47 #include <stdlib.h>
50@@ -468,11 +470,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) 48@@ -467,11 +469,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length)
51 { 49 {
52 GPtrArray * pdisks; /* to be returned */ 50 GPtrArray * pdisks; /* to be returned */
53 t_disk * pdisk; 51 t_disk * pdisk;
@@ -61,7 +59,7 @@ index 797b079..d29df56 100644
61 /* open fstab */ 59 /* open fstab */
62 if (setfsent()!=1) 60 if (setfsent()!=1)
63 { 61 {
64@@ -526,7 +529,20 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) 62@@ -529,7 +532,20 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length)
65 } /* end for */ 63 } /* end for */
66 64
67 endfsent(); /* close file */ 65 endfsent(); /* close file */
diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.2.0.bb
index f11e41f9bd..073b7cf86a 100644
--- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb
+++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.2.0.bb
@@ -2,10 +2,12 @@ SUMMARY = "Mount/umount utility for the xfce panel"
2HOMEPAGE = "https://docs.xfce.org/panel-plugins/xfce4-mount-plugin/start" 2HOMEPAGE = "https://docs.xfce.org/panel-plugins/xfce4-mount-plugin/start"
3SECTION = "x11/application" 3SECTION = "x11/application"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6
7XFCE_COMPRESS_TYPE = "xz"
6 8
7inherit xfce-panel-plugin 9inherit xfce-panel-plugin
8 10
9SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" 11SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch"
10 12
11SRC_URI[sha256sum] = "584cd954929e542b3da0ff8d69e0325d8838dc39e7b32a509d1074ce3bb58ec2" 13SRC_URI[sha256sum] = "adef71a83078e7dc45997e57411f8c43080a0204159a8b8db2ade0a9877e7b4c"