# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1422376553 -3600
# Node ID 30d223dc104ff37e22150a5318298d035d5b816e
# Parent  36b17616c07e304543e82099e3658b44e918ec42
Up parted (3.2)

diff -r 36b17616c07e -r 30d223dc104f parted-dev/receipt
--- a/parted-dev/receipt	Tue Jan 27 17:17:16 2015 +0100
+++ b/parted-dev/receipt	Tue Jan 27 17:35:53 2015 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="parted-dev"
-VERSION="3.1"
+VERSION="3.2"
 CATEGORY="development"
 SHORT_DESC="GNU parted editor devel files."
 MAINTAINER="pankso@slitaz.org"
diff -r 36b17616c07e -r 30d223dc104f parted/receipt
--- a/parted/receipt	Tue Jan 27 17:17:16 2015 +0100
+++ b/parted/receipt	Tue Jan 27 17:35:53 2015 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="parted"
-VERSION="3.1"
+VERSION="3.2"
 CATEGORY="system-tools"
 SHORT_DESC="GNU parted partition editor."
 MAINTAINER="pankso@slitaz.org"
@@ -17,6 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	patch -p1 < $stuff/device_mapper.u
 	grep -qs 'define u8' libparted/arch/linux.c ||
 	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
 		libparted/arch/linux.c
diff -r 36b17616c07e -r 30d223dc104f parted/stuff/device_mapper.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/parted/stuff/device_mapper.u	Tue Jan 27 17:35:53 2015 +0100
@@ -0,0 +1,44 @@
+--- parted-3.2/libparted/arch/linux.c.device-mapper	2014-06-15 20:15:54.000000000 +0100
++++ parted-3.2/libparted/arch/linux.c	2014-07-29 22:27:54.487430030 +0100
+@@ -2307,6 +2307,7 @@ zasprintf (const char *format, ...)
+ static char *
+ dm_canonical_path (PedDevice const *dev)
+ {
++#ifdef ENABLE_DEVICE_MAPPER
+         LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev);
+ 
+         /* Get map name from devicemapper */
+@@ -2324,6 +2325,7 @@ dm_canonical_path (PedDevice const *dev)
+         dm_task_destroy (task);
+         return dev_name;
+ err:
++#endif
+         return NULL;
+ }
+ 
+@@ -2944,13 +2946,14 @@ _disk_sync_part_table (PedDisk* disk)
+                                                unsigned long long *start,
+                                                unsigned long long *length);
+ 
+-
++#ifdef ENABLE_DEVICE_MAPPER
+         if (disk->dev->type == PED_DEVICE_DM) {
+                 add_partition = _dm_add_partition;
+                 remove_partition = _dm_remove_partition;
+                 resize_partition = _dm_resize_partition;
+                 get_partition_start_and_length = _dm_get_partition_start_and_length;
+         } else {
++#endif
+                 add_partition = _blkpg_add_partition;
+                 remove_partition = _blkpg_remove_partition;
+ #ifdef BLKPG_RESIZE_PARTITION
+@@ -2959,7 +2962,9 @@ _disk_sync_part_table (PedDisk* disk)
+                 resize_partition = NULL;
+ #endif
+                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
++#ifdef ENABLE_DEVICE_MAPPER
+         }
++#endif
+ 
+         /* lpn = largest partition number.
+          * for remove pass, use greater of device or label limit */