Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pascal Jäger" <pascal.jaeger@×××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/files/, app-backup/timeshift/
Date: Thu, 07 Oct 2021 20:53:53
Message-Id: 1633640027.77750b4a40fa93b7db7fb576e4fbc26545e3c41b.pascal.jaeger@gentoo
1 commit: 77750b4a40fa93b7db7fb576e4fbc26545e3c41b
2 Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
3 AuthorDate: Thu Oct 7 20:46:57 2021 +0000
4 Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
5 CommitDate: Thu Oct 7 20:53:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77750b4a
7
8 app-backup/timeshift: bump to 21.09.1
9
10 Package-Manager: Portage-3.0.26, Repoman-3.0.3
11 Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
12
13 app-backup/timeshift/Manifest | 2 +-
14 .../timeshift-20.11.1-fix-util-linux-update.patch | 15 --
15 .../files/timeshift-20.11.1-fix-xapp-2.0.patch | 275 ---------------------
16 ...ift-20.11.1.ebuild => timeshift-21.09.1.ebuild} | 2 +-
17 4 files changed, 2 insertions(+), 292 deletions(-)
18
19 diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
20 index d059f3dd8..82532a5c6 100644
21 --- a/app-backup/timeshift/Manifest
22 +++ b/app-backup/timeshift/Manifest
23 @@ -1 +1 @@
24 -DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f SHA512 f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862
25 +DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
26
27 diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
28 deleted file mode 100644
29 index 0206b9096..000000000
30 --- a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch
31 +++ /dev/null
32 @@ -1,15 +0,0 @@
33 ---- a/src/Utility/Device.vala
34 -+++ b/src/Utility/Device.vala
35 -@@ -428,10 +428,10 @@ public class Device : GLib.Object{
36 -
37 - try{
38 - if (lsblk_is_ancient){
39 -- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)"""");
40 -+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)"""");
41 - }
42 - else{
43 -- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
44 -+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)"""");
45 - }
46 -
47 - if (rex.match (line, 0, out match)){
48
49 diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
50 deleted file mode 100644
51 index 4cfa91f6b..000000000
52 --- a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
53 +++ /dev/null
54 @@ -1,275 +0,0 @@
55 -diff --git a/src/Gtk/BackupBox.vala b/src/Gtk/BackupBox.vala
56 -old mode 100644
57 -new mode 100755
58 -index 3b0a855..4926503
59 ---- a/src/Gtk/BackupBox.vala
60 -+++ b/src/Gtk/BackupBox.vala
61 -@@ -64,7 +64,7 @@ class BackupBox : Gtk.Box{
62 - log_debug("BackupBox: BackupBox()");
63 -
64 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
65 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
66 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
67 - parent_window = _parent_window;
68 - margin = 12;
69 -
70 -diff --git a/src/Gtk/BackupDeviceBox.vala b/src/Gtk/BackupDeviceBox.vala
71 -index 1bdde5a..ead9371 100644
72 ---- a/src/Gtk/BackupDeviceBox.vala
73 -+++ b/src/Gtk/BackupDeviceBox.vala
74 -@@ -46,7 +46,7 @@ class BackupDeviceBox : Gtk.Box{
75 - log_debug("BackupDeviceBox: BackupDeviceBox()");
76 -
77 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
78 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
79 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
80 - parent_window = _parent_window;
81 - margin = 12;
82 -
83 -diff --git a/src/Gtk/BackupFinishBox.vala b/src/Gtk/BackupFinishBox.vala
84 -index 1b57759..0343be5 100644
85 ---- a/src/Gtk/BackupFinishBox.vala
86 -+++ b/src/Gtk/BackupFinishBox.vala
87 -@@ -42,7 +42,7 @@ class BackupFinishBox : Gtk.Box{
88 - log_debug("BackupFinishBox: BackupFinishBox()");
89 -
90 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
91 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
92 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
93 - parent_window = _parent_window;
94 - margin = 12;
95 -
96 -diff --git a/src/Gtk/BootOptionsBox.vala b/src/Gtk/BootOptionsBox.vala
97 -index 5c96443..6e66372 100644
98 ---- a/src/Gtk/BootOptionsBox.vala
99 -+++ b/src/Gtk/BootOptionsBox.vala
100 -@@ -47,7 +47,7 @@ class BootOptionsBox : Gtk.Box{
101 - log_debug("BootOptionsBox: BootOptionsBox()");
102 -
103 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
104 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
105 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
106 - parent_window = _parent_window;
107 - margin = 12;
108 -
109 -diff --git a/src/Gtk/DeleteBox.vala b/src/Gtk/DeleteBox.vala
110 -index 7cbc7d4..c824bbd 100644
111 ---- a/src/Gtk/DeleteBox.vala
112 -+++ b/src/Gtk/DeleteBox.vala
113 -@@ -50,7 +50,7 @@ class DeleteBox : Gtk.Box{
114 - log_debug("DeleteBox: DeleteBox()");
115 -
116 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
117 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
118 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
119 - parent_window = _parent_window;
120 - margin = 12;
121 -
122 -diff --git a/src/Gtk/DeleteFinishBox.vala b/src/Gtk/DeleteFinishBox.vala
123 -index ab9a6d0..db99034 100644
124 ---- a/src/Gtk/DeleteFinishBox.vala
125 -+++ b/src/Gtk/DeleteFinishBox.vala
126 -@@ -42,7 +42,7 @@ class DeleteFinishBox : Gtk.Box{
127 - log_debug("DeleteFinishBox: DeleteFinishBox()");
128 -
129 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
130 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
131 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
132 - parent_window = _parent_window;
133 - margin = 12;
134 -
135 -diff --git a/src/Gtk/EstimateBox.vala b/src/Gtk/EstimateBox.vala
136 -index 858545b..efdfaf7 100644
137 ---- a/src/Gtk/EstimateBox.vala
138 -+++ b/src/Gtk/EstimateBox.vala
139 -@@ -48,7 +48,7 @@ class EstimateBox : Gtk.Box{
140 - log_debug("EstimateBox: EstimateBox()");
141 -
142 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
143 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
144 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
145 - parent_window = _parent_window;
146 - margin = 12;
147 -
148 -diff --git a/src/Gtk/ExcludeAppsBox.vala b/src/Gtk/ExcludeAppsBox.vala
149 -index 6d96fcb..2d26f74 100644
150 ---- a/src/Gtk/ExcludeAppsBox.vala
151 -+++ b/src/Gtk/ExcludeAppsBox.vala
152 -@@ -41,7 +41,7 @@ class ExcludeAppsBox : Gtk.Box{
153 - log_debug("ExcludeAppsBox: ExcludeAppsBox()");
154 -
155 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
156 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
157 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
158 - parent_window = _parent_window;
159 - margin = 12;
160 -
161 -diff --git a/src/Gtk/ExcludeBox.vala b/src/Gtk/ExcludeBox.vala
162 -index ac70bcf..0cdddbf 100644
163 ---- a/src/Gtk/ExcludeBox.vala
164 -+++ b/src/Gtk/ExcludeBox.vala
165 -@@ -44,7 +44,7 @@ class ExcludeBox : Gtk.Box{
166 - log_debug("ExcludeBox: ExcludeBox()");
167 -
168 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
169 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
170 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
171 - parent_window = _parent_window;
172 - margin = 12;
173 -
174 -diff --git a/src/Gtk/FinishBox.vala b/src/Gtk/FinishBox.vala
175 -index be10612..10a2d5e 100644
176 ---- a/src/Gtk/FinishBox.vala
177 -+++ b/src/Gtk/FinishBox.vala
178 -@@ -45,7 +45,7 @@ class FinishBox : Gtk.Box{
179 - log_debug("FinishBox: FinishBox()");
180 -
181 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
182 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
183 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
184 - parent_window = _parent_window;
185 - margin = 12;
186 - show_notes = _show_notes;
187 -diff --git a/src/Gtk/MiscBox.vala b/src/Gtk/MiscBox.vala
188 -index 91295ca..4f48f83 100644
189 ---- a/src/Gtk/MiscBox.vala
190 -+++ b/src/Gtk/MiscBox.vala
191 -@@ -46,7 +46,7 @@ class MiscBox : Gtk.Box{
192 - log_debug("MiscBox: MiscBox()");
193 -
194 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
195 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
196 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
197 - parent_window = _parent_window;
198 - margin = 12;
199 -
200 -diff --git a/src/Gtk/RestoreBox.vala b/src/Gtk/RestoreBox.vala
201 -index 3d9289d..4d483b0 100644
202 ---- a/src/Gtk/RestoreBox.vala
203 -+++ b/src/Gtk/RestoreBox.vala
204 -@@ -65,7 +65,7 @@ class RestoreBox : Gtk.Box{
205 - log_debug("RestoreBox: RestoreBox()");
206 -
207 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
208 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
209 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
210 - parent_window = _parent_window;
211 - margin = 12;
212 -
213 -diff --git a/src/Gtk/RestoreDeviceBox.vala b/src/Gtk/RestoreDeviceBox.vala
214 -index 3a21930..431cb07 100644
215 ---- a/src/Gtk/RestoreDeviceBox.vala
216 -+++ b/src/Gtk/RestoreDeviceBox.vala
217 -@@ -51,7 +51,7 @@ class RestoreDeviceBox : Gtk.Box{
218 - log_debug("RestoreDeviceBox: RestoreDeviceBox()");
219 -
220 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
221 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
222 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
223 - parent_window = _parent_window;
224 - margin = 12;
225 -
226 -diff --git a/src/Gtk/RestoreExcludeBox.vala b/src/Gtk/RestoreExcludeBox.vala
227 -index 67e781a..65cc655 100644
228 ---- a/src/Gtk/RestoreExcludeBox.vala
229 -+++ b/src/Gtk/RestoreExcludeBox.vala
230 -@@ -46,7 +46,7 @@ class RestoreExcludeBox : Gtk.Box{
231 - log_debug("RestoreExcludeBox: RestoreExcludeBox()");
232 -
233 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
234 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
235 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
236 - parent_window = _parent_window;
237 - margin = 12;
238 -
239 -diff --git a/src/Gtk/RestoreFinishBox.vala b/src/Gtk/RestoreFinishBox.vala
240 -index 30d5690..1bb0bac 100644
241 ---- a/src/Gtk/RestoreFinishBox.vala
242 -+++ b/src/Gtk/RestoreFinishBox.vala
243 -@@ -42,7 +42,7 @@ class RestoreFinishBox : Gtk.Box{
244 - log_debug("RestoreFinishBox: RestoreFinishBox()");
245 -
246 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
247 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
248 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
249 - parent_window = _parent_window;
250 - margin = 12;
251 -
252 -diff --git a/src/Gtk/RestoreSummaryBox.vala b/src/Gtk/RestoreSummaryBox.vala
253 -index 6cf87c7..ca25b3c 100644
254 ---- a/src/Gtk/RestoreSummaryBox.vala
255 -+++ b/src/Gtk/RestoreSummaryBox.vala
256 -@@ -44,7 +44,7 @@ class RestoreSummaryBox : Gtk.Box{
257 - log_debug("RestoreSummaryBox: RestoreSummaryBox()");
258 -
259 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
260 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
261 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
262 - parent_window = _parent_window;
263 - margin = 12;
264 -
265 -diff --git a/src/Gtk/RsyncLogBox.vala b/src/Gtk/RsyncLogBox.vala
266 -index 2d1394e..4006a04 100644
267 ---- a/src/Gtk/RsyncLogBox.vala
268 -+++ b/src/Gtk/RsyncLogBox.vala
269 -@@ -69,7 +69,7 @@ public class RsyncLogBox : Gtk.Box {
270 -
271 - public RsyncLogBox(Gtk.Window _window) {
272 -
273 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
274 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
275 -
276 - this.margin = 6;
277 -
278 -diff --git a/src/Gtk/ScheduleBox.vala b/src/Gtk/ScheduleBox.vala
279 -index b59cfbb..39f33fc 100644
280 ---- a/src/Gtk/ScheduleBox.vala
281 -+++ b/src/Gtk/ScheduleBox.vala
282 -@@ -50,7 +50,7 @@ class ScheduleBox : Gtk.Box{
283 - log_debug("ScheduleBox: ScheduleBox()");
284 -
285 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
286 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
287 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
288 - parent_window = _parent_window;
289 - margin = 12;
290 -
291 -diff --git a/src/Gtk/SnapshotBackendBox.vala b/src/Gtk/SnapshotBackendBox.vala
292 -index c725ad7..09bbd0f 100755
293 ---- a/src/Gtk/SnapshotBackendBox.vala
294 -+++ b/src/Gtk/SnapshotBackendBox.vala
295 -@@ -46,7 +46,7 @@ class SnapshotBackendBox : Gtk.Box{
296 - log_debug("SnapshotBackendBox: SnapshotBackendBox()");
297 -
298 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
299 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
300 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
301 - parent_window = _parent_window;
302 - margin = 12;
303 -
304 -diff --git a/src/Gtk/SnapshotListBox.vala b/src/Gtk/SnapshotListBox.vala
305 -index 4d6e9f1..4cef400 100644
306 ---- a/src/Gtk/SnapshotListBox.vala
307 -+++ b/src/Gtk/SnapshotListBox.vala
308 -@@ -63,7 +63,7 @@ class SnapshotListBox : Gtk.Box{
309 - log_debug("SnapshotListBox: SnapshotListBox()");
310 -
311 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
312 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
313 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
314 - parent_window = _parent_window;
315 - margin = 6;
316 -
317 -diff --git a/src/Gtk/UsersBox.vala b/src/Gtk/UsersBox.vala
318 -index 2d2a63e..dbcc719 100644
319 ---- a/src/Gtk/UsersBox.vala
320 -+++ b/src/Gtk/UsersBox.vala
321 -@@ -49,7 +49,7 @@ class UsersBox : Gtk.Box{
322 - log_debug("UsersBox: UsersBox()");
323 -
324 - //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
325 -- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
326 -+ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
327 - parent_window = _parent_window;
328 - margin = 12;
329 -
330
331 diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-21.09.1.ebuild
332 similarity index 90%
333 rename from app-backup/timeshift/timeshift-20.11.1.ebuild
334 rename to app-backup/timeshift/timeshift-21.09.1.ebuild
335 index 5d88a64b2..867c24750 100644
336 --- a/app-backup/timeshift/timeshift-20.11.1.ebuild
337 +++ b/app-backup/timeshift/timeshift-21.09.1.ebuild
338 @@ -14,7 +14,7 @@ SLOT="0"
339 KEYWORDS="~amd64 ~x86"
340 IUSE=""
341
342 -PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" )
343 +#PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" )
344
345 DEPEND="
346 dev-libs/json-glib
Report Message
Find on MARC Find on Google Groups