Remove unused patches.

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2020-07-17 11:28:53 +02:00
parent d8c21416eb
commit 5e58252f87
2 changed files with 0 additions and 115 deletions

View File

@ -1,90 +0,0 @@
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) */

View File

@ -1,25 +0,0 @@
diff -purN a/src/vfs/extfs/helpers/rpm b/src/vfs/extfs/helpers/rpm
--- a/src/vfs/extfs/helpers/rpm 2017-02-24 21:25:57.000000000 +0100
+++ b/src/vfs/extfs/helpers/rpm 2017-02-25 02:37:57.000000000 +0100
@@ -162,6 +162,10 @@ mcrpmfs_list_fastRPM ()
echo "$FILEPREF 0 $DATE INFO/REQUIRES"
echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
+ echo "$FILEPREF 0 $DATE INFO/RECOMMENDS"
+ echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
}
@@ -301,6 +305,10 @@ mcrpmfs_copyout ()
INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;;
INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;;
INFO/REQUIRES) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;;
+ INFO/ENHANCES) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUGGESTS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/RECOMMENDS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;;
+ INFO/SUPPLEMENTS) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;;
INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;;
INFO/SCRIPTS/PRETRANS) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANS}\n" >"$2"; exit 0;;
INFO/SCRIPTS/PRETRANSPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PRETRANSPROG}\n" >"$2"; exit 0;;