[Digikam-devel] [digikam] [Bug 267789] Make face detection (kface) and geo tagging (kmap) optional features [patch]

Gilles Caulier caulier.gilles at gmail.com
Wed Oct 30 15:25:39 GMT 2013


https://bugs.kde.org/show_bug.cgi?id=267789

--- Comment #54 from Gilles Caulier <caulier.gilles at gmail.com> ---
kgw,

Your patch cannot be applied against git/master :

[gilles at localhost core]$ patch -p1 < digikam-no-faces-proper.diff 
patching file CMakeLists.txt
Hunk #1 FAILED at 9.
Hunk #2 FAILED at 149.
Hunk #3 succeeded at 369 (offset 102 lines).
Hunk #4 succeeded at 432 with fuzz 2 (offset 134 lines).
Hunk #5 FAILED at 359.
Hunk #6 succeeded at 548 with fuzz 2 (offset 140 lines).
Hunk #7 succeeded at 619 with fuzz 2 (offset 155 lines).
Hunk #8 FAILED at 1158.
Hunk #9 FAILED at 1200.
Hunk #10 FAILED at 1398.
6 out of 10 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patching file digikam/album/albummanager.cpp
Hunk #3 succeeded at 198 (offset -1 lines).
Hunk #7 succeeded at 2331 (offset 32 lines).
Hunk #8 succeeded at 2505 (offset 38 lines).
Hunk #9 succeeded at 2827 (offset 39 lines).
Hunk #10 succeeded at 3000 (offset 43 lines).
Hunk #11 succeeded at 3040 (offset 43 lines).
patching file digikam/album/albummanager.h
Hunk #1 succeeded at 587 (offset -6 lines).
Hunk #2 succeeded at 595 (offset -6 lines).
Hunk #3 succeeded at 638 (offset -6 lines).
Hunk #4 succeeded at 653 (offset -6 lines).
patching file digikam/items/digikamimageview.cpp
Hunk #1 FAILED at 62.
Hunk #2 FAILED at 87.
Hunk #3 succeeded at 120 (offset 4 lines).
Hunk #4 succeeded at 132 (offset 4 lines).
Hunk #5 FAILED at 189.
Hunk #6 FAILED at 197.
Hunk #7 succeeded at 198 (offset -11 lines).
Hunk #8 succeeded at 228 (offset -8 lines).
Hunk #9 succeeded at 242 (offset -8 lines).
Hunk #10 succeeded at 306 (offset -6 lines).
4 out of 10 hunks FAILED -- saving rejects to file
digikam/items/digikamimageview.cpp.rej
patching file digikam/items/digikamimageview.h
Hunk #1 succeeded at 79 (offset -8 lines).
patching file digikam/items/digikamimageview_p.cpp
patching file digikam/items/digikamimageview_p.h
patching file digikam/main/digikamapp.cpp
Hunk #1 FAILED at 95.
Hunk #2 FAILED at 120.
Hunk #3 FAILED at 144.
Hunk #4 FAILED at 3047.
Hunk #5 succeeded at 3055 with fuzz 2 (offset -1 lines).
Hunk #6 FAILED at 3067.
Hunk #7 FAILED at 3074.
6 out of 7 hunks FAILED -- saving rejects to file
digikam/main/digikamapp.cpp.rej
patching file digikam/main/digikamapp.h
Hunk #1 succeeded at 59 (offset 2 lines).
Hunk #2 FAILED at 163.
Hunk #3 FAILED at 230.
2 out of 3 hunks FAILED -- saving rejects to file digikam/main/digikamapp.h.rej
patching file digikam/utils/componentsinfo.h
Hunk #1 FAILED at 38.
Hunk #2 FAILED at 74.
2 out of 2 hunks FAILED -- saving rejects to file
digikam/utils/componentsinfo.h.rej
patching file digikam/views/imagepreviewview.cpp
Hunk #1 succeeded at 57 (offset -4 lines).
Hunk #2 FAILED at 74.
Hunk #3 FAILED at 84.
Hunk #4 succeeded at 102 (offset -5 lines).
Hunk #5 succeeded at 129 (offset -5 lines).
Hunk #6 FAILED at 159.
Hunk #7 succeeded at 176 with fuzz 1 (offset -3 lines).
Hunk #8 succeeded at 195 (offset -3 lines).
Hunk #9 succeeded at 224 (offset -3 lines).
Hunk #10 succeeded at 242 (offset -3 lines).
Hunk #11 succeeded at 262 (offset -3 lines).
Hunk #12 succeeded at 271 (offset -3 lines).
Hunk #13 FAILED at 313.
Hunk #14 succeeded at 323 (offset 2 lines).
Hunk #15 succeeded at 365 (offset 2 lines).
Hunk #16 succeeded at 430 with fuzz 1 (offset 14 lines).
4 out of 16 hunks FAILED -- saving rejects to file
digikam/views/imagepreviewview.cpp.rej
patching file libs/database/imagescanner.cpp
Hunk #1 succeeded at 43 (offset 1 line).
Hunk #2 FAILED at 260.
Hunk #3 succeeded at 459 with fuzz 1 (offset 181 lines).
Hunk #4 succeeded at 856 with fuzz 1 (offset 272 lines).
Hunk #5 succeeded at 906 with fuzz 1 (offset 284 lines).
1 out of 5 hunks FAILED -- saving rejects to file
libs/database/imagescanner.cpp.rej
patching file libs/database/imagescanner.h
Hunk #1 FAILED at 226.
1 out of 1 hunk FAILED -- saving rejects to file
libs/database/imagescanner.h.rej
patching file libs/imageproperties/imagedescedittab.cpp
Hunk #1 FAILED at 442.
1 out of 1 hunk FAILED -- saving rejects to file
libs/imageproperties/imagedescedittab.cpp.rej
patching file libs/models/albummodel.cpp
patching file libs/models/imagealbummodel.cpp
Hunk #1 succeeded at 37 with fuzz 2.
Hunk #2 succeeded at 374 (offset 30 lines).

Please update it if you want to see Face management become optional for next
4.0.0 release.

Best

Gilles Caulier

-- 
You are receiving this mail because:
You are the assignee for the bug.



More information about the Digikam-devel mailing list