From 7a02a545c0649a2a3cdc75a8382331a4e42b55b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 2 Jan 2021 23:07:09 +0100 Subject: [PATCH] xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes for 1.1.5 ======================= Updated and revised German translation; further enhanced autotools setup; checked compilation and functionality on FreeBSD 12.2. Release notes for 1.1.4 ======================= - Remove unused variable exclude_devicenames - Remove obsolete panel version 4.9 check - Remove checks for unused functions from configure.ac - Include stdlib because malloc is used - Spellfix. Add missing "e" to siz (size) - Update URLs from goodies.x.o to docs.x.o (Bug #16168) - Fix build with panel 4.15 - Make build less verbose - Another change to the SVG icon file canvas size - Updated svg image to have a larger canvas so that the panel can be resized up to 192 pixels size - Added title to popup menu; even if it is not empty (Bug #14478) - https URL instead of http - Renamed improperly named member variable of main mountpoint display structure - Display percentage on progress bar again (regression from port to Gtk3) - Reformatted popup information with more columns and nicer alignment. (Bug #14670) - Fix bug 13624 by not trying to save when closing the plugin, but already and only when closing the settings dialog - Translation Updates: Albanian, Arabic, Asturian, Basque, Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (United Kingdom), Finnish, French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, Korean, Latvian, Lithuanian, Malay, Norwegian Bokmål, Occitan (post 1500), Panjabi (Punjabi), Polish, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Spanish, Swedish, Thai, Turkish, Ukrainian, Urdu, Urdu (Pakistan), Uyghur Signed-off-by: Andreas Müller --- ...1-check-for-fstab.h-during-configure.patch | 30 +++++++++---------- ...n_1.1.3.bb => xfce4-mount-plugin_1.1.5.bb} | 4 +-- 2 files changed, 16 insertions(+), 18 deletions(-) rename meta-xfce/recipes-panel-plugins/mount/{xfce4-mount-plugin_1.1.3.bb => xfce4-mount-plugin_1.1.5.bb} (57%) 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 e2165c2fa50..d81f702891d 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 @@ -14,38 +14,38 @@ Signed-off-by: Khem Raj Patch Reworked for xfce4-mount-plugin 0.6.4->1.1.2 Signed-off-by: Andreas Müller --- - configure.ac | 1 + + configure.ac | 2 + panel-plugin/devices.c | 22 +++++++++++++++++++--- - 2 files changed, 20 insertions(+), 3 deletions(-) + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index b131117..c633fef 100644 +index 375e64a..590b7ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,7 @@ AC_CHECK_HEADERS([sys/socket.h]) - AC_CHECK_HEADERS([sys/time.h]) - AC_CHECK_HEADERS([unistd.h]) - AC_CHECK_HEADERS([sys/sockio.h]) +@@ -65,6 +65,9 @@ dnl param.h is part of libc6 on Linux, but important for old-style Unix and espe + AC_CHECK_HEADERS([sys/param.h]) + AC_CHECK_HEADERS([sys/mount.h]) + ++dnl make musl happy +AC_CHECK_HEADERS([fstab.h]) - AC_HEADER_SYS_WAIT - AC_PROG_GCC_TRADITIONAL - AC_TYPE_SIZE_T ++ + 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. + dnl AC_PROG_GCC_TRADITIONAL + diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c index 797b079..d29df56 100644 --- a/panel-plugin/devices.c +++ b/panel-plugin/devices.c -@@ -24,8 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - #ifdef HAVE_CONFIG_H +@@ -25,7 +25,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #endif -- + +#if HAVE_FSTAB_H #include +#endif -+ #include #include - #include + #include @@ -468,11 +470,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) { GPtrArray * pdisks; /* to be returned */ diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb similarity index 57% rename from meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb rename to meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb index 4600104ad16..1fb82b740e5 100644 --- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb @@ -6,6 +6,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" -SRC_URI[md5sum] = "2f1f903d0bdf6ee6776afd8af73497ac" -SRC_URI[sha256sum] = "aae5bd6b984bc78daf6b5fb9d15817a27253674a4264ad60f62ccb1aa194911e" +SRC_URI[sha256sum] = "584cd954929e542b3da0ff8d69e0325d8838dc39e7b32a509d1074ce3bb58ec2"