1 |
commit: 7d0d9c122aa4680930cdaf39f609d70504a4eb09 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Apr 25 15:50:48 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 3 02:08:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0d9c12 |
7 |
|
8 |
app-backup/borgbackup: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
13 |
|
14 |
.../files/borgbackup-1.1.11-unbundle-msgpack.patch | 110 --------------------- |
15 |
1 file changed, 110 deletions(-) |
16 |
|
17 |
diff --git a/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch b/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch |
18 |
deleted file mode 100644 |
19 |
index 85b612af237..00000000000 |
20 |
--- a/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch |
21 |
+++ /dev/null |
22 |
@@ -1,110 +0,0 @@ |
23 |
-diff -Naur borgbackup-1.1.11.orig/setup.cfg borgbackup-1.1.11/setup.cfg |
24 |
---- borgbackup-1.1.11.orig/setup.cfg 2020-03-07 18:44:15.000000000 -0500 |
25 |
-+++ borgbackup-1.1.11/setup.cfg 2020-03-11 10:28:25.168481822 -0400 |
26 |
-@@ -6,7 +6,7 @@ |
27 |
- F401,F405,F811, |
28 |
- W504 |
29 |
- max-line-length = 255 |
30 |
--exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py,src/borg/algorithms/msgpack |
31 |
-+exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py |
32 |
- |
33 |
- [egg_info] |
34 |
- tag_build = |
35 |
-diff -Naur borgbackup-1.1.11.orig/setup.py borgbackup-1.1.11/setup.py |
36 |
---- borgbackup-1.1.11.orig/setup.py 2020-03-07 18:32:06.000000000 -0500 |
37 |
-+++ borgbackup-1.1.11/setup.py 2020-03-11 10:28:15.568759338 -0400 |
38 |
-@@ -25,8 +25,6 @@ |
39 |
- # True: use the shared libb2 from the system, False: use the bundled blake2 code |
40 |
- prefer_system_libb2 = True |
41 |
- |
42 |
--# prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py. |
43 |
-- |
44 |
- min_python = (3, 4) |
45 |
- my_python = sys.version_info |
46 |
- |
47 |
-@@ -79,8 +77,6 @@ |
48 |
- platform_syncfilerange_source = 'src/borg/platform/syncfilerange.pyx' |
49 |
- platform_darwin_source = 'src/borg/platform/darwin.pyx' |
50 |
- platform_freebsd_source = 'src/borg/platform/freebsd.pyx' |
51 |
--msgpack_packer_source = 'src/borg/algorithms/msgpack/_packer.pyx' |
52 |
--msgpack_unpacker_source = 'src/borg/algorithms/msgpack/_unpacker.pyx' |
53 |
- |
54 |
- cython_c_sources = [ |
55 |
- # these .pyx will get compiled to .c |
56 |
-@@ -98,12 +94,6 @@ |
57 |
- platform_darwin_source, |
58 |
- ] |
59 |
- |
60 |
--cython_cpp_sources = [ |
61 |
-- # these .pyx will get compiled to .cpp |
62 |
-- msgpack_packer_source, |
63 |
-- msgpack_unpacker_source, |
64 |
--] |
65 |
-- |
66 |
- try: |
67 |
- from Cython.Distutils import build_ext |
68 |
- import Cython.Compiler.Main as cython_compiler |
69 |
-@@ -133,8 +123,6 @@ |
70 |
- 'src/borg/platform/syncfilerange.c', |
71 |
- 'src/borg/platform/freebsd.c', |
72 |
- 'src/borg/platform/darwin.c', |
73 |
-- 'src/borg/algorithms/msgpack/_packer.cpp', |
74 |
-- 'src/borg/algorithms/msgpack/_unpacker.cpp', |
75 |
- ]) |
76 |
- super().make_distribution() |
77 |
- |
78 |
-@@ -155,14 +143,12 @@ |
79 |
- platform_freebsd_source = platform_freebsd_source.replace('.pyx', '.c') |
80 |
- platform_darwin_source = platform_darwin_source.replace('.pyx', '.c') |
81 |
- |
82 |
-- msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp') |
83 |
-- msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp') |
84 |
- |
85 |
- from distutils.command.build_ext import build_ext |
86 |
- if not on_rtd and not all(os.path.exists(path) for path in [ |
87 |
- compress_source, crypto_ll_source, chunker_source, hashindex_source, item_source, checksums_source, |
88 |
- platform_posix_source, platform_linux_source, platform_syncfilerange_source, platform_freebsd_source, platform_darwin_source, |
89 |
-- msgpack_packer_source, msgpack_unpacker_source]): |
90 |
-+ ]): |
91 |
- raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.') |
92 |
- |
93 |
- |
94 |
-@@ -805,26 +791,7 @@ |
95 |
- system_prefix=libb2_prefix, system=libb2_system, |
96 |
- **crypto_ext_kwargs) |
97 |
- |
98 |
-- msgpack_endian = '__BIG_ENDIAN__' if (sys.byteorder == 'big') else '__LITTLE_ENDIAN__' |
99 |
-- msgpack_macros = [(msgpack_endian, '1')] |
100 |
-- msgpack_packer_ext_kwargs = dict( |
101 |
-- sources=[msgpack_packer_source], |
102 |
-- include_dirs=include_dirs, |
103 |
-- library_dirs=library_dirs, |
104 |
-- define_macros=msgpack_macros, |
105 |
-- language='c++', |
106 |
-- ) |
107 |
-- msgpack_unpacker_ext_kwargs = dict( |
108 |
-- sources=[msgpack_unpacker_source], |
109 |
-- include_dirs=include_dirs, |
110 |
-- library_dirs=library_dirs, |
111 |
-- define_macros=msgpack_macros, |
112 |
-- language='c++', |
113 |
-- ) |
114 |
-- |
115 |
- ext_modules += [ |
116 |
-- Extension('borg.algorithms.msgpack._packer', **msgpack_packer_ext_kwargs), |
117 |
-- Extension('borg.algorithms.msgpack._unpacker', **msgpack_unpacker_ext_kwargs), |
118 |
- Extension('borg.compress', **compress_ext_kwargs), |
119 |
- Extension('borg.crypto.low_level', **crypto_ext_kwargs), |
120 |
- Extension('borg.hashindex', [hashindex_source]), |
121 |
-diff -Naur borgbackup-1.1.11.orig/src/borg/helpers.py borgbackup-1.1.11/src/borg/helpers.py |
122 |
---- borgbackup-1.1.11.orig/src/borg/helpers.py 2020-03-07 18:32:06.000000000 -0500 |
123 |
-+++ borgbackup-1.1.11/src/borg/helpers.py 2020-03-11 10:28:42.519980213 -0400 |
124 |
-@@ -55,7 +55,7 @@ |
125 |
- # any feedback related to issues caused by this will be ignored. |
126 |
- # - especially, it is known that msgpack 0.6.x does NOT work for borg 1.1.x. |
127 |
- |
128 |
--prefer_system_msgpack = False |
129 |
-+prefer_system_msgpack = True |
130 |
- |
131 |
- try: |
132 |
- if prefer_system_msgpack: |