diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2018-12-17 15:18:19 +0800 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2018-12-17 15:38:48 +0800 |
| commit | 50a4af11e412a75cdf3240970b836b4850c9896d (patch) | |
| tree | bb28f2cfe1c4a5ca9c5d6612aa656b1ecc4262b2 /app-backup/snapper/files | |
| parent | app-text/calibre: bump msgpack dep for build failure (bug 673192) (diff) | |
| download | gentoo-50a4af11e412a75cdf3240970b836b4850c9896d.tar.gz gentoo-50a4af11e412a75cdf3240970b836b4850c9896d.tar.bz2 gentoo-50a4af11e412a75cdf3240970b836b4850c9896d.zip | |
app-backup/snapper: fix swap() err
workaround swap() err with btrfs-4.19
Closes: https://bugs.gentoo.org/670952
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'app-backup/snapper/files')
| -rw-r--r-- | app-backup/snapper/files/snapper-0.5.6-swap.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch new file mode 100644 index 000000000000..aa24330d7304 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.5.6-swap.patch @@ -0,0 +1,36 @@ +commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 +Author: Spencer Janssen <spencerjanssen@gmail.com> +Date: Mon Dec 3 17:33:49 2018 -0600 + + Work around btrfs v4.19 + + Addresses #459 + +diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc +index cb9f7b3..c05557b 100644 +--- a/snapper/Btrfs.cc ++++ b/snapper/Btrfs.cc +@@ -41,6 +41,9 @@ + #include <btrfs/send.h> + #include <btrfs/send-stream.h> + #include <btrfs/send-utils.h> ++#ifdef swap ++#undef swap ++#endif + #include <boost/version.hpp> + #include <boost/thread.hpp> + #endif +diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc +index bada3f8..9edc325 100644 +--- a/snapper/BtrfsUtils.cc ++++ b/snapper/BtrfsUtils.cc +@@ -34,6 +34,9 @@ + #ifdef HAVE_LIBBTRFS + #include <btrfs/ioctl.h> + #include <btrfs/send-utils.h> ++#ifdef swap ++#undef swap ++#endif + #endif + #include <algorithm> + #include <functional> |