rpms/mc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

mc-4.8.24-3.fc32

Browse Source 
- fix gcc-10 build failure

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2020-01-31 14:33:44 +01:00
parent 3154ecd288
commit 72b0173371
2 changed files with 95 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
mc-gcc10.patch Normal file
View File

@ -0,0 +1,90 @@
diff -up mc-4.8.24/lib/glibcompat.c.gcc10 mc-4.8.24/lib/glibcompat.c
--- mc-4.8.24/lib/glibcompat.c.gcc10 2020-01-31 14:25:41.997058611 +0100
+++ mc-4.8.24/lib/glibcompat.c 2020-01-31 14:26:12.750509713 +0100
@@ -91,71 +91,6 @@ g_list_free_full (GList * list, GDestroy
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
-#if ! GLIB_CHECK_VERSION (2, 64, 0)
-/**
- * g_clear_slist: (skip)
- * @slist_ptr: (not nullable): a #GSList return location
- * @destroy: (nullable): the function to pass to g_slist_free_full() or NULL to not free elements
- *
- * Clears a pointer to a #GSList, freeing it and, optionally, freeing its elements using @destroy.
- *
- * @slist_ptr must be a valid pointer. If @slist_ptr points to a null #GSList, this does nothing.
- *
- * Since: 2.64
- */
-void
-g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy)
-{
- GSList *slist;
-
- slist = *slist_ptr;
-
- if (slist != NULL)
- {
- *slist_ptr = NULL;
-
- if (destroy != NULL)
- g_slist_free_full (slist, destroy);
- else
- g_slist_free (slist);
- }
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
-/**
- * g_clear_list:
- * @list_ptr: (not nullable): a #GList return location
- * @destroy: (nullable): the function to pass to g_list_free_full() or NULL to not free elements
- *
- * Clears a pointer to a #GList, freeing it and, optionally, freeing its elements using @destroy.
- *
- * @list_ptr must be a valid pointer. If @list_ptr points to a null #GList, this does nothing.
- *
- * Since: 2.64
- */
-void
-g_clear_list (GList ** list_ptr, GDestroyNotify destroy)
-{
- GList *list;
-
- list = *list_ptr;
-
- if (list != NULL)
- {
- *list_ptr = NULL;
-
- if (destroy != NULL)
- g_list_free_full (list, destroy);
- else
- g_list_free (list);
- }
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
-#endif /* ! GLIB_CHECK_VERSION (2, 64, 0) */
-
#if ! GLIB_CHECK_VERSION (2, 32, 0)
/**
* g_queue_free_full:
diff -up mc-4.8.24/lib/glibcompat.h.gcc10 mc-4.8.24/lib/glibcompat.h
--- mc-4.8.24/lib/glibcompat.h.gcc10 2020-01-31 14:25:46.096118737 +0100
+++ mc-4.8.24/lib/glibcompat.h 2020-01-31 14:25:54.285238859 +0100
@@ -16,11 +16,6 @@ void g_slist_free_full (GSList * list, G
void g_list_free_full (GList * list, GDestroyNotify free_func);
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
-#if ! GLIB_CHECK_VERSION (2, 64, 0)
-void g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy);
-void g_clear_list (GList ** list_ptr, GDestroyNotify destroy);
-#endif /* ! GLIB_CHECK_VERSION (2, 64, 0) */
-
#if ! GLIB_CHECK_VERSION (2, 32, 0)
void g_queue_free_full (GQueue * queue, GDestroyNotify free_func);
#endif /* ! GLIB_CHECK_VERSION (2, 32, 0) */

6
mc.spec
View File

@ -4,7 +4,7 @@ Summary: User-friendly text console file manager and visual shell
Name: mc
Epoch: 1
Version: 4.8.24
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
URL: http://www.midnight-commander.org/
Source0: http://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
@ -13,6 +13,7 @@ Patch2: %{name}-rpm.patch
Patch3: %{name}-python3.patch
Patch4: %{name}-default_setup.patch
Patch5: %{name}-tmpdir.patch
Patch6: %{name}-gcc10.patch
BuildRequires: e2fsprogs-devel
BuildRequires: gcc
BuildRequires: glib2-devel
@ -92,6 +93,9 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
%{_libexecdir}/mc/extfs.d/{s3+,uc1541}
%changelog
* Fri Jan 31 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-3
- fix gcc-10 build failure
* Mon Jan 27 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-2
- be sure to use /var/tmp instead of /tmp (#1795006)