summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-11-03 18:44:02 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-11-03 18:44:06 +0100
commit5c1ad6b9247a0c8e04add9331ffd8aec6a5e4ddf (patch)
tree2e89fabe1753438cdaf3a1741589e726b675e78f /gnu/packages/patches
parent9b917c2615d8a03bcced6d453d8e5d3020da7d6b (diff)
gnu: libblockdev: Update to 2.26.
* gnu/packages/disk.scm (libblockdev): Update to 2.26. [source]: Remove patch. * gnu/packages/patches/libblockdev-glib-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/libblockdev-glib-compat.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/gnu/packages/patches/libblockdev-glib-compat.patch b/gnu/packages/patches/libblockdev-glib-compat.patch
deleted file mode 100644
index bb25d5d963..0000000000
--- a/gnu/packages/patches/libblockdev-glib-compat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Don't use g_memdup() which is removed in newer versions of GLib.
-
-See <https://github.com/storaged-project/libblockdev/pull/623>.
-
-Taken from upstream:
-https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940
-
-diff --git a/src/lib/plugin_apis/vdo.api b/src/lib/plugin_apis/vdo.api
---- a/src/lib/plugin_apis/vdo.api
-+++ b/src/lib/plugin_apis/vdo.api
-@@ -170,7 +170,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) {
- * Deprecated: 2.24: Use LVM-VDO integration instead.
- */
- BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
-- return g_memdup (stats, sizeof (BDVDOStats));
-+ if (stats == NULL)
-+ return NULL;
-+
-+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1);
-+
-+ new_stats->block_size = stats->block_size;
-+ new_stats->logical_block_size = stats->logical_block_size;
-+ new_stats->physical_blocks = stats->physical_blocks;
-+ new_stats->data_blocks_used = stats->data_blocks_used;
-+ new_stats->overhead_blocks_used = stats->overhead_blocks_used;
-+ new_stats->logical_blocks_used = stats->logical_blocks_used;
-+ new_stats->used_percent = stats->used_percent;
-+ new_stats->saving_percent = stats->saving_percent;
-+ new_stats->write_amplification_ratio = stats->write_amplification_ratio;
-+
-+ return new_stats;
- }
-
- GType bd_vdo_stats_get_type () {
-diff --git a/src/plugins/vdo.c b/src/plugins/vdo.c
---- a/src/plugins/vdo.c
-+++ b/src/plugins/vdo.c
-@@ -81,7 +81,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) {
- }
-
- BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
-- return g_memdup (stats, sizeof (BDVDOStats));
-+ if (stats == NULL)
-+ return NULL;
-+
-+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1);
-+
-+ new_stats->block_size = stats->block_size;
-+ new_stats->logical_block_size = stats->logical_block_size;
-+ new_stats->physical_blocks = stats->physical_blocks;
-+ new_stats->data_blocks_used = stats->data_blocks_used;
-+ new_stats->overhead_blocks_used = stats->overhead_blocks_used;
-+ new_stats->logical_blocks_used = stats->logical_blocks_used;
-+ new_stats->used_percent = stats->used_percent;
-+ new_stats->saving_percent = stats->saving_percent;
-+ new_stats->write_amplification_ratio = stats->write_amplification_ratio;
-+
-+ return new_stats;
- }
-
-